Skip to content

Commit 7ac8e49

Browse files
mjbvzmjbvz
committed
Add additional no unused checks for merge-conflict extension
1 parent 52f45af commit 7ac8e49

8 files changed

Lines changed: 20 additions & 26 deletions

File tree

‎extensions/merge-conflict/src/codelensProvider.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export default class MergeConflictCodeLensProvider implements vscode.CodeLensPro
1313
private config: interfaces.IExtensionConfiguration;
1414
private tracker: interfaces.IDocumentMergeConflictTracker;
1515

16-
constructor(private context: vscode.ExtensionContext, trackerService: interfaces.IDocumentMergeConflictTrackerService) {
16+
constructor(trackerService: interfaces.IDocumentMergeConflictTrackerService) {
1717
this.tracker = trackerService.createTracker('codelens');
1818
}
1919

@@ -46,7 +46,7 @@ export default class MergeConflictCodeLensProvider implements vscode.CodeLensPro
4646
}
4747
}
4848

49-
async provideCodeLenses(document: vscode.TextDocument, token: vscode.CancellationToken): Promise<vscode.CodeLens[] | null> {
49+
async provideCodeLenses(document: vscode.TextDocument, _token: vscode.CancellationToken): Promise<vscode.CodeLens[] | null> {
5050

5151
if (!this.config || !this.config.enableCodeLens) {
5252
return null;

‎extensions/merge-conflict/src/commandHandler.ts‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export default class CommandHandler implements vscode.Disposable {
2424
private disposables: vscode.Disposable[] = [];
2525
private tracker: interfaces.IDocumentMergeConflictTracker;
2626

27-
constructor(private context: vscode.ExtensionContext, trackerService: interfaces.IDocumentMergeConflictTrackerService) {
27+
constructor(trackerService: interfaces.IDocumentMergeConflictTrackerService) {
2828
this.tracker = trackerService.createTracker('commands');
2929
}
3030

@@ -62,19 +62,19 @@ export default class CommandHandler implements vscode.Disposable {
6262
return this.accept(interfaces.CommitType.Both, editor, ...args);
6363
}
6464

65-
acceptAllCurrent(editor: vscode.TextEditor, ...args: any[]): Promise<void> {
65+
acceptAllCurrent(editor: vscode.TextEditor): Promise<void> {
6666
return this.acceptAll(interfaces.CommitType.Current, editor);
6767
}
6868

69-
acceptAllIncoming(editor: vscode.TextEditor, ...args: any[]): Promise<void> {
69+
acceptAllIncoming(editor: vscode.TextEditor): Promise<void> {
7070
return this.acceptAll(interfaces.CommitType.Incoming, editor);
7171
}
7272

73-
acceptAllBoth(editor: vscode.TextEditor, ...args: any[]): Promise<void> {
73+
acceptAllBoth(editor: vscode.TextEditor): Promise<void> {
7474
return this.acceptAll(interfaces.CommitType.Both, editor);
7575
}
7676

77-
async compare(editor: vscode.TextEditor, conflict: interfaces.IDocumentMergeConflict | null, ...args: any[]) {
77+
async compare(editor: vscode.TextEditor, conflict: interfaces.IDocumentMergeConflict | null) {
7878
const fileName = path.basename(editor.document.uri.fsPath);
7979

8080
// No conflict, command executed from command palette
@@ -102,15 +102,15 @@ export default class CommandHandler implements vscode.Disposable {
102102
vscode.commands.executeCommand('vscode.diff', leftUri, rightUri, title);
103103
}
104104

105-
navigateNext(editor: vscode.TextEditor, ...args: any[]): Promise<void> {
105+
navigateNext(editor: vscode.TextEditor): Promise<void> {
106106
return this.navigate(editor, NavigationDirection.Forwards);
107107
}
108108

109-
navigatePrevious(editor: vscode.TextEditor, ...args: any[]): Promise<void> {
109+
navigatePrevious(editor: vscode.TextEditor): Promise<void> {
110110
return this.navigate(editor, NavigationDirection.Backwards);
111111
}
112112

113-
async acceptSelection(editor: vscode.TextEditor, ...args: any[]): Promise<void> {
113+
async acceptSelection(editor: vscode.TextEditor): Promise<void> {
114114
let conflict = await this.findConflictContainingSelection(editor);
115115

116116
if (!conflict) {

‎extensions/merge-conflict/src/contentProvider.ts‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,11 @@
44
*--------------------------------------------------------------------------------------------*/
55
'use strict';
66
import * as vscode from 'vscode';
7-
import * as interfaces from './interfaces';
87

98
export default class MergeConflictContentProvider implements vscode.TextDocumentContentProvider, vscode.Disposable {
109

1110
static scheme = 'merge-conflict.conflict-diff';
1211

13-
constructor(private context: vscode.ExtensionContext) {
14-
}
15-
16-
begin(config: interfaces.IExtensionConfiguration) {
17-
this.context.subscriptions.push(
18-
vscode.workspace.registerTextDocumentContentProvider(MergeConflictContentProvider.scheme, this)
19-
);
20-
}
21-
2212
dispose() {
2313
}
2414

‎extensions/merge-conflict/src/documentMergeConflict.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export class DocumentMergeConflict implements interfaces.IDocumentMergeConflict
1313
public commonAncestors: interfaces.IMergeRegion[];
1414
public splitter: vscode.Range;
1515

16-
constructor(document: vscode.TextDocument, descriptor: interfaces.IDocumentMergeConflictDescriptor) {
16+
constructor(descriptor: interfaces.IDocumentMergeConflictDescriptor) {
1717
this.range = descriptor.range;
1818
this.current = descriptor.current;
1919
this.incoming = descriptor.incoming;

‎extensions/merge-conflict/src/documentTracker.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ export default class DocumentMergeConflictTracker implements vscode.Disposable,
116116
this.cache.clear();
117117
}
118118

119-
private getConflictsOrEmpty(document: vscode.TextDocument, origins: string[]): interfaces.IDocumentMergeConflict[] {
119+
private getConflictsOrEmpty(document: vscode.TextDocument, _origins: string[]): interfaces.IDocumentMergeConflict[] {
120120
const containsConflict = MergeConflictParser.containsConflict(document);
121121

122122
if (!containsConflict) {

‎extensions/merge-conflict/src/mergeConflictParser.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ export class MergeConflictParser {
8181

8282
return conflictDescriptors
8383
.filter(Boolean)
84-
.map(descriptor => new DocumentMergeConflict(document, descriptor));
84+
.map(descriptor => new DocumentMergeConflict(descriptor));
8585
}
8686

8787
private static scanItemTolMergeConflictDescriptor(document: vscode.TextDocument, scanned: IScanMergedConflict): interfaces.IDocumentMergeConflictDescriptor | null {

‎extensions/merge-conflict/src/services.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ export default class ServiceWrapper implements vscode.Disposable {
2626

2727
this.services.push(
2828
documentTracker,
29-
new CommandHandler(this.context, documentTracker),
30-
new CodeLensProvider(this.context, documentTracker),
31-
new ContentProvider(this.context),
29+
new CommandHandler(documentTracker),
30+
new CodeLensProvider(documentTracker),
31+
new ContentProvider(),
3232
new Decorator(this.context, documentTracker),
3333
);
3434

‎extensions/merge-conflict/tsconfig.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
],
77
"module": "commonjs",
88
"outDir": "./out",
9+
"noImplicitAny": true,
10+
"noImplicitReturns": true,
11+
"noUnusedLocals": true,
12+
"noUnusedParameters": true,
913
"strict": true,
1014
"experimentalDecorators": true
1115
},

0 commit comments

Comments
 (0)