Skip to content

Commit cd00b59

Browse files
mjbvzmjbvz
committed
Enable strict in a few more extensions
1 parent de137dd commit cd00b59

9 files changed

Lines changed: 27 additions & 26 deletions

File tree

‎extensions/configuration-editing/src/extension.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const decoration = vscode.window.createTextEditorDecorationType({
1919

2020
let pendingLaunchJsonDecoration: NodeJS.Timer;
2121

22-
export function activate(context): void {
22+
export function activate(context: vscode.ExtensionContext): void {
2323

2424
//keybindings.json command-suggestions
2525
context.subscriptions.push(registerKeybindingsCompletions());

‎extensions/configuration-editing/src/settingsDocumentHelper.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ export class SettingsDocument {
149149
return Promise.resolve(completions);
150150
}
151151

152-
private provideLanguageCompletionItems(location: Location, range: vscode.Range, formatFunc: (string) => string = (l) => JSON.stringify(l)): vscode.ProviderResult<vscode.CompletionItem[]> {
152+
private provideLanguageCompletionItems(location: Location, range: vscode.Range, formatFunc: (string: string) => string = (l) => JSON.stringify(l)): vscode.ProviderResult<vscode.CompletionItem[]> {
153153
return vscode.languages.getLanguages().then(languages => {
154154
return languages.map(l => {
155155
return this.newSimpleCompletionItem(formatFunc(l), range);

‎extensions/configuration-editing/tsconfig.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"lib": [
77
"es2015"
88
],
9-
"strictNullChecks": true
9+
"strict": true
1010
},
1111
"include": [
1212
"src/**/*"

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,38 +43,38 @@ export default class CommandHandler implements vscode.Disposable {
4343
);
4444
}
4545

46-
private registerTextEditorCommand(command: string, cb: (editor: vscode.TextEditor, ...args) => Promise<void>) {
46+
private registerTextEditorCommand(command: string, cb: (editor: vscode.TextEditor, ...args: any[]) => Promise<void>) {
4747
return vscode.commands.registerCommand(command, (...args) => {
4848
const editor = vscode.window.activeTextEditor;
4949
return editor && cb.call(this, editor, ...args);
5050
});
5151
}
5252

53-
acceptCurrent(editor: vscode.TextEditor, ...args): Promise<void> {
53+
acceptCurrent(editor: vscode.TextEditor, ...args: any[]): Promise<void> {
5454
return this.accept(interfaces.CommitType.Current, editor, ...args);
5555
}
5656

57-
acceptIncoming(editor: vscode.TextEditor, ...args): Promise<void> {
57+
acceptIncoming(editor: vscode.TextEditor, ...args: any[]): Promise<void> {
5858
return this.accept(interfaces.CommitType.Incoming, editor, ...args);
5959
}
6060

61-
acceptBoth(editor: vscode.TextEditor, ...args): Promise<void> {
61+
acceptBoth(editor: vscode.TextEditor, ...args: any[]): Promise<void> {
6262
return this.accept(interfaces.CommitType.Both, editor, ...args);
6363
}
6464

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

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

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

77-
async compare(editor: vscode.TextEditor, conflict: interfaces.IDocumentMergeConflict | null, ...args) {
77+
async compare(editor: vscode.TextEditor, conflict: interfaces.IDocumentMergeConflict | null, ...args: any[]) {
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): Promise<void> {
105+
navigateNext(editor: vscode.TextEditor, ...args: any[]): Promise<void> {
106106
return this.navigate(editor, NavigationDirection.Forwards);
107107
}
108108

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

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

116116
if (!conflict) {
@@ -175,7 +175,7 @@ export default class CommandHandler implements vscode.Disposable {
175175
editor.revealRange(navigationResult.conflict.range, vscode.TextEditorRevealType.Default);
176176
}
177177

178-
private async accept(type: interfaces.CommitType, editor: vscode.TextEditor, ...args): Promise<void> {
178+
private async accept(type: interfaces.CommitType, editor: vscode.TextEditor, ...args: any[]): Promise<void> {
179179

180180
let conflict: interfaces.IDocumentMergeConflict | null;
181181

@@ -257,7 +257,7 @@ export default class CommandHandler implements vscode.Disposable {
257257
};
258258
}
259259

260-
let predicate: (conflict) => boolean;
260+
let predicate: (_conflict: any) => boolean;
261261
let fallback: () => interfaces.IDocumentMergeConflict;
262262

263263
if (direction === NavigationDirection.Forwards) {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export class Delayer<T> {
1313
public defaultDelay: number;
1414
private timeout: any; // Timer
1515
private completionPromise: Promise<T> | null;
16-
private onSuccess: ((value?: T | Thenable<T> | null) => void) | null;
16+
private onSuccess: ((value?: T | Thenable<T> | undefined) => void) | null;
1717
private task: ITask<T> | null;
1818

1919
constructor(defaultDelay: number) {
@@ -45,7 +45,7 @@ export class Delayer<T> {
4545
if (delay >= 0 || this.timeout === null) {
4646
this.timeout = setTimeout(() => {
4747
this.timeout = null;
48-
this.onSuccess!(null);
48+
this.onSuccess!(undefined);
4949
}, delay >= 0 ? delay : this.defaultDelay);
5050
}
5151

@@ -58,7 +58,7 @@ export class Delayer<T> {
5858
}
5959
this.cancelTimeout();
6060
let result = this.completionPromise;
61-
this.onSuccess!(null);
61+
this.onSuccess!(undefined);
6262
return result;
6363
}
6464

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ export interface IExtensionConfiguration {
2424
}
2525

2626
export interface IDocumentMergeConflict extends IDocumentMergeConflictDescriptor {
27-
commitEdit(type: CommitType, editor: vscode.TextEditor, edit?: vscode.TextEditorEdit);
28-
applyEdit(type: CommitType, editor: vscode.TextEditor, edit: vscode.TextEditorEdit);
27+
commitEdit(type: CommitType, editor: vscode.TextEditor, edit?: vscode.TextEditorEdit): Thenable<boolean>;
28+
applyEdit(type: CommitType, editor: vscode.TextEditor, edit: vscode.TextEditorEdit): void;
2929
}
3030

3131
export interface IDocumentMergeConflictDescriptor {
@@ -39,10 +39,10 @@ export interface IDocumentMergeConflictDescriptor {
3939
export interface IDocumentMergeConflictTracker {
4040
getConflicts(document: vscode.TextDocument): PromiseLike<IDocumentMergeConflict[]>;
4141
isPending(document: vscode.TextDocument): boolean;
42-
forget(document: vscode.TextDocument);
42+
forget(document: vscode.TextDocument): void;
4343
}
4444

4545
export interface IDocumentMergeConflictTrackerService {
4646
createTracker(origin: string): IDocumentMergeConflictTracker;
47-
forget(document: vscode.TextDocument);
47+
forget(document: vscode.TextDocument): void;
4848
}

‎extensions/merge-conflict/tsconfig.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
],
77
"module": "commonjs",
88
"outDir": "./out",
9-
"strictNullChecks": true,
9+
"strict": true,
1010
"experimentalDecorators": true
1111
},
1212
"include": [

‎extensions/vscode-colorize-tests/src/colorizer.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { commands, Uri } from 'vscode';
1010
import { join, basename, normalize, dirname } from 'path';
1111
import * as fs from 'fs';
1212

13-
function assertUnchangedTokens(testFixurePath: string, done) {
13+
function assertUnchangedTokens(testFixurePath: string, done: any) {
1414
let fileName = basename(testFixurePath);
1515

1616
return commands.executeCommand('_workbench.captureSyntaxTokens', Uri.file(testFixurePath)).then(data => {

‎extensions/vscode-colorize-tests/tsconfig.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"lib": [
77
"es2015"
88
],
9-
"sourceMap": true
9+
"sourceMap": true,
10+
"strict": true
1011
},
1112
"include": [
1213
"src/**/*"

0 commit comments

Comments
 (0)