From dd9ebe1d6eed63a29a87a87b887cb78b2205a860 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Wed, 7 Jun 2017 10:20:40 -0700 Subject: [PATCH] Fix more TS 2.4 Errors in VS Code codebase (#28144) --- src/vs/base/common/glob.ts | 3 ++- .../contrib/goToDeclaration/browser/goToDeclaration.ts | 2 +- src/vs/editor/contrib/rename/browser/rename.ts | 2 +- .../contrib/wordHighlighter/common/wordHighlighter.ts | 2 +- src/vs/platform/update/electron-main/updateService.ts | 6 +++--- .../workbench/api/electron-browser/mainThreadTreeViews.ts | 4 ++-- .../parts/snippets/electron-browser/snippetsService.ts | 2 +- .../parts/tasks/electron-browser/terminalTaskSystem.ts | 2 +- .../parts/terminal/electron-browser/terminalService.ts | 2 +- 9 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/vs/base/common/glob.ts b/src/vs/base/common/glob.ts index 33da9d6b879..8fcd060bf94 100644 --- a/src/vs/base/common/glob.ts +++ b/src/vs/base/common/glob.ts @@ -436,7 +436,8 @@ export function parse(arg1: string | IExpression, options: IGlobOptions = {}): a export function parseToAsync(expression: IExpression, options?: IGlobOptions): ParsedExpression { const parsedExpression = parse(expression, options); return (path: string, basename?: string, siblingsFn?: () => TPromise): TPromise => { - return TPromise.as(parsedExpression(path, basename, siblingsFn)); + const result = parsedExpression(path, basename, siblingsFn); + return typeof result === 'string' ? TPromise.as(result) : result; }; } diff --git a/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts b/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts index 61afed81136..182404712f7 100644 --- a/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts +++ b/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts @@ -15,7 +15,7 @@ import { CancellationToken } from 'vs/base/common/cancellation'; import { asWinJsPromise } from 'vs/base/common/async'; import { Position } from 'vs/editor/common/core/position'; -function outputResults(promises: TPromise[]) { +function outputResults(promises: TPromise[]) { return TPromise.join(promises).then(allReferences => { let result: Location[] = []; for (let references of allReferences) { diff --git a/src/vs/editor/contrib/rename/browser/rename.ts b/src/vs/editor/contrib/rename/browser/rename.ts index 582e3a2ab4e..70fc125ffa5 100644 --- a/src/vs/editor/contrib/rename/browser/rename.ts +++ b/src/vs/editor/contrib/rename/browser/rename.ts @@ -38,7 +38,7 @@ export function rename(model: IReadOnlyModel, position: Position, newName: strin let hasResult = false; const factory = supports.map(support => { - return () => { + return (): TPromise => { if (!hasResult) { return asWinJsPromise((token) => { return support.provideRenameEdits(model, position, newName, token); diff --git a/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.ts b/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.ts index 896e593b005..0aa87cb7282 100644 --- a/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.ts +++ b/src/vs/editor/contrib/wordHighlighter/common/wordHighlighter.ts @@ -32,7 +32,7 @@ export function getOccurrencesAtPosition(model: editorCommon.IReadOnlyModel, pos // until someone response with a good result // (good = none empty array) return sequence(orderedByScore.map(provider => { - return () => { + return (): TPromise => { if (!foundResult) { return asWinJsPromise((token) => { return provider.provideDocumentHighlights(model, position, token); diff --git a/src/vs/platform/update/electron-main/updateService.ts b/src/vs/platform/update/electron-main/updateService.ts index aa3f75c6d51..4db56de6d64 100644 --- a/src/vs/platform/update/electron-main/updateService.ts +++ b/src/vs/platform/update/electron-main/updateService.ts @@ -44,8 +44,8 @@ export class UpdateService implements IUpdateService { private _onUpdateNotAvailable = new Emitter(); get onUpdateNotAvailable(): Event { return this._onUpdateNotAvailable.event; } - private _onUpdateReady = new Emitter(); - get onUpdateReady(): Event { return this._onUpdateReady.event; } + private _onUpdateReady = new Emitter(); + get onUpdateReady(): Event { return this._onUpdateReady.event; } private _onStateChange = new Emitter(); get onStateChange(): Event { return this._onStateChange.event; } @@ -180,7 +180,7 @@ export class UpdateService implements IUpdateService { this.telemetryService.publicLog('update:available', { explicit, version: update.version, currentVersion: product.commit }); } else { - const data: IUpdate = { + const data: IRawUpdate = { releaseNotes: update.releaseNotes, version: update.version, date: update.date diff --git a/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts b/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts index 6d41b483db6..b429be71710 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadTreeViews.ts @@ -40,8 +40,8 @@ type TreeItemHandle = number; class TreeViewDataProvider implements ITreeViewDataProvider { - private _onDidChange: Emitter = new Emitter(); - readonly onDidChange: Event = this._onDidChange.event; + private _onDidChange: Emitter = new Emitter(); + readonly onDidChange: Event = this._onDidChange.event; private childrenMap: Map = new Map(); private itemsMap: Map = new Map(); diff --git a/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts b/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts index 43fe76a8ce0..8e4f75e32ca 100644 --- a/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts +++ b/src/vs/workbench/parts/snippets/electron-browser/snippetsService.ts @@ -22,7 +22,7 @@ export interface ISnippetsService { registerSnippets(languageId: LanguageId, snippets: ISnippet[], owner: string): void; - visitSnippets(languageId: LanguageId, accept: (snippet: ISnippet) => void): void; + visitSnippets(languageId: LanguageId, accept: (snippet: ISnippet) => boolean): void; getSnippets(languageId: LanguageId): ISnippet[]; } diff --git a/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts b/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts index 76a07d3b7a0..a4bfa6e87e1 100644 --- a/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts +++ b/src/vs/workbench/parts/tasks/electron-browser/terminalTaskSystem.ts @@ -213,7 +213,7 @@ export class TerminalTaskSystem extends EventEmitter implements ITaskSystem { } if (task.command) { - return TPromise.join(promises).then((summaries): ITaskSummary => { + return TPromise.join(promises).then((summaries): TPromise | ITaskSummary => { for (let summary of summaries) { if (summary.exitCode !== 0) { return { exitCode: summary.exitCode }; diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts index 5c3a969a73a..e731656e46d 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminalService.ts @@ -178,7 +178,7 @@ export class TerminalService extends AbstractTerminalService implements ITermina } return this._validateShellPaths(label, potentialPaths); } - return [label, current]; + return [label, current] as [string, string]; }); }