diff --git a/extensions/configuration-editing/src/extension.ts b/extensions/configuration-editing/src/extension.ts index 511d8664ec1..75e41fbd0d0 100644 --- a/extensions/configuration-editing/src/extension.ts +++ b/extensions/configuration-editing/src/extension.ts @@ -19,7 +19,7 @@ const decoration = vscode.window.createTextEditorDecorationType({ let pendingLaunchJsonDecoration: NodeJS.Timer; -export function activate(context): void { +export function activate(context: vscode.ExtensionContext): void { //keybindings.json command-suggestions context.subscriptions.push(registerKeybindingsCompletions()); diff --git a/extensions/configuration-editing/src/settingsDocumentHelper.ts b/extensions/configuration-editing/src/settingsDocumentHelper.ts index c0067652e9a..9bdfe486b35 100644 --- a/extensions/configuration-editing/src/settingsDocumentHelper.ts +++ b/extensions/configuration-editing/src/settingsDocumentHelper.ts @@ -149,7 +149,7 @@ export class SettingsDocument { return Promise.resolve(completions); } - private provideLanguageCompletionItems(location: Location, range: vscode.Range, formatFunc: (string) => string = (l) => JSON.stringify(l)): vscode.ProviderResult { + private provideLanguageCompletionItems(location: Location, range: vscode.Range, formatFunc: (string: string) => string = (l) => JSON.stringify(l)): vscode.ProviderResult { return vscode.languages.getLanguages().then(languages => { return languages.map(l => { return this.newSimpleCompletionItem(formatFunc(l), range); diff --git a/extensions/configuration-editing/tsconfig.json b/extensions/configuration-editing/tsconfig.json index 6971f531b11..23392904dee 100644 --- a/extensions/configuration-editing/tsconfig.json +++ b/extensions/configuration-editing/tsconfig.json @@ -6,7 +6,7 @@ "lib": [ "es2015" ], - "strictNullChecks": true + "strict": true }, "include": [ "src/**/*" diff --git a/extensions/merge-conflict/src/commandHandler.ts b/extensions/merge-conflict/src/commandHandler.ts index 23fca8d15f5..50ce36885b9 100644 --- a/extensions/merge-conflict/src/commandHandler.ts +++ b/extensions/merge-conflict/src/commandHandler.ts @@ -43,38 +43,38 @@ export default class CommandHandler implements vscode.Disposable { ); } - private registerTextEditorCommand(command: string, cb: (editor: vscode.TextEditor, ...args) => Promise) { + private registerTextEditorCommand(command: string, cb: (editor: vscode.TextEditor, ...args: any[]) => Promise) { return vscode.commands.registerCommand(command, (...args) => { const editor = vscode.window.activeTextEditor; return editor && cb.call(this, editor, ...args); }); } - acceptCurrent(editor: vscode.TextEditor, ...args): Promise { + acceptCurrent(editor: vscode.TextEditor, ...args: any[]): Promise { return this.accept(interfaces.CommitType.Current, editor, ...args); } - acceptIncoming(editor: vscode.TextEditor, ...args): Promise { + acceptIncoming(editor: vscode.TextEditor, ...args: any[]): Promise { return this.accept(interfaces.CommitType.Incoming, editor, ...args); } - acceptBoth(editor: vscode.TextEditor, ...args): Promise { + acceptBoth(editor: vscode.TextEditor, ...args: any[]): Promise { return this.accept(interfaces.CommitType.Both, editor, ...args); } - acceptAllCurrent(editor: vscode.TextEditor, ...args): Promise { + acceptAllCurrent(editor: vscode.TextEditor, ...args: any[]): Promise { return this.acceptAll(interfaces.CommitType.Current, editor); } - acceptAllIncoming(editor: vscode.TextEditor, ...args): Promise { + acceptAllIncoming(editor: vscode.TextEditor, ...args: any[]): Promise { return this.acceptAll(interfaces.CommitType.Incoming, editor); } - acceptAllBoth(editor: vscode.TextEditor, ...args): Promise { + acceptAllBoth(editor: vscode.TextEditor, ...args: any[]): Promise { return this.acceptAll(interfaces.CommitType.Both, editor); } - async compare(editor: vscode.TextEditor, conflict: interfaces.IDocumentMergeConflict | null, ...args) { + async compare(editor: vscode.TextEditor, conflict: interfaces.IDocumentMergeConflict | null, ...args: any[]) { const fileName = path.basename(editor.document.uri.fsPath); // No conflict, command executed from command palette @@ -102,15 +102,15 @@ export default class CommandHandler implements vscode.Disposable { vscode.commands.executeCommand('vscode.diff', leftUri, rightUri, title); } - navigateNext(editor: vscode.TextEditor, ...args): Promise { + navigateNext(editor: vscode.TextEditor, ...args: any[]): Promise { return this.navigate(editor, NavigationDirection.Forwards); } - navigatePrevious(editor: vscode.TextEditor, ...args): Promise { + navigatePrevious(editor: vscode.TextEditor, ...args: any[]): Promise { return this.navigate(editor, NavigationDirection.Backwards); } - async acceptSelection(editor: vscode.TextEditor, ...args): Promise { + async acceptSelection(editor: vscode.TextEditor, ...args: any[]): Promise { let conflict = await this.findConflictContainingSelection(editor); if (!conflict) { @@ -175,7 +175,7 @@ export default class CommandHandler implements vscode.Disposable { editor.revealRange(navigationResult.conflict.range, vscode.TextEditorRevealType.Default); } - private async accept(type: interfaces.CommitType, editor: vscode.TextEditor, ...args): Promise { + private async accept(type: interfaces.CommitType, editor: vscode.TextEditor, ...args: any[]): Promise { let conflict: interfaces.IDocumentMergeConflict | null; @@ -257,7 +257,7 @@ export default class CommandHandler implements vscode.Disposable { }; } - let predicate: (conflict) => boolean; + let predicate: (_conflict: any) => boolean; let fallback: () => interfaces.IDocumentMergeConflict; if (direction === NavigationDirection.Forwards) { diff --git a/extensions/merge-conflict/src/delayer.ts b/extensions/merge-conflict/src/delayer.ts index 59ec77ed503..de74b6033ee 100644 --- a/extensions/merge-conflict/src/delayer.ts +++ b/extensions/merge-conflict/src/delayer.ts @@ -13,7 +13,7 @@ export class Delayer { public defaultDelay: number; private timeout: any; // Timer private completionPromise: Promise | null; - private onSuccess: ((value?: T | Thenable | null) => void) | null; + private onSuccess: ((value?: T | Thenable | undefined) => void) | null; private task: ITask | null; constructor(defaultDelay: number) { @@ -45,7 +45,7 @@ export class Delayer { if (delay >= 0 || this.timeout === null) { this.timeout = setTimeout(() => { this.timeout = null; - this.onSuccess!(null); + this.onSuccess!(undefined); }, delay >= 0 ? delay : this.defaultDelay); } @@ -58,7 +58,7 @@ export class Delayer { } this.cancelTimeout(); let result = this.completionPromise; - this.onSuccess!(null); + this.onSuccess!(undefined); return result; } diff --git a/extensions/merge-conflict/src/interfaces.ts b/extensions/merge-conflict/src/interfaces.ts index 70519b72b1f..b45cd252c9d 100644 --- a/extensions/merge-conflict/src/interfaces.ts +++ b/extensions/merge-conflict/src/interfaces.ts @@ -24,8 +24,8 @@ export interface IExtensionConfiguration { } export interface IDocumentMergeConflict extends IDocumentMergeConflictDescriptor { - commitEdit(type: CommitType, editor: vscode.TextEditor, edit?: vscode.TextEditorEdit); - applyEdit(type: CommitType, editor: vscode.TextEditor, edit: vscode.TextEditorEdit); + commitEdit(type: CommitType, editor: vscode.TextEditor, edit?: vscode.TextEditorEdit): Thenable; + applyEdit(type: CommitType, editor: vscode.TextEditor, edit: vscode.TextEditorEdit): void; } export interface IDocumentMergeConflictDescriptor { @@ -39,10 +39,10 @@ export interface IDocumentMergeConflictDescriptor { export interface IDocumentMergeConflictTracker { getConflicts(document: vscode.TextDocument): PromiseLike; isPending(document: vscode.TextDocument): boolean; - forget(document: vscode.TextDocument); + forget(document: vscode.TextDocument): void; } export interface IDocumentMergeConflictTrackerService { createTracker(origin: string): IDocumentMergeConflictTracker; - forget(document: vscode.TextDocument); + forget(document: vscode.TextDocument): void; } diff --git a/extensions/merge-conflict/tsconfig.json b/extensions/merge-conflict/tsconfig.json index ce3e55fff2d..b67b8ea9a1d 100644 --- a/extensions/merge-conflict/tsconfig.json +++ b/extensions/merge-conflict/tsconfig.json @@ -6,7 +6,7 @@ ], "module": "commonjs", "outDir": "./out", - "strictNullChecks": true, + "strict": true, "experimentalDecorators": true }, "include": [ diff --git a/extensions/vscode-colorize-tests/src/colorizer.test.ts b/extensions/vscode-colorize-tests/src/colorizer.test.ts index 4904195e835..e3a34a27524 100644 --- a/extensions/vscode-colorize-tests/src/colorizer.test.ts +++ b/extensions/vscode-colorize-tests/src/colorizer.test.ts @@ -10,7 +10,7 @@ import { commands, Uri } from 'vscode'; import { join, basename, normalize, dirname } from 'path'; import * as fs from 'fs'; -function assertUnchangedTokens(testFixurePath: string, done) { +function assertUnchangedTokens(testFixurePath: string, done: any) { let fileName = basename(testFixurePath); return commands.executeCommand('_workbench.captureSyntaxTokens', Uri.file(testFixurePath)).then(data => { diff --git a/extensions/vscode-colorize-tests/tsconfig.json b/extensions/vscode-colorize-tests/tsconfig.json index 366e25ea09c..610a5da7c03 100644 --- a/extensions/vscode-colorize-tests/tsconfig.json +++ b/extensions/vscode-colorize-tests/tsconfig.json @@ -6,7 +6,8 @@ "lib": [ "es2015" ], - "sourceMap": true + "sourceMap": true, + "strict": true }, "include": [ "src/**/*"