From bef497ff82391f4f29ea52f532d896a6903f6ff6 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Mon, 4 Sep 2017 11:20:09 +0200 Subject: [PATCH] avoid more implicit any and some :lipstick: --- src/vs/base/browser/htmlContentRenderer.ts | 26 ++++++------- .../ui/resourceviewer/resourceViewer.ts | 2 +- src/vs/base/common/cancellation.ts | 5 ++- src/vs/base/common/collections.ts | 4 +- src/vs/base/common/comparers.ts | 8 ++-- src/vs/base/common/diagnostics.ts | 26 ++++++------- src/vs/base/common/diff/diff2.ts | 1 + src/vs/base/common/event.ts | 6 +-- src/vs/base/common/graph.ts | 12 +++--- src/vs/base/common/json.ts | 2 +- src/vs/base/common/numbers.ts | 13 ++++--- src/vs/base/common/objects.ts | 8 ++-- src/vs/base/common/severity.ts | 10 ++--- src/vs/base/common/winjs.base.d.ts | 2 +- src/vs/base/common/worker/simpleWorker.ts | 2 +- src/vs/base/node/crypto.ts | 2 +- src/vs/base/node/encoding.ts | 2 +- src/vs/base/node/extfs.ts | 24 ++++++------ src/vs/base/node/processes.ts | 4 +- src/vs/base/node/profiler.ts | 6 +-- src/vs/base/node/request.ts | 4 +- src/vs/base/node/startupTimers.d.ts | 2 +- src/vs/base/parts/ipc/common/ipc.ts | 6 +-- src/vs/base/parts/ipc/node/ipc.cp.ts | 2 +- src/vs/base/parts/ipc/node/ipc.net.ts | 2 +- .../base/parts/tree/browser/treeDefaults.ts | 38 +++++++++---------- src/vs/base/parts/tree/browser/treeModel.ts | 2 +- src/vs/code/electron-main/app.ts | 2 +- src/vs/code/electron-main/keyboard.ts | 2 +- src/vs/code/electron-main/menus.ts | 2 +- src/vs/code/electron-main/sharedProcess.ts | 2 +- src/vs/code/electron-main/window.ts | 2 +- src/vs/code/electron-main/windows.ts | 2 +- src/vs/code/node/cliProcessMain.ts | 4 +- src/vs/editor/common/editorCommon.ts | 2 +- src/vs/editor/common/model/modelLine.ts | 2 +- .../contrib/find/browser/simpleFindWidget.ts | 12 +++--- .../editor/contrib/folding/browser/folding.ts | 2 +- .../contrib/indentation/common/indentUtils.ts | 4 +- .../contrib/indentation/common/indentation.ts | 6 +-- .../common/moveLinesCommand.ts | 4 +- .../contrib/snippet/browser/snippetParser.ts | 2 +- .../iPadShowKeyboard/iPadShowKeyboard.ts | 4 +- .../browser/quickOpen/editorQuickOpen.ts | 6 +-- .../quickOpen/quickOpenEditorWidget.ts | 2 +- .../common/standaloneThemeService.ts | 2 +- src/vs/platform/actions/common/actions.ts | 2 +- src/vs/platform/configuration/common/model.ts | 2 +- .../node/extensionGalleryService.ts | 4 +- .../instantiation/common/descriptors.ts | 8 ++-- .../common/jsonValidationExtensionPoint.ts | 8 ++-- .../lifecycle/electron-main/lifecycleMain.ts | 4 +- .../platform/telemetry/browser/idleMonitor.ts | 2 +- .../telemetry/node/appInsightsAppender.ts | 4 +- .../theme/common/colorExtensionPoint.ts | 6 +-- src/vs/platform/theme/common/themeService.ts | 18 --------- .../electron-browser/mainThreadWorkspace.ts | 6 +-- src/vs/workbench/api/node/extHost.protocol.ts | 8 ++-- .../workbench/api/node/extHostDocumentData.ts | 2 +- .../api/node/extHostExtensionService.ts | 2 +- .../api/node/extHostLanguageFeatures.ts | 2 +- src/vs/workbench/api/node/extHostTreeViews.ts | 4 +- .../browser/actions/configureLocale.ts | 2 +- .../parts/activitybar/activitybarActions.ts | 4 +- .../browser/parts/editor/editorCommands.ts | 2 +- .../browser/parts/editor/editorStatus.ts | 2 +- .../browser/parts/editor/textEditor.ts | 10 ++--- .../browser/parts/editor/webviewEditor.ts | 8 ++-- .../browser/parts/panel/panelActions.ts | 2 +- src/vs/workbench/common/resources.ts | 2 +- src/vs/workbench/electron-browser/actions.ts | 22 +++++------ src/vs/workbench/electron-browser/window.ts | 2 +- src/vs/workbench/node/extensionHostProcess.ts | 6 +-- src/vs/workbench/parts/debug/common/debug.ts | 2 +- .../parts/debug/common/debugModel.ts | 2 +- .../workbench/parts/debug/node/v8Protocol.ts | 4 +- .../emmet/electron-browser/emmetActions.ts | 2 +- .../execution.contribution.ts | 2 +- .../extensions/browser/extensionsList.ts | 2 +- .../parts/files/browser/views/explorerView.ts | 2 +- .../files/browser/views/explorerViewer.ts | 2 +- .../parts/html/browser/webviewEditor.ts | 2 +- .../parts/html/browser/webviewFindWidget.ts | 2 +- .../parts/markers/browser/markersPanel.ts | 2 +- .../parts/markers/common/markersModel.ts | 10 ++--- .../parts/output/browser/outputServices.ts | 2 +- .../browser/preferencesRenderers.ts | 2 +- .../common/keybindingsEditorModel.ts | 2 +- .../preferences/common/preferencesModels.ts | 6 +-- .../quickopen/browser/commandsHandler.ts | 6 +-- .../parts/scm/electron-browser/scmMenus.ts | 4 +- .../parts/scm/electron-browser/scmViewlet.ts | 2 +- .../parts/search/browser/searchActions.ts | 2 +- .../electron-browser/snippets.contribution.ts | 10 ++--- .../parts/tasks/common/problemCollectors.ts | 2 +- .../electron-browser/task.contribution.ts | 12 +++--- .../parts/tasks/node/processRunnerDetector.ts | 2 +- .../parts/tasks/node/taskConfiguration.ts | 2 +- .../electron-browser/terminalFindWidget.ts | 2 +- .../electron-browser/terminalLinkHandler.ts | 4 +- .../electron-browser/themes.contribution.ts | 4 +- .../electron-browser/releaseNotesEditor.ts | 3 +- .../workbench/parts/views/browser/treeView.ts | 4 +- src/vs/workbench/parts/views/browser/views.ts | 2 +- .../page/electron-browser/welcomePage.ts | 2 +- .../electron-browser/walkThroughPart.ts | 10 ++--- .../services/files/node/fileService.ts | 12 +++--- .../services/history/browser/history.ts | 2 +- .../services/scm/common/scmService.ts | 2 +- .../services/search/node/ripgrepTextSearch.ts | 2 +- .../textMate/electron-browser/TMHelper.ts | 4 +- .../electron-browser/textMateService.ts | 2 +- .../themes/electron-browser/colorThemeData.ts | 2 +- .../electron-browser/workbenchThemeService.ts | 4 +- 114 files changed, 282 insertions(+), 296 deletions(-) diff --git a/src/vs/base/browser/htmlContentRenderer.ts b/src/vs/base/browser/htmlContentRenderer.ts index 9e868220845..a49e4411274 100644 --- a/src/vs/base/browser/htmlContentRenderer.ts +++ b/src/vs/base/browser/htmlContentRenderer.ts @@ -186,7 +186,7 @@ class StringStream { } public next(): string { - var next = this.peek(); + const next = this.peek(); this.advance(); return next; } @@ -219,7 +219,7 @@ interface IFormatParseTree { } function _renderFormattedText(element: Node, treeNode: IFormatParseTree, actionCallback?: (content: string, event?: IMouseEvent) => void) { - var child: Node; + let child: Node; if (treeNode.type === FormatType.Text) { child = document.createTextNode(treeNode.content); @@ -231,7 +231,7 @@ function _renderFormattedText(element: Node, treeNode: IFormatParseTree, actionC child = document.createElement('i'); } else if (treeNode.type === FormatType.Action) { - var a = document.createElement('a'); + const a = document.createElement('a'); a.href = '#'; DOM.addStandardDisposableListener(a, 'click', (event) => { actionCallback(String(treeNode.index), event); @@ -259,20 +259,20 @@ function _renderFormattedText(element: Node, treeNode: IFormatParseTree, actionC function parseFormattedText(content: string): IFormatParseTree { - var root: IFormatParseTree = { + const root: IFormatParseTree = { type: FormatType.Root, children: [] }; - var actionItemIndex = 0; - var current = root; - var stack: IFormatParseTree[] = []; - var stream = new StringStream(content); + let actionItemIndex = 0; + let current = root; + const stack: IFormatParseTree[] = []; + const stream = new StringStream(content); while (!stream.eos()) { - var next = stream.next(); + let next = stream.next(); - var isEscapedFormatType = (next === '\\' && formatTagType(stream.peek()) !== FormatType.Invalid); + const isEscapedFormatType = (next === '\\' && formatTagType(stream.peek()) !== FormatType.Invalid); if (isEscapedFormatType) { next = stream.next(); // unread the backslash if it escapes a format tag type } @@ -284,11 +284,11 @@ function parseFormattedText(content: string): IFormatParseTree { current = stack.pop(); } - var type = formatTagType(next); + const type = formatTagType(next); if (current.type === type || (current.type === FormatType.Action && type === FormatType.ActionClose)) { current = stack.pop(); } else { - var newCurrent: IFormatParseTree = { + const newCurrent: IFormatParseTree = { type: type, children: [] }; @@ -313,7 +313,7 @@ function parseFormattedText(content: string): IFormatParseTree { } else { if (current.type !== FormatType.Text) { - var textCurrent: IFormatParseTree = { + const textCurrent: IFormatParseTree = { type: FormatType.Text, content: next }; diff --git a/src/vs/base/browser/ui/resourceviewer/resourceViewer.ts b/src/vs/base/browser/ui/resourceviewer/resourceViewer.ts index 4244dc01a59..762852ab390 100644 --- a/src/vs/base/browser/ui/resourceviewer/resourceViewer.ts +++ b/src/vs/base/browser/ui/resourceviewer/resourceViewer.ts @@ -115,7 +115,7 @@ export class ResourceViewer { descriptor: IResourceDescriptor, container: Builder, scrollbar: DomScrollableElement, - openExternal: (URI) => void, + openExternal: (uri: URI) => void, metadataClb?: (meta: string) => void ): void { // Ensure CSS class diff --git a/src/vs/base/common/cancellation.ts b/src/vs/base/common/cancellation.ts index c1cace585a7..cfd7feae295 100644 --- a/src/vs/base/common/cancellation.ts +++ b/src/vs/base/common/cancellation.ts @@ -6,6 +6,7 @@ 'use strict'; import Event, { Emitter } from 'vs/base/common/event'; +import { IDisposable } from 'vs/base/common/lifecycle'; export interface CancellationToken { readonly isCancellationRequested: boolean; @@ -16,10 +17,10 @@ export interface CancellationToken { readonly onCancellationRequested: Event; } -const shortcutEvent: Event = Object.freeze(function (callback, context?) { +const shortcutEvent = Object.freeze(function (callback, context?): IDisposable { let handle = setTimeout(callback.bind(context), 0); return { dispose() { clearTimeout(handle); } }; -}); +} as Event); export namespace CancellationToken { diff --git a/src/vs/base/common/collections.ts b/src/vs/base/common/collections.ts index ca4832b1ccb..20e27735d7d 100644 --- a/src/vs/base/common/collections.ts +++ b/src/vs/base/common/collections.ts @@ -29,7 +29,7 @@ const hasOwnProperty = Object.prototype.hasOwnProperty; */ export function values(from: IStringDictionary | INumberDictionary): T[] { const result: T[] = []; - for (var key in from) { + for (let key in from) { if (hasOwnProperty.call(from, key)) { result.push(from[key]); } @@ -39,7 +39,7 @@ export function values(from: IStringDictionary | INumberDictionary): T[ export function size(from: IStringDictionary | INumberDictionary): number { let count = 0; - for (var key in from) { + for (let key in from) { if (hasOwnProperty.call(from, key)) { count += 1; } diff --git a/src/vs/base/common/comparers.ts b/src/vs/base/common/comparers.ts index 5e0a11ca5ce..67a95a10c86 100644 --- a/src/vs/base/common/comparers.ts +++ b/src/vs/base/common/comparers.ts @@ -59,8 +59,8 @@ export function noIntlCompareFileNames(one: string, other: string): number { export function compareFileExtensions(one: string, other: string): number { if (intlFileNameCollator) { - const oneMatch = one ? FileNameMatch.exec(one) : []; - const otherMatch = other ? FileNameMatch.exec(other) : []; + const oneMatch = one ? FileNameMatch.exec(one) : [] as RegExpExecArray; + const otherMatch = other ? FileNameMatch.exec(other) : [] as RegExpExecArray; const oneName = oneMatch[1] || ''; const oneExtension = oneMatch[3] || ''; @@ -92,8 +92,8 @@ export function compareFileExtensions(one: string, other: string): number { } function noIntlCompareFileExtensions(one: string, other: string): number { - const oneMatch = one ? FileNameMatch.exec(one.toLowerCase()) : []; - const otherMatch = other ? FileNameMatch.exec(other.toLowerCase()) : []; + const oneMatch = one ? FileNameMatch.exec(one.toLowerCase()) : [] as RegExpExecArray; + const otherMatch = other ? FileNameMatch.exec(other.toLowerCase()) : [] as RegExpExecArray; const oneName = oneMatch[1] || ''; const oneExtension = oneMatch[3] || ''; diff --git a/src/vs/base/common/diagnostics.ts b/src/vs/base/common/diagnostics.ts index d967bb83013..66c522cb3a7 100644 --- a/src/vs/base/common/diagnostics.ts +++ b/src/vs/base/common/diagnostics.ts @@ -11,15 +11,15 @@ import * as Platform from 'vs/base/common/platform'; * Then trigger an action that will write to diagnostics to see all cached output from the past. */ -var globals = Platform.globals; +const globals = Platform.globals; if (!globals.Monaco) { globals.Monaco = {}; } globals.Monaco.Diagnostics = {}; -var switches = globals.Monaco.Diagnostics; -var map = new Map(); -var data: any[] = []; +const switches = globals.Monaco.Diagnostics; +const map = new Map(); +const data: any[] = []; function fifo(array: any[], size: number) { while (array.length > size) { @@ -37,29 +37,29 @@ export function register(what: string, fn: Function): (...args: any[]) => void { } // register switch - var flag = switches[what] || false; + const flag = switches[what] || false; switches[what] = flag; // register function - var tracers = map.get(what) || []; + const tracers = map.get(what) || []; tracers.push(fn); map.set(what, tracers); - var result = function (...args: any[]) { + const result = function (...args: any[]) { - var idx: number; + let idx: number; if (switches[what] === true) { // replay back-in-time functions - var allArgs = [arguments]; + const allArgs = [arguments]; idx = data.indexOf(fn); if (idx !== -1) { allArgs.unshift.apply(allArgs, data[idx + 1] || []); data[idx + 1] = []; } - var doIt: () => void = function () { - var thisArguments = allArgs.shift(); + const doIt: () => void = function () { + const thisArguments = allArgs.shift(); fn.apply(fn, thisArguments); if (allArgs.length > 0) { Platform.setTimeout(doIt, 500); @@ -71,10 +71,10 @@ export function register(what: string, fn: Function): (...args: any[]) => void { // know where to store idx = data.indexOf(fn); idx = idx !== -1 ? idx : data.length; - var dataIdx = idx + 1; + const dataIdx = idx + 1; // store arguments - var allargs = data[dataIdx] || []; + const allargs = data[dataIdx] || []; allargs.push(arguments); fifo(allargs, 50); diff --git a/src/vs/base/common/diff/diff2.ts b/src/vs/base/common/diff/diff2.ts index 91a92308335..d0b99788b9f 100644 --- a/src/vs/base/common/diff/diff2.ts +++ b/src/vs/base/common/diff/diff2.ts @@ -9,6 +9,7 @@ import { DiffChange } from 'vs/base/common/diff/diffChange'; export interface ISequence { getLength(): number; getElementHash(index: number): string; + [index: number]: string; } export interface IDiffChange { diff --git a/src/vs/base/common/event.ts b/src/vs/base/common/event.ts index 84907d87382..cd322eb4b29 100644 --- a/src/vs/base/common/event.ts +++ b/src/vs/base/common/event.ts @@ -424,7 +424,7 @@ class ChainableEvent implements IChainableEvent { return new ChainableEvent(filterEvent(this._event, fn)); } - on(listener, thisArgs, disposables: IDisposable[]) { + on(listener: (e: T) => any, thisArgs: any, disposables: IDisposable[]) { return this._event(listener, thisArgs, disposables); } } @@ -514,10 +514,10 @@ export function echo(event: Event, nextTick = false, buffer: T[] = []): Ev emitter.fire(e); }); - const flush = (listener, thisArgs?) => buffer.forEach(e => listener.call(thisArgs, e)); + const flush = (listener: (e: T) => any, thisArgs?: any) => buffer.forEach(e => listener.call(thisArgs, e)); const emitter = new Emitter({ - onListenerDidAdd(emitter, listener, thisArgs?) { + onListenerDidAdd(emitter, listener: (e: T) => any, thisArgs?: any) { if (nextTick) { setTimeout(() => flush(listener, thisArgs)); } else { diff --git a/src/vs/base/common/graph.ts b/src/vs/base/common/graph.ts index dfc55da2022..7a686cce360 100644 --- a/src/vs/base/common/graph.ts +++ b/src/vs/base/common/graph.ts @@ -30,7 +30,7 @@ export class Graph { } roots(): Node[] { - var ret: Node[] = []; + const ret: Node[] = []; forEach(this._nodes, entry => { if (isEmptyObject(entry.value.outgoing)) { ret.push(entry.value); @@ -40,7 +40,7 @@ export class Graph { } traverse(start: T, inwards: boolean, callback: (data: T) => void): void { - var startNode = this.lookup(start); + const startNode = this.lookup(start); if (!startNode) { return; } @@ -48,18 +48,18 @@ export class Graph { } private _traverse(node: Node, inwards: boolean, seen: { [key: string]: boolean }, callback: (data: T) => void): void { - var key = this._hashFn(node.data); + const key = this._hashFn(node.data); if (seen[key]) { return; } seen[key] = true; callback(node.data); - var nodes = inwards ? node.outgoing : node.incoming; + const nodes = inwards ? node.outgoing : node.incoming; forEach(nodes, (entry) => this._traverse(entry.value, inwards, seen, callback)); } insertEdge(from: T, to: T): void { - var fromNode = this.lookupOrInsertNode(from), + const fromNode = this.lookupOrInsertNode(from), toNode = this.lookupOrInsertNode(to); fromNode.outgoing[this._hashFn(to)] = toNode; @@ -67,7 +67,7 @@ export class Graph { } removeNode(data: T): void { - var key = this._hashFn(data); + const key = this._hashFn(data); delete this._nodes[key]; forEach(this._nodes, (entry) => { delete entry.value.outgoing[key]; diff --git a/src/vs/base/common/json.ts b/src/vs/base/common/json.ts index c54e96c9e9d..ee28dec9890 100644 --- a/src/vs/base/common/json.ts +++ b/src/vs/base/common/json.ts @@ -837,7 +837,7 @@ export function parse(text: string, errors: ParseError[] = [], options?: ParseOp currentParent = previousParents.pop(); }, onArrayBegin: () => { - let array = []; + let array: any[] = []; onValue(array); previousParents.push(currentParent); currentParent = array; diff --git a/src/vs/base/common/numbers.ts b/src/vs/base/common/numbers.ts index c677d7fd20f..65bcbbd7922 100644 --- a/src/vs/base/common/numbers.ts +++ b/src/vs/base/common/numbers.ts @@ -12,7 +12,8 @@ export type NumberCallback = (index: number) => void; export function count(to: number, callback: NumberCallback): void; export function count(from: number, to: number, callback: NumberCallback): void; export function count(fromOrTo: number, toOrCallback?: NumberCallback | number, callback?: NumberCallback): any { - var from: number, to: number; + let from: number; + let to: number; if (types.isNumber(toOrCallback)) { from = fromOrTo; @@ -23,10 +24,10 @@ export function count(fromOrTo: number, toOrCallback?: NumberCallback | number, callback = toOrCallback; } - var op = from <= to ? (i: number) => i + 1 : (i: number) => i - 1; - var cmp = from <= to ? (a: number, b: number) => a < b : (a: number, b: number) => a > b; + const op = from <= to ? (i: number) => i + 1 : (i: number) => i - 1; + const cmp = from <= to ? (a: number, b: number) => a < b : (a: number, b: number) => a > b; - for (var i = from; cmp(i, to); i = op(i)) { + for (let i = from; cmp(i, to); i = op(i)) { callback(i); } } @@ -34,8 +35,8 @@ export function count(fromOrTo: number, toOrCallback?: NumberCallback | number, export function countToArray(to: number): number[]; export function countToArray(from: number, to: number): number[]; export function countToArray(fromOrTo: number, to?: number): number[] { - var result: number[] = []; - var fn = (i: number) => result.push(i); + const result: number[] = []; + const fn = (i: number) => result.push(i); if (types.isUndefined(to)) { count(fromOrTo, fn); diff --git a/src/vs/base/common/objects.ts b/src/vs/base/common/objects.ts index b632954e295..e2be7bda662 100644 --- a/src/vs/base/common/objects.ts +++ b/src/vs/base/common/objects.ts @@ -16,7 +16,7 @@ export function clone(obj: T): T { return obj as any; } const result = (Array.isArray(obj)) ? [] : {}; - Object.keys(obj).forEach((key) => { + Object.keys(obj).forEach(key => { if (obj[key] && typeof obj[key] === 'object') { result[key] = clone(obj[key]); } else { @@ -31,7 +31,7 @@ export function deepClone(obj: T): T { return obj; } const result = (Array.isArray(obj)) ? [] : {}; - Object.getOwnPropertyNames(obj).forEach((key) => { + Object.getOwnPropertyNames(obj).forEach(key => { if (obj[key] && typeof obj[key] === 'object') { result[key] = deepClone(obj[key]); } else { @@ -93,7 +93,7 @@ export function mixin(destination: any, source: any, overwrite: boolean = true): } if (isObject(source)) { - Object.keys(source).forEach((key) => { + Object.keys(source).forEach(key => { if (key in destination) { if (overwrite) { if (isObject(destination[key]) && isObject(source[key])) { @@ -111,7 +111,7 @@ export function mixin(destination: any, source: any, overwrite: boolean = true): } export function assign(destination: any, ...sources: any[]): any { - sources.forEach(source => Object.keys(source).forEach((key) => destination[key] = source[key])); + sources.forEach(source => Object.keys(source).forEach(key => destination[key] = source[key])); return destination; } diff --git a/src/vs/base/common/severity.ts b/src/vs/base/common/severity.ts index 8728371bbdd..96d698cb449 100644 --- a/src/vs/base/common/severity.ts +++ b/src/vs/base/common/severity.ts @@ -16,12 +16,12 @@ enum Severity { namespace Severity { - var _error = 'error', - _warning = 'warning', - _warn = 'warn', - _info = 'info'; + const _error = 'error'; + const _warning = 'warning'; + const _warn = 'warn'; + const _info = 'info'; - var _displayStrings: { [value: number]: string; } = Object.create(null); + const _displayStrings: { [value: number]: string; } = Object.create(null); _displayStrings[Severity.Error] = nls.localize('sev.error', "Error"); _displayStrings[Severity.Warning] = nls.localize('sev.warning', "Warning"); _displayStrings[Severity.Info] = nls.localize('sev.info', "Info"); diff --git a/src/vs/base/common/winjs.base.d.ts b/src/vs/base/common/winjs.base.d.ts index 434db0a5fa8..54cfd1ada1c 100644 --- a/src/vs/base/common/winjs.base.d.ts +++ b/src/vs/base/common/winjs.base.d.ts @@ -49,7 +49,7 @@ export declare class Promise { /** * @internal */ - public static addEventListener(event: 'error', promiseErrorHandler: (e: IPromiseError) => void); + public static addEventListener(event: 'error', promiseErrorHandler: (e: IPromiseError) => void): void; } export type TValueCallback = (value: T | PromiseLike) => void; diff --git a/src/vs/base/common/worker/simpleWorker.ts b/src/vs/base/common/worker/simpleWorker.ts index a5e37fd5803..b5bb4b45d3d 100644 --- a/src/vs/base/common/worker/simpleWorker.ts +++ b/src/vs/base/common/worker/simpleWorker.ts @@ -242,7 +242,7 @@ export class SimpleWorkerClient extends Disposable { loaderConfiguration ]); this._onModuleLoaded.then((availableMethods: string[]) => { - let proxy = {}; + let proxy = {}; for (let i = 0; i < availableMethods.length; i++) { proxy[availableMethods[i]] = createProxyMethod(availableMethods[i], proxyMethodRequest); } diff --git a/src/vs/base/node/crypto.ts b/src/vs/base/node/crypto.ts index 0c77dbccfb8..b658da126b6 100644 --- a/src/vs/base/node/crypto.ts +++ b/src/vs/base/node/crypto.ts @@ -32,7 +32,7 @@ export function checksum(path: string, sha1hash: string): TPromise { input.once('error', done); input.once('end', done); hashStream.once('error', done); - hashStream.once('data', data => done(null, data.toString('hex'))); + hashStream.once('data', (data: NodeBuffer) => done(null, data.toString('hex'))); }); return promise.then(hash => { diff --git a/src/vs/base/node/encoding.ts b/src/vs/base/node/encoding.ts index cb8f8d026e2..8656fbe19cb 100644 --- a/src/vs/base/node/encoding.ts +++ b/src/vs/base/node/encoding.ts @@ -97,7 +97,7 @@ export function detectEncodingByBOM(file: string): TPromise { const MINIMUM_THRESHOLD = 0.2; const IGNORE_ENCODINGS = ['ascii', 'utf-8', 'utf-16', 'utf-32']; -const MAPPED_ENCODINGS = { +const MAPPED_ENCODINGS: { [name: string]: string } = { 'ibm866': 'cp866' }; diff --git a/src/vs/base/node/extfs.ts b/src/vs/base/node/extfs.ts index 3be832166cb..9d05bf98bfb 100644 --- a/src/vs/base/node/extfs.ts +++ b/src/vs/base/node/extfs.ts @@ -42,7 +42,7 @@ export function readdir(path: string, callback: (error: Error, files: string[]) } export function mkdirp(path: string, mode: number, callback: (error: Error) => void): void { - fs.exists(path, (exists) => { + fs.exists(path, exists => { if (exists) { return isDirectory(path, (err: Error, itIs?: boolean) => { if (err) { @@ -61,7 +61,7 @@ export function mkdirp(path: string, mode: number, callback: (error: Error) => v if (err) { callback(err); return; } if (mode) { - fs.mkdir(path, mode, (error) => { + fs.mkdir(path, mode, error => { if (error) { return callback(error); } @@ -98,10 +98,10 @@ export function copy(source: string, target: string, callback: (error: Error) => copiedSources[source] = true; // remember as copied } - mkdirp(target, stat.mode & 511, (err) => { + mkdirp(target, stat.mode & 511, err => { readdir(source, (err, files) => { - loop(files, (file: string, clb: (error: Error, _result) => void) => { - copy(paths.join(source, file), paths.join(target, file), (error: Error) => clb(error, undefined), copiedSources); + loop(files, (file: string, clb: (error: Error, result: string[]) => void) => { + copy(paths.join(source, file), paths.join(target, file), (error: Error) => clb(error, void 0), copiedSources); }, callback); }); }); @@ -147,7 +147,7 @@ function pipeFs(source: string, target: string, mode: number, callback: (error: // will fail in case any file is used by another process. fs.unlink() in node will not bail if a file unlinked is used by another process. // However, the consequences are bad as outlined in all the related bugs from https://github.com/joyent/node/issues/7164 export function del(path: string, tmpFolder: string, callback: (error: Error) => void, done?: (error: Error) => void): void { - fs.exists(path, (exists) => { + fs.exists(path, exists => { if (!exists) { return callback(null); } @@ -173,7 +173,7 @@ export function del(path: string, tmpFolder: string, callback: (error: Error) => callback(null); // do the heavy deletion outside the callers callback - rmRecursive(pathInTemp, (error) => { + rmRecursive(pathInTemp, error => { if (error) { console.error(error); } @@ -192,7 +192,7 @@ function rmRecursive(path: string, callback: (error: Error) => void): void { return callback(new Error('Will not delete root!')); } - fs.exists(path, (exists) => { + fs.exists(path, exists => { if (!exists) { callback(null); } else { @@ -221,7 +221,7 @@ function rmRecursive(path: string, callback: (error: Error) => void): void { } else { let firstError: Error = null; let childrenLeft = children.length; - children.forEach((child) => { + children.forEach(child => { rmRecursive(paths.join(path, child), (err: Error) => { childrenLeft--; if (err) { @@ -348,13 +348,13 @@ export function writeFileAndFlush(path: string, data: string | NodeBuffer, optio } // It is valid to pass a fd handle to fs.writeFile() and this will keep the handle open! - fs.writeFile(fd, data, (writeError) => { + fs.writeFile(fd, data, writeError => { if (writeError) { return fs.close(fd, () => callback(writeError)); // still need to close the handle on error! } // Flush contents (not metadata) of the file to disk - fs.fdatasync(fd, (syncError) => { + fs.fdatasync(fd, (syncError: Error) => { // In some exotic setups it is well possible that node fails to sync // In that case we disable flushing and warn to the console @@ -363,7 +363,7 @@ export function writeFileAndFlush(path: string, data: string | NodeBuffer, optio canFlush = false; } - return fs.close(fd, (closeError) => callback(closeError)); + return fs.close(fd, closeError => callback(closeError)); }); }); }); diff --git a/src/vs/base/node/processes.ts b/src/vs/base/node/processes.ts index 01c460d1aec..dd74afe32f8 100644 --- a/src/vs/base/node/processes.ts +++ b/src/vs/base/node/processes.ts @@ -455,7 +455,7 @@ export interface IQueuedSender { // On Windows we always wait for the send() method to return before sending the next message // to workaround https://github.com/nodejs/node/issues/7657 (IPC can freeze process) export function createQueuedSender(childProcess: ChildProcess | NodeJS.Process): IQueuedSender { - let msgQueue = []; + let msgQueue: string[] = []; let useQueue = false; const send = function (msg: any): void { @@ -464,7 +464,7 @@ export function createQueuedSender(childProcess: ChildProcess | NodeJS.Process): return; } - let result = childProcess.send(msg, error => { + let result = childProcess.send(msg, (error: Error) => { if (error) { console.error(error); // unlikely to happen, best we can do is log this error } diff --git a/src/vs/base/node/profiler.ts b/src/vs/base/node/profiler.ts index c19ba021b69..782c20e28f1 100644 --- a/src/vs/base/node/profiler.ts +++ b/src/vs/base/node/profiler.ts @@ -62,14 +62,14 @@ export function removePiiPaths(profile: Profile) { } declare interface Profiler { - startProfiling(name: string); + startProfiling(name: string): void; stopProfiling(): Profile; } export declare interface Profile { title: string; - export(callback: (err, data) => void); - delete(); + export(callback: (err, data) => void): void; + delete(): void; head: ProfileSample; } diff --git a/src/vs/base/node/request.ts b/src/vs/base/node/request.ts index d46e8b6e58c..30fdfb643fb 100644 --- a/src/vs/base/node/request.ts +++ b/src/vs/base/node/request.ts @@ -144,7 +144,7 @@ export function asText(context: IRequestContext): TPromise { } let buffer: string[] = []; - context.stream.on('data', d => buffer.push(d)); + context.stream.on('data', (d: string) => buffer.push(d)); context.stream.on('end', () => c(buffer.join(''))); context.stream.on('error', e); }); @@ -165,7 +165,7 @@ export function asJson(context: IRequestContext): TPromise { } const buffer: string[] = []; - context.stream.on('data', d => buffer.push(d)); + context.stream.on('data', (d: string) => buffer.push(d)); context.stream.on('end', () => c(JSON.parse(buffer.join('')))); context.stream.on('error', e); }); diff --git a/src/vs/base/node/startupTimers.d.ts b/src/vs/base/node/startupTimers.d.ts index 2fae1f8eab1..432cb72088e 100644 --- a/src/vs/base/node/startupTimers.d.ts +++ b/src/vs/base/node/startupTimers.d.ts @@ -28,7 +28,7 @@ declare interface TickController { export function startTimer(name: string): TickController; -export function stopTimer(name: string); +export function stopTimer(name: string): void; export function ticks(): Tick[]; diff --git a/src/vs/base/parts/ipc/common/ipc.ts b/src/vs/base/parts/ipc/common/ipc.ts index 67bc23f05f6..01bd2037e57 100644 --- a/src/vs/base/parts/ipc/common/ipc.ts +++ b/src/vs/base/parts/ipc/common/ipc.ts @@ -207,7 +207,7 @@ export class ChannelClient implements IChannelClient, IDisposable { } getChannel(channelName: string): T { - const call = (command, arg) => this.request(channelName, command, arg); + const call = (command: string, arg: any) => this.request(channelName, command, arg); return { call } as T; } @@ -452,14 +452,14 @@ export class IPCClient implements IChannelClient, IChannelServer, IDisposable { } export function getDelayedChannel(promise: TPromise): T { - const call = (command, arg) => promise.then(c => c.call(command, arg)); + const call = (command: string, arg: any) => promise.then(c => c.call(command, arg)); return { call } as T; } export function getNextTickChannel(channel: T): T { let didTick = false; - const call = (command, arg) => { + const call = (command: string, arg: any) => { if (didTick) { return channel.call(command, arg); } diff --git a/src/vs/base/parts/ipc/node/ipc.cp.ts b/src/vs/base/parts/ipc/node/ipc.cp.ts index 683d6a85f5d..45d401724c4 100644 --- a/src/vs/base/parts/ipc/node/ipc.cp.ts +++ b/src/vs/base/parts/ipc/node/ipc.cp.ts @@ -89,7 +89,7 @@ export class Client implements IChannelClient, IDisposable { } getChannel(channelName: string): T { - const call = (command, arg) => this.request(channelName, command, arg); + const call = (command: string, arg: any) => this.request(channelName, command, arg); return { call } as T; } diff --git a/src/vs/base/parts/ipc/node/ipc.net.ts b/src/vs/base/parts/ipc/node/ipc.net.ts index c34d263e869..e4194ca6693 100644 --- a/src/vs/base/parts/ipc/node/ipc.net.ts +++ b/src/vs/base/parts/ipc/node/ipc.net.ts @@ -34,7 +34,7 @@ export class Protocol implements IMessagePassingProtocol { constructor(private _socket: Socket) { - let chunks = []; + let chunks: Buffer[] = []; let totalLength = 0; const state = { diff --git a/src/vs/base/parts/tree/browser/treeDefaults.ts b/src/vs/base/parts/tree/browser/treeDefaults.ts index bc4ccdc1b73..05e19027d4f 100644 --- a/src/vs/base/parts/tree/browser/treeDefaults.ts +++ b/src/vs/base/parts/tree/browser/treeDefaults.ts @@ -131,7 +131,7 @@ export class DefaultController implements _.IController { } public onClick(tree: _.ITree, element: any, event: mouse.IMouseEvent): boolean { - var isMac = platform.isMacintosh; + const isMac = platform.isMacintosh; // A Ctrl click on the Mac is a context menu event if (isMac && event.ctrlKey) { @@ -152,13 +152,13 @@ export class DefaultController implements _.IController { } protected onLeftClick(tree: _.ITree, element: any, eventish: ICancelableEvent, origin: string = 'mouse'): boolean { - var payload = { origin: origin, originalEvent: eventish }; + const payload = { origin: origin, originalEvent: eventish }; if (tree.getInput() === element) { tree.clearFocus(payload); tree.clearSelection(payload); } else { - var isMouseDown = eventish && (eventish).browserEvent && (eventish).browserEvent.type === 'mousedown'; + const isMouseDown = eventish && (eventish).browserEvent && (eventish).browserEvent.type === 'mousedown'; if (!isMouseDown) { eventish.preventDefault(); // we cannot preventDefault onMouseDown because this would break DND otherwise } @@ -193,7 +193,7 @@ export class DefaultController implements _.IController { } public onTap(tree: _.ITree, element: any, event: touch.GestureEvent): boolean { - var target = event.initialTarget; + const target = event.initialTarget; if (target && target.tagName && target.tagName.toLowerCase() === 'input') { return false; // Ignore event if target is a form input field (avoids browser specific issues) @@ -211,7 +211,7 @@ export class DefaultController implements _.IController { } private onKey(bindings: KeybindingDispatcher, tree: _.ITree, event: IKeyboardEvent): boolean { - var handler = bindings.dispatch(event.toKeybinding()); + const handler = bindings.dispatch(event.toKeybinding()); if (handler) { if (handler(tree, event)) { event.preventDefault(); @@ -223,7 +223,7 @@ export class DefaultController implements _.IController { } protected onUp(tree: _.ITree, event: IKeyboardEvent): boolean { - var payload = { origin: 'keyboard', originalEvent: event }; + const payload = { origin: 'keyboard', originalEvent: event }; if (tree.getHighlight()) { tree.clearHighlight(payload); @@ -235,7 +235,7 @@ export class DefaultController implements _.IController { } protected onPageUp(tree: _.ITree, event: IKeyboardEvent): boolean { - var payload = { origin: 'keyboard', originalEvent: event }; + const payload = { origin: 'keyboard', originalEvent: event }; if (tree.getHighlight()) { tree.clearHighlight(payload); @@ -247,7 +247,7 @@ export class DefaultController implements _.IController { } protected onDown(tree: _.ITree, event: IKeyboardEvent): boolean { - var payload = { origin: 'keyboard', originalEvent: event }; + const payload = { origin: 'keyboard', originalEvent: event }; if (tree.getHighlight()) { tree.clearHighlight(payload); @@ -259,7 +259,7 @@ export class DefaultController implements _.IController { } protected onPageDown(tree: _.ITree, event: IKeyboardEvent): boolean { - var payload = { origin: 'keyboard', originalEvent: event }; + const payload = { origin: 'keyboard', originalEvent: event }; if (tree.getHighlight()) { tree.clearHighlight(payload); @@ -271,7 +271,7 @@ export class DefaultController implements _.IController { } protected onHome(tree: _.ITree, event: IKeyboardEvent): boolean { - var payload = { origin: 'keyboard', originalEvent: event }; + const payload = { origin: 'keyboard', originalEvent: event }; if (tree.getHighlight()) { tree.clearHighlight(payload); @@ -283,7 +283,7 @@ export class DefaultController implements _.IController { } protected onEnd(tree: _.ITree, event: IKeyboardEvent): boolean { - var payload = { origin: 'keyboard', originalEvent: event }; + const payload = { origin: 'keyboard', originalEvent: event }; if (tree.getHighlight()) { tree.clearHighlight(payload); @@ -295,12 +295,12 @@ export class DefaultController implements _.IController { } protected onLeft(tree: _.ITree, event: IKeyboardEvent): boolean { - var payload = { origin: 'keyboard', originalEvent: event }; + const payload = { origin: 'keyboard', originalEvent: event }; if (tree.getHighlight()) { tree.clearHighlight(payload); } else { - var focus = tree.getFocus(); + const focus = tree.getFocus(); tree.collapse(focus).then(didCollapse => { if (focus && !didCollapse) { tree.focusParent(payload); @@ -313,12 +313,12 @@ export class DefaultController implements _.IController { } protected onRight(tree: _.ITree, event: IKeyboardEvent): boolean { - var payload = { origin: 'keyboard', originalEvent: event }; + const payload = { origin: 'keyboard', originalEvent: event }; if (tree.getHighlight()) { tree.clearHighlight(payload); } else { - var focus = tree.getFocus(); + const focus = tree.getFocus(); tree.expand(focus).then(didExpand => { if (focus && !didExpand) { tree.focusFirstChild(payload); @@ -331,12 +331,12 @@ export class DefaultController implements _.IController { } protected onEnter(tree: _.ITree, event: IKeyboardEvent): boolean { - var payload = { origin: 'keyboard', originalEvent: event }; + const payload = { origin: 'keyboard', originalEvent: event }; if (tree.getHighlight()) { return false; } - var focus = tree.getFocus(); + const focus = tree.getFocus(); if (focus) { tree.setSelection([focus], payload); } @@ -347,7 +347,7 @@ export class DefaultController implements _.IController { if (tree.getHighlight()) { return false; } - var focus = tree.getFocus(); + const focus = tree.getFocus(); if (focus) { tree.toggleExpansion(focus); } @@ -355,7 +355,7 @@ export class DefaultController implements _.IController { } protected onEscape(tree: _.ITree, event: IKeyboardEvent): boolean { - var payload = { origin: 'keyboard', originalEvent: event }; + const payload = { origin: 'keyboard', originalEvent: event }; if (tree.getHighlight()) { tree.clearHighlight(payload); diff --git a/src/vs/base/parts/tree/browser/treeModel.ts b/src/vs/base/parts/tree/browser/treeModel.ts index dbe811c875b..1c5623fab9e 100644 --- a/src/vs/base/parts/tree/browser/treeModel.ts +++ b/src/vs/base/parts/tree/browser/treeModel.ts @@ -556,7 +556,7 @@ export class Item extends Events.EventEmitter { } private mapEachChild(fn: (child: Item) => T): T[] { - var result = []; + var result: T[] = []; this.forEachChild((child) => { result.push(fn(child)); }); diff --git a/src/vs/code/electron-main/app.ts b/src/vs/code/electron-main/app.ts index 24cc017e120..51b6db552f4 100644 --- a/src/vs/code/electron-main/app.ts +++ b/src/vs/code/electron-main/app.ts @@ -134,7 +134,7 @@ export class CodeApplication { !source || (URI.parse(source.toLowerCase()).toString() as any).startsWith(URI.file(this.environmentService.appRoot.toLowerCase()).toString()); app.on('web-contents-created', (event, contents) => { - contents.on('will-attach-webview', (event, webPreferences, params) => { + contents.on('will-attach-webview', (event: Electron.Event, webPreferences, params) => { delete webPreferences.preload; webPreferences.nodeIntegration = false; diff --git a/src/vs/code/electron-main/keyboard.ts b/src/vs/code/electron-main/keyboard.ts index 209d521ae59..e44e0cda3eb 100644 --- a/src/vs/code/electron-main/keyboard.ts +++ b/src/vs/code/electron-main/keyboard.ts @@ -157,7 +157,7 @@ export class KeybindingsResolver { private resolveKeybindings(win = this.windowsService.getLastActiveWindow()): void { if (this.commandIds.size && win) { - const commandIds = []; + const commandIds: string[] = []; this.commandIds.forEach(id => commandIds.push(id)); win.sendWhenReady('vscode:resolveKeybindings', JSON.stringify(commandIds)); } diff --git a/src/vs/code/electron-main/menus.ts b/src/vs/code/electron-main/menus.ts index 00423f78d34..782824af672 100644 --- a/src/vs/code/electron-main/menus.ts +++ b/src/vs/code/electron-main/menus.ts @@ -1054,7 +1054,7 @@ export class CodeMenu { private createMenuItem(label: string, click: () => void, enabled?: boolean, checked?: boolean): Electron.MenuItem; private createMenuItem(arg1: string, arg2: any, arg3?: boolean, arg4?: boolean): Electron.MenuItem { const label = this.mnemonicLabel(arg1); - const click: () => void = (typeof arg2 === 'function') ? arg2 : (menuItem, win, event) => { + const click: () => void = (typeof arg2 === 'function') ? arg2 : (menuItem: Electron.MenuItem, win: Electron.BrowserWindow, event: Electron.Event & Electron.Modifiers) => { let commandId = arg2; if (Array.isArray(arg2)) { commandId = this.isOptionClick(event) ? arg2[1] : arg2[0]; // support alternative action if we got multiple action Ids and the option key was pressed while invoking diff --git a/src/vs/code/electron-main/sharedProcess.ts b/src/vs/code/electron-main/sharedProcess.ts index 894764ffa59..e86865b7166 100644 --- a/src/vs/code/electron-main/sharedProcess.ts +++ b/src/vs/code/electron-main/sharedProcess.ts @@ -40,7 +40,7 @@ export class SharedProcess implements ISharedProcess { this.window.loadURL(url); // Prevent the window from dying - const onClose = e => { + const onClose = (e: Event) => { if (this.window.isVisible()) { e.preventDefault(); this.window.hide(); diff --git a/src/vs/code/electron-main/window.ts b/src/vs/code/electron-main/window.ts index ddaf797fdc5..4c8f21fa523 100644 --- a/src/vs/code/electron-main/window.ts +++ b/src/vs/code/electron-main/window.ts @@ -428,7 +428,7 @@ export class CodeWindow implements ICodeWindow { }; private registerNavigationListenerOn(command: 'swipe' | 'app-command', back: 'left' | 'browser-backward', forward: 'right' | 'browser-forward', acrossEditors: boolean) { - this._win.on(command, (e, cmd) => { + this._win.on(command, (e: Electron.Event, cmd: string) => { if (this.readyState !== ReadyState.READY) { return; // window must be ready } diff --git a/src/vs/code/electron-main/windows.ts b/src/vs/code/electron-main/windows.ts index e51eab3e1bb..f40f47dfb44 100644 --- a/src/vs/code/electron-main/windows.ts +++ b/src/vs/code/electron-main/windows.ts @@ -358,7 +358,7 @@ export class WindowsManager implements IWindowsMainService { // When run with --add, take the folders that are to be opened as // folders that should be added to the currently active window. - let foldersToAdd = []; + let foldersToAdd: IPath[] = []; if (openConfig.addMode && product.quality !== 'stable') { // TODO@Ben multi root foldersToAdd = pathsToOpen.filter(path => !!path.folderPath).map(path => ({ filePath: path.folderPath })); pathsToOpen = pathsToOpen.filter(path => !path.folderPath); diff --git a/src/vs/code/node/cliProcessMain.ts b/src/vs/code/node/cliProcessMain.ts index 99fb1e05f6e..2aab9956ea2 100644 --- a/src/vs/code/node/cliProcessMain.ts +++ b/src/vs/code/node/cliProcessMain.ts @@ -33,8 +33,8 @@ import { mkdirp } from 'vs/base/node/pfs'; import { IChoiceService } from 'vs/platform/message/common/message'; import { ChoiceCliService } from 'vs/platform/message/node/messageCli'; -const notFound = id => localize('notFound', "Extension '{0}' not found.", id); -const notInstalled = id => localize('notInstalled', "Extension '{0}' is not installed.", id); +const notFound = (id: string) => localize('notFound', "Extension '{0}' not found.", id); +const notInstalled = (id: string) => localize('notInstalled', "Extension '{0}' is not installed.", id); const useId = localize('useId', "Make sure you use the full extension ID, including the publisher, eg: {0}", 'ms-vscode.csharp'); function getId(manifest: IExtensionManifest, withVersion?: boolean): string { diff --git a/src/vs/editor/common/editorCommon.ts b/src/vs/editor/common/editorCommon.ts index 989cecb06ed..a8faeb62a75 100644 --- a/src/vs/editor/common/editorCommon.ts +++ b/src/vs/editor/common/editorCommon.ts @@ -1646,7 +1646,7 @@ export interface IEditorContribution { /** * @internal */ -export function isThemeColor(o): o is ThemeColor { +export function isThemeColor(o: any): o is ThemeColor { return o && typeof o.id === 'string'; } diff --git a/src/vs/editor/common/model/modelLine.ts b/src/vs/editor/common/model/modelLine.ts index 0c1f97112e1..e71219bd689 100644 --- a/src/vs/editor/common/model/modelLine.ts +++ b/src/vs/editor/common/model/modelLine.ts @@ -196,7 +196,7 @@ export abstract class AbstractModelLine { /// public abstract get text(): string; - protected abstract _setText(text: string, tabSize: number); + protected abstract _setText(text: string, tabSize: number): void; protected abstract _createTokensAdjuster(): ITokensAdjuster; protected abstract _createModelLine(text: string, tabSize: number): IModelLine; diff --git a/src/vs/editor/contrib/find/browser/simpleFindWidget.ts b/src/vs/editor/contrib/find/browser/simpleFindWidget.ts index 3df3b1f3acd..d9fb0b3ca12 100644 --- a/src/vs/editor/contrib/find/browser/simpleFindWidget.ts +++ b/src/vs/editor/contrib/find/browser/simpleFindWidget.ts @@ -119,12 +119,12 @@ export abstract class SimpleFindWidget extends Widget { })); } - protected abstract onInputChanged(); - protected abstract find(previous: boolean); - protected abstract onFocusTrackerFocus(); - protected abstract onFocusTrackerBlur(); - protected abstract onFindInputFocusTrackerFocus(); - protected abstract onFindInputFocusTrackerBlur(); + protected abstract onInputChanged(): void; + protected abstract find(previous: boolean): void; + protected abstract onFocusTrackerFocus(): void; + protected abstract onFocusTrackerBlur(): void; + protected abstract onFindInputFocusTrackerFocus(): void; + protected abstract onFindInputFocusTrackerBlur(): void; protected get inputValue() { return this._findInput.getValue(); diff --git a/src/vs/editor/contrib/folding/browser/folding.ts b/src/vs/editor/contrib/folding/browser/folding.ts index 480ddcce1c0..bbe359dd428 100644 --- a/src/vs/editor/contrib/folding/browser/folding.ts +++ b/src/vs/editor/contrib/folding/browser/folding.ts @@ -382,7 +382,7 @@ export class FoldingController implements IFoldingController { if (!decRange) { return; } - let isLineHidden = line => line > decRange.startLineNumber && line <= decRange.endLineNumber; + let isLineHidden = (line: number) => line > decRange.startLineNumber && line <= decRange.endLineNumber; hiddenAreas.push(new Range(decRange.startLineNumber + 1, 1, decRange.endLineNumber, 1)); selections.forEach((selection, i) => { if (isLineHidden(selection.getStartPosition().lineNumber)) { diff --git a/src/vs/editor/contrib/indentation/common/indentUtils.ts b/src/vs/editor/contrib/indentation/common/indentUtils.ts index 45ee5c36566..8b5bde5ccc6 100644 --- a/src/vs/editor/contrib/indentation/common/indentUtils.ts +++ b/src/vs/editor/contrib/indentation/common/indentUtils.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -export function getSpaceCnt(str, tabSize) { +export function getSpaceCnt(str: string, tabSize: number) { let spacesCnt = 0; for (let i = 0; i < str.length; i++) { @@ -17,7 +17,7 @@ export function getSpaceCnt(str, tabSize) { return spacesCnt; } -export function generateIndent(spacesCnt: number, tabSize, insertSpaces) { +export function generateIndent(spacesCnt: number, tabSize: number, insertSpaces: boolean) { spacesCnt = spacesCnt < 0 ? 0 : spacesCnt; let result = ''; diff --git a/src/vs/editor/contrib/indentation/common/indentation.ts b/src/vs/editor/contrib/indentation/common/indentation.ts index bda4cbaf38f..cd9add8748f 100644 --- a/src/vs/editor/contrib/indentation/common/indentation.ts +++ b/src/vs/editor/contrib/indentation/common/indentation.ts @@ -431,7 +431,7 @@ export class AutoIndentOnPaste implements IEditorContribution { let textEdits: TextEdit[] = []; let indentConverter = { - shiftIndent: (indentation) => { + shiftIndent: (indentation: string) => { let desiredIndentCount = ShiftCommand.shiftIndentCount(indentation, indentation.length + 1, tabSize); let newIndentation = ''; for (let i = 0; i < desiredIndentCount; i++) { @@ -440,7 +440,7 @@ export class AutoIndentOnPaste implements IEditorContribution { return newIndentation; }, - unshiftIndent: (indentation) => { + unshiftIndent: (indentation: string) => { let desiredIndentCount = ShiftCommand.unshiftIndentCount(indentation, indentation.length + 1, tabSize); let newIndentation = ''; for (let i = 0; i < desiredIndentCount; i++) { @@ -496,7 +496,7 @@ export class AutoIndentOnPaste implements IEditorContribution { getLanguageIdAtPosition: (lineNumber: number, column: number) => { return model.getLanguageIdAtPosition(lineNumber, column); }, - getLineContent: (lineNumber) => { + getLineContent: (lineNumber: number) => { if (lineNumber === startLineNumber) { return firstLineText; } else { diff --git a/src/vs/editor/contrib/linesOperations/common/moveLinesCommand.ts b/src/vs/editor/contrib/linesOperations/common/moveLinesCommand.ts index 8def37367b3..fb56ba6da5f 100644 --- a/src/vs/editor/contrib/linesOperations/common/moveLinesCommand.ts +++ b/src/vs/editor/contrib/linesOperations/common/moveLinesCommand.ts @@ -108,7 +108,7 @@ export class MoveLinesCommand implements ICommand { insertingText = newIndentation + this.trimLeft(movingLineText); } else { // no enter rule matches, let's check indentatin rules then. - virtualModel.getLineContent = (lineNumber) => { + virtualModel.getLineContent = (lineNumber: number) => { if (lineNumber === s.startLineNumber) { return model.getLineContent(movingLineNumber); } else { @@ -140,7 +140,7 @@ export class MoveLinesCommand implements ICommand { } } else { // it doesn't match onEnter rules, let's check indentation rules then. - virtualModel.getLineContent = (lineNumber) => { + virtualModel.getLineContent = (lineNumber: number) => { if (lineNumber === s.startLineNumber) { return insertingText; } else if (lineNumber >= s.startLineNumber + 1 && lineNumber <= s.endLineNumber + 1) { diff --git a/src/vs/editor/contrib/snippet/browser/snippetParser.ts b/src/vs/editor/contrib/snippet/browser/snippetParser.ts index d72786b34c2..5f559ad3c2f 100644 --- a/src/vs/editor/contrib/snippet/browser/snippetParser.ts +++ b/src/vs/editor/contrib/snippet/browser/snippetParser.ts @@ -172,7 +172,7 @@ export abstract class Marker { } } - toString() { + toString(): string { return this.children.reduce((prev, cur) => prev + cur.toString(), ''); } diff --git a/src/vs/editor/standalone/browser/iPadShowKeyboard/iPadShowKeyboard.ts b/src/vs/editor/standalone/browser/iPadShowKeyboard/iPadShowKeyboard.ts index 65b277ed045..4bad5be0cbf 100644 --- a/src/vs/editor/standalone/browser/iPadShowKeyboard/iPadShowKeyboard.ts +++ b/src/vs/editor/standalone/browser/iPadShowKeyboard/iPadShowKeyboard.ts @@ -32,8 +32,8 @@ export class IPadShowKeyboard implements IEditorContribution { } private update(): void { - var hasWidget = (!!this.widget); - var shouldHaveWidget = (!this.editor.getConfiguration().readOnly); + const hasWidget = (!!this.widget); + const shouldHaveWidget = (!this.editor.getConfiguration().readOnly); if (!hasWidget && shouldHaveWidget) { diff --git a/src/vs/editor/standalone/browser/quickOpen/editorQuickOpen.ts b/src/vs/editor/standalone/browser/quickOpen/editorQuickOpen.ts index a69ce6ca401..02a0815fab5 100644 --- a/src/vs/editor/standalone/browser/quickOpen/editorQuickOpen.ts +++ b/src/vs/editor/standalone/browser/quickOpen/editorQuickOpen.ts @@ -102,20 +102,20 @@ export class QuickOpenController implements editorCommon.IEditorContribution { public decorateLine(range: Range, editor: ICodeEditor): void { editor.changeDecorations((changeAccessor: editorCommon.IModelDecorationsChangeAccessor) => { - var oldDecorations: string[] = []; + const oldDecorations: string[] = []; if (this.rangeHighlightDecorationId) { oldDecorations.push(this.rangeHighlightDecorationId); this.rangeHighlightDecorationId = null; } - var newDecorations: editorCommon.IModelDeltaDecoration[] = [ + const newDecorations: editorCommon.IModelDeltaDecoration[] = [ { range: range, options: QuickOpenController._RANGE_HIGHLIGHT_DECORATION } ]; - var decorations = changeAccessor.deltaDecorations(oldDecorations, newDecorations); + const decorations = changeAccessor.deltaDecorations(oldDecorations, newDecorations); this.rangeHighlightDecorationId = decorations[0]; }); } diff --git a/src/vs/editor/standalone/browser/quickOpen/quickOpenEditorWidget.ts b/src/vs/editor/standalone/browser/quickOpen/quickOpenEditorWidget.ts index 65a05955bbb..abae373223b 100644 --- a/src/vs/editor/standalone/browser/quickOpen/quickOpenEditorWidget.ts +++ b/src/vs/editor/standalone/browser/quickOpen/quickOpenEditorWidget.ts @@ -82,7 +82,7 @@ export class QuickOpenEditorWidget implements IOverlayWidget { public show(value: string): void { this.visible = true; - var editorLayout = this.codeEditor.getLayoutInfo(); + const editorLayout = this.codeEditor.getLayoutInfo(); if (editorLayout) { this.quickOpenWidget.layout(new Dimension(editorLayout.width, editorLayout.height)); } diff --git a/src/vs/editor/standalone/common/standaloneThemeService.ts b/src/vs/editor/standalone/common/standaloneThemeService.ts index 99e5bea9282..7dfc0bdbdfb 100644 --- a/src/vs/editor/standalone/common/standaloneThemeService.ts +++ b/src/vs/editor/standalone/common/standaloneThemeService.ts @@ -8,7 +8,7 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation' import { TokenTheme, ITokenThemeRule } from 'vs/editor/common/modes/supports/tokenization'; import { ITheme, IThemeService } from 'vs/platform/theme/common/themeService'; -export var IStandaloneThemeService = createDecorator('themeService'); +export const IStandaloneThemeService = createDecorator('themeService'); export type BuiltinTheme = 'vs' | 'vs-dark' | 'hc-black'; export type IColors = { [colorId: string]: string; }; diff --git a/src/vs/platform/actions/common/actions.ts b/src/vs/platform/actions/common/actions.ts index 84b232e0130..e85b6fdd2a8 100644 --- a/src/vs/platform/actions/common/actions.ts +++ b/src/vs/platform/actions/common/actions.ts @@ -186,7 +186,7 @@ export class MenuItemAction extends ExecuteCommandAction { } run(...args: any[]): TPromise { - let runArgs = []; + let runArgs: any[] = []; if (this._options.arg) { runArgs = [...runArgs, this._options.arg]; diff --git a/src/vs/platform/configuration/common/model.ts b/src/vs/platform/configuration/common/model.ts index 55e875c5867..53b122efd0e 100644 --- a/src/vs/platform/configuration/common/model.ts +++ b/src/vs/platform/configuration/common/model.ts @@ -146,7 +146,7 @@ export class CustomConfigurationModel extends ConfigurationModel { currentParent = previousParents.pop(); }, onArrayBegin: () => { - let array = []; + let array: any[] = []; onValue(array); previousParents.push(currentParent); currentParent = array; diff --git a/src/vs/platform/extensionManagement/node/extensionGalleryService.ts b/src/vs/platform/extensionManagement/node/extensionGalleryService.ts index 284b79f06b6..4381d85c570 100644 --- a/src/vs/platform/extensionManagement/node/extensionGalleryService.ts +++ b/src/vs/platform/extensionManagement/node/extensionGalleryService.ts @@ -359,7 +359,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService { return this.queryGallery(query).then(({ galleryExtensions, total }) => { const extensions = galleryExtensions.map((e, index) => toExtension(e, this.extensionsGalleryUrl, index, query, options.source)); const pageSize = query.pageSize; - const getPage = pageIndex => { + const getPage = (pageIndex: number) => { const nextPageQuery = query.withPage(pageIndex + 1); return this.queryGallery(nextPageQuery) .then(({ galleryExtensions }) => galleryExtensions.map((e, index) => toExtension(e, this.extensionsGalleryUrl, index, nextPageQuery, options.source))); @@ -425,7 +425,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService { const zipPath = path.join(tmpdir(), uuid.generateUuid()); const data = getGalleryExtensionTelemetryData(extension); const startTime = new Date().getTime(); - const log = duration => this.telemetryService.publicLog('galleryService:downloadVSIX', assign(data, { duration })); + const log = (duration: number) => this.telemetryService.publicLog('galleryService:downloadVSIX', assign(data, { duration })); return this.getAsset(extension.assets.download) .then(context => download(zipPath, context)) diff --git a/src/vs/platform/instantiation/common/descriptors.ts b/src/vs/platform/instantiation/common/descriptors.ts index d5b8b94bec5..162b4be497e 100644 --- a/src/vs/platform/instantiation/common/descriptors.ts +++ b/src/vs/platform/instantiation/common/descriptors.ts @@ -44,8 +44,8 @@ export class SyncDescriptor extends AbstractDescriptor { return this._ctor; } - protected bind(...moreStaticArguments): SyncDescriptor { - let allArgs = []; + protected bind(...moreStaticArguments: any[]): SyncDescriptor { + let allArgs: any[] = []; allArgs = allArgs.concat(this.staticArguments()); allArgs = allArgs.concat(moreStaticArguments); return new SyncDescriptor(this._ctor, ...allArgs); @@ -198,8 +198,8 @@ export class AsyncDescriptor extends AbstractDescriptor implements AsyncDe return this._ctorName; } - bind(...moreStaticArguments): AsyncDescriptor { - let allArgs = []; + bind(...moreStaticArguments: any[]): AsyncDescriptor { + let allArgs: any[] = []; allArgs = allArgs.concat(this.staticArguments()); allArgs = allArgs.concat(moreStaticArguments); return new AsyncDescriptor(this.moduleName, this.ctorName, ...allArgs); diff --git a/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.ts b/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.ts index 53e5c714ec3..748d7a37ba1 100644 --- a/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.ts +++ b/src/vs/platform/jsonschemas/common/jsonValidationExtensionPoint.ts @@ -39,10 +39,10 @@ export class JSONValidationExtensionPoint { constructor() { configurationExtPoint.setHandler((extensions) => { - for (var i = 0; i < extensions.length; i++) { - var extensionValue = extensions[i].value; - var collector = extensions[i].collector; - var extensionPath = extensions[i].description.extensionFolderPath; + for (let i = 0; i < extensions.length; i++) { + const extensionValue = extensions[i].value; + const collector = extensions[i].collector; + const extensionPath = extensions[i].description.extensionFolderPath; if (!extensionValue || !Array.isArray(extensionValue)) { collector.error(nls.localize('invalid.jsonValidation', "'configuration.jsonValidation' must be a array")); diff --git a/src/vs/platform/lifecycle/electron-main/lifecycleMain.ts b/src/vs/platform/lifecycle/electron-main/lifecycleMain.ts index eaccc3a2d82..2f9dd792707 100644 --- a/src/vs/platform/lifecycle/electron-main/lifecycleMain.ts +++ b/src/vs/platform/lifecycle/electron-main/lifecycleMain.ts @@ -63,12 +63,12 @@ export interface ILifecycleService { unload(window: ICodeWindow, reason: UnloadReason, payload?: object): TPromise; - relaunch(options?: { addArgs?: string[], removeArgs?: string[] }); + relaunch(options?: { addArgs?: string[], removeArgs?: string[] }): void; quit(fromUpdate?: boolean): TPromise; isQuitRequested(): boolean; - kill(code?: number); + kill(code?: number): void; } export class LifecycleService implements ILifecycleService { diff --git a/src/vs/platform/telemetry/browser/idleMonitor.ts b/src/vs/platform/telemetry/browser/idleMonitor.ts index b80c521eecd..8b76f60b9a4 100644 --- a/src/vs/platform/telemetry/browser/idleMonitor.ts +++ b/src/vs/platform/telemetry/browser/idleMonitor.ts @@ -24,7 +24,7 @@ export class IdleMonitor extends Disposable { private _onStatusChange: Emitter; get onStatusChange(): Event { return this._onStatusChange.event; } - constructor(idleTime) { + constructor(idleTime: number) { super(); this._status = null; diff --git a/src/vs/platform/telemetry/node/appInsightsAppender.ts b/src/vs/platform/telemetry/node/appInsightsAppender.ts index 70b76286bee..898f5bfc02c 100644 --- a/src/vs/platform/telemetry/node/appInsightsAppender.ts +++ b/src/vs/platform/telemetry/node/appInsightsAppender.ts @@ -77,7 +77,7 @@ export class AppInsightsAppender implements ITelemetryAppender { for (let prop in flat) { // enforce property names less than 150 char, take the last 150 char prop = prop.length > 150 ? prop.substr(prop.length - 149) : prop; - var value = flat[prop]; + const value = flat[prop]; if (typeof value === 'number') { measurements[prop] = value; @@ -105,7 +105,7 @@ export class AppInsightsAppender implements ITelemetryAppender { return; } - for (var item of Object.getOwnPropertyNames(obj)) { + for (let item of Object.getOwnPropertyNames(obj)) { const value = obj[item]; const index = prefix ? prefix + item : item; diff --git a/src/vs/platform/theme/common/colorExtensionPoint.ts b/src/vs/platform/theme/common/colorExtensionPoint.ts index 69fa39e80a7..3d4c8e8551d 100644 --- a/src/vs/platform/theme/common/colorExtensionPoint.ts +++ b/src/vs/platform/theme/common/colorExtensionPoint.ts @@ -71,9 +71,9 @@ export class ColorExtensionPoint { constructor() { configurationExtPoint.setHandler((extensions) => { - for (var i = 0; i < extensions.length; i++) { - var extensionValue = extensions[i].value; - var collector = extensions[i].collector; + for (let i = 0; i < extensions.length; i++) { + const extensionValue = extensions[i].value; + const collector = extensions[i].collector; if (!extensionValue || !Array.isArray(extensionValue)) { collector.error(nls.localize('invalid.colorConfiguration', "'configuration.colors' must be a array")); diff --git a/src/vs/platform/theme/common/themeService.ts b/src/vs/platform/theme/common/themeService.ts index a0fa80f7919..1ae17c0ac90 100644 --- a/src/vs/platform/theme/common/themeService.ts +++ b/src/vs/platform/theme/common/themeService.ts @@ -124,22 +124,4 @@ platform.Registry.add(Extensions.ThemingContribution, themingRegistry); export function registerThemingParticipant(participant: IThemingParticipant): IDisposable { return themingRegistry.onThemeChange(participant); -} - -/** - * Tag function for strings containing css rules - */ -export function cssRule(literals, ...placeholders) { - let result = ''; - for (let i = 0; i < placeholders.length; i++) { - result += literals[i]; - let placeholder = placeholders[i]; - if (placeholder === null) { - result += 'transparent'; - } else { - result += placeholder.toString(); - } - } - result += literals[literals.length - 1]; - return result; } \ No newline at end of file diff --git a/src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts b/src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts index c84a1c9a44e..ad58576214d 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadWorkspace.ts @@ -135,15 +135,15 @@ export class MainThreadWorkspace implements MainThreadWorkspaceShape { const emitter = new Emitter(); const provider = { onDidChange: emitter.event, - resolve: (resource) => { + resolve: (resource: URI) => { return this._proxy.$resolveFile(handle, resource); }, - update: (resource, value) => { + update: (resource: URI, value: string) => { return this._proxy.$storeFile(handle, resource, value); } }; const searchProvider = { - search: (query) => { + search: (query: ISearchQuery) => { if (query.type !== QueryType.File) { return undefined; } diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts index 5fb39e7d980..84398b38cf5 100644 --- a/src/vs/workbench/api/node/extHost.protocol.ts +++ b/src/vs/workbench/api/node/extHost.protocol.ts @@ -279,7 +279,7 @@ export interface MainThreadQuickOpenShape extends IDisposable { export interface MainThreadStatusBarShape extends IDisposable { $setEntry(id: number, extensionId: string, text: string, tooltip: string, command: string, color: string | ThemeColor, alignment: MainThreadStatusBarAlignment, priority: number): void; - $dispose(id: number); + $dispose(id: number): void; } export interface MainThreadStorageShape extends IDisposable { @@ -298,7 +298,7 @@ export interface MainThreadWorkspaceShape extends IDisposable { $applyWorkspaceEdit(edits: IResourceEdit[]): TPromise; $registerFileSystemProvider(handle: number, authority: string): void; - $unregisterFileSystemProvider(handle): void; + $unregisterFileSystemProvider(handle: number): void; $onFileSystemChange(handle: number, resource: URI): void; $updateSearchSession(session: number, data): void; $finishSearchSession(session: number, err?: any): void; @@ -379,7 +379,7 @@ export interface ExtHostCommandsShape { } export interface ExtHostConfigurationShape { - $acceptConfigurationChanged(data: IConfigurationData); + $acceptConfigurationChanged(data: IConfigurationData): void; } export interface ExtHostDiagnosticsShape { @@ -461,7 +461,7 @@ export interface FileSystemEvents { deleted: URI[]; } export interface ExtHostFileSystemEventServiceShape { - $onFileEvent(events: FileSystemEvents); + $onFileEvent(events: FileSystemEvents): void; } export interface ObjectIdentifier { diff --git a/src/vs/workbench/api/node/extHostDocumentData.ts b/src/vs/workbench/api/node/extHostDocumentData.ts index e6cd9c2597c..39767d01a6d 100644 --- a/src/vs/workbench/api/node/extHostDocumentData.ts +++ b/src/vs/workbench/api/node/extHostDocumentData.ts @@ -78,7 +78,7 @@ export class ExtHostDocumentData extends MirrorModel { getText(range?) { return range ? data._getTextInRange(range) : data.getText(); }, get eol() { return data._eol === '\n' ? EndOfLine.LF : EndOfLine.CRLF; }, get lineCount() { return data._lines.length; }, - lineAt(lineOrPos) { return data._lineAt(lineOrPos); }, + lineAt(lineOrPos: number | vscode.Position) { return data._lineAt(lineOrPos); }, offsetAt(pos) { return data._offsetAt(pos); }, positionAt(offset) { return data._positionAt(offset); }, validateRange(ran) { return data._validateRange(ran); }, diff --git a/src/vs/workbench/api/node/extHostExtensionService.ts b/src/vs/workbench/api/node/extHostExtensionService.ts index 53623e85b43..f13519818d8 100644 --- a/src/vs/workbench/api/node/extHostExtensionService.ts +++ b/src/vs/workbench/api/node/extHostExtensionService.ts @@ -342,7 +342,7 @@ export class ExtHostExtensionService implements ExtHostExtensionServiceShape { if (typeof extensionModule.activate === 'function') { try { activationTimesBuilder.activateCallStart(); - const activateResult = extensionModule.activate.apply(global, [context]); + const activateResult: TPromise = extensionModule.activate.apply(global, [context]); activationTimesBuilder.activateCallStop(); activationTimesBuilder.activateResolveStart(); diff --git a/src/vs/workbench/api/node/extHostLanguageFeatures.ts b/src/vs/workbench/api/node/extHostLanguageFeatures.ts index 3e295379597..91463ee325f 100644 --- a/src/vs/workbench/api/node/extHostLanguageFeatures.ts +++ b/src/vs/workbench/api/node/extHostLanguageFeatures.ts @@ -874,7 +874,7 @@ export class ExtHostLanguageFeatures implements ExtHostLanguageFeaturesShape { registerHoverProvider(selector: vscode.DocumentSelector, provider: vscode.HoverProvider, extensionId?: string): vscode.Disposable { const handle = this._nextHandle(); - this._adapter.set(handle, new HoverAdapter(this._documents, provider, once((name, data) => { + this._adapter.set(handle, new HoverAdapter(this._documents, provider, once((name: string, data: any) => { data['extension'] = extensionId; this._telemetry.$publicLog(name, data); }))); diff --git a/src/vs/workbench/api/node/extHostTreeViews.ts b/src/vs/workbench/api/node/extHostTreeViews.ts index e39851fe243..39cf34468be 100644 --- a/src/vs/workbench/api/node/extHostTreeViews.ts +++ b/src/vs/workbench/api/node/extHostTreeViews.ts @@ -175,7 +175,7 @@ class ExtHostTreeView extends Disposable { }; } - private getLightIconPath(extensionTreeItem: vscode.TreeItem) { + private getLightIconPath(extensionTreeItem: vscode.TreeItem): string { if (extensionTreeItem.iconPath) { if (typeof extensionTreeItem.iconPath === 'string' || extensionTreeItem.iconPath instanceof URI) { return this.getIconPath(extensionTreeItem.iconPath); @@ -185,7 +185,7 @@ class ExtHostTreeView extends Disposable { return void 0; } - private getDarkIconPath(extensionTreeItem: vscode.TreeItem) { + private getDarkIconPath(extensionTreeItem: vscode.TreeItem): string { if (extensionTreeItem.iconPath && extensionTreeItem.iconPath['dark']) { return this.getIconPath(extensionTreeItem.iconPath['dark']); } diff --git a/src/vs/workbench/browser/actions/configureLocale.ts b/src/vs/workbench/browser/actions/configureLocale.ts index 29859fd2e1d..08a405c4141 100644 --- a/src/vs/workbench/browser/actions/configureLocale.ts +++ b/src/vs/workbench/browser/actions/configureLocale.ts @@ -37,7 +37,7 @@ class ConfigureLocaleAction extends Action { '}' ].join('\n'); - constructor(id, label, + constructor(id: string, label: string, @IFileService private fileService: IFileService, @IWorkspaceContextService private contextService: IWorkspaceContextService, @IEnvironmentService private environmentService: IEnvironmentService, diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts index 6663815d3e8..2655ebd9c0d 100644 --- a/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts +++ b/src/vs/workbench/browser/parts/activitybar/activitybarActions.ts @@ -94,7 +94,7 @@ export class ViewletActivityAction extends ActivityAction { return this._viewlet; } - public run(event): TPromise { + public run(event: any): TPromise { if (event instanceof MouseEvent && event.button === 2) { return TPromise.as(false); // do not run on right click } @@ -509,7 +509,7 @@ export class ViewletOverflowActivityAction extends ActivityAction { }); } - public run(event): TPromise { + public run(event: any): TPromise { this.showMenu(); return TPromise.as(true); diff --git a/src/vs/workbench/browser/parts/editor/editorCommands.ts b/src/vs/workbench/browser/parts/editor/editorCommands.ts index d6d7b7b2a12..54cb3136179 100644 --- a/src/vs/workbench/browser/parts/editor/editorCommands.ts +++ b/src/vs/workbench/browser/parts/editor/editorCommands.ts @@ -199,7 +199,7 @@ function handleCommandDeprecations(): void { }; Object.keys(mapDeprecatedCommands).forEach(deprecatedCommandId => { - const newCommandId = mapDeprecatedCommands[deprecatedCommandId]; + const newCommandId: string = mapDeprecatedCommands[deprecatedCommandId]; KeybindingsRegistry.registerCommandAndKeybindingRule({ id: deprecatedCommandId, diff --git a/src/vs/workbench/browser/parts/editor/editorStatus.ts b/src/vs/workbench/browser/parts/editor/editorStatus.ts index d7662d0acd9..b9b2d496a8f 100644 --- a/src/vs/workbench/browser/parts/editor/editorStatus.ts +++ b/src/vs/workbench/browser/parts/editor/editorStatus.ts @@ -782,7 +782,7 @@ export class ChangeModeAction extends Action { // Compute mode let currentModeId: string; - let modeId; + let modeId: string; if (textModel) { modeId = textModel.getLanguageIdentifier().language; currentModeId = this.modeService.getLanguageName(modeId); diff --git a/src/vs/workbench/browser/parts/editor/textEditor.ts b/src/vs/workbench/browser/parts/editor/textEditor.ts index 8fef6793000..d8b222dd446 100644 --- a/src/vs/workbench/browser/parts/editor/textEditor.ts +++ b/src/vs/workbench/browser/parts/editor/textEditor.ts @@ -240,7 +240,7 @@ export abstract class BaseTextEditor extends BaseEditor { */ protected saveTextEditorViewState(key: string): void { const memento = this.getMemento(this.storageService, Scope.WORKSPACE); - let textEditorViewStateMemento = memento[TEXT_EDITOR_VIEW_STATE_PREFERENCE_KEY]; + let textEditorViewStateMemento: { [key: string]: { [position: number]: IEditorViewState } } = memento[TEXT_EDITOR_VIEW_STATE_PREFERENCE_KEY]; if (!textEditorViewStateMemento) { textEditorViewStateMemento = Object.create(null); memento[TEXT_EDITOR_VIEW_STATE_PREFERENCE_KEY] = textEditorViewStateMemento; @@ -248,7 +248,7 @@ export abstract class BaseTextEditor extends BaseEditor { const editorViewState = this.getControl().saveViewState(); - let lastKnownViewState: ITextEditorViewState = textEditorViewStateMemento[key]; + let lastKnownViewState = textEditorViewStateMemento[key]; if (!lastKnownViewState) { lastKnownViewState = Object.create(null); textEditorViewStateMemento[key] = lastKnownViewState; @@ -264,7 +264,7 @@ export abstract class BaseTextEditor extends BaseEditor { */ protected clearTextEditorViewState(keys: string[]): void { const memento = this.getMemento(this.storageService, Scope.WORKSPACE); - const textEditorViewStateMemento = memento[TEXT_EDITOR_VIEW_STATE_PREFERENCE_KEY]; + const textEditorViewStateMemento: { [key: string]: { [position: number]: IEditorViewState } } = memento[TEXT_EDITOR_VIEW_STATE_PREFERENCE_KEY]; if (textEditorViewStateMemento) { keys.forEach(key => delete textEditorViewStateMemento[key]); } @@ -275,9 +275,9 @@ export abstract class BaseTextEditor extends BaseEditor { */ protected loadTextEditorViewState(key: string): IEditorViewState { const memento = this.getMemento(this.storageService, Scope.WORKSPACE); - const textEditorViewStateMemento = memento[TEXT_EDITOR_VIEW_STATE_PREFERENCE_KEY]; + const textEditorViewStateMemento: { [key: string]: { [position: number]: IEditorViewState } } = memento[TEXT_EDITOR_VIEW_STATE_PREFERENCE_KEY]; if (textEditorViewStateMemento) { - const viewState: ITextEditorViewState = textEditorViewStateMemento[key]; + const viewState = textEditorViewStateMemento[key]; if (viewState) { return viewState[this.position]; } diff --git a/src/vs/workbench/browser/parts/editor/webviewEditor.ts b/src/vs/workbench/browser/parts/editor/webviewEditor.ts index 959d8c266c6..d31c6b57bd3 100644 --- a/src/vs/workbench/browser/parts/editor/webviewEditor.ts +++ b/src/vs/workbench/browser/parts/editor/webviewEditor.ts @@ -40,13 +40,13 @@ export abstract class BaseWebviewEditor extends BaseEditor { protected saveViewState(resource: URI | string, editorViewState: HtmlPreviewEditorViewState): void { const memento = this.getMemento(this.storageService, Scope.WORKSPACE); - let editorViewStateMemento = memento[this.viewStateStorageKey]; + let editorViewStateMemento: { [key: string]: { [position: number]: HtmlPreviewEditorViewState } } = memento[this.viewStateStorageKey]; if (!editorViewStateMemento) { editorViewStateMemento = Object.create(null); memento[this.viewStateStorageKey] = editorViewStateMemento; } - let fileViewState: HtmlPreviewEditorViewStates = editorViewStateMemento[resource.toString()]; + let fileViewState = editorViewStateMemento[resource.toString()]; if (!fileViewState) { fileViewState = Object.create(null); editorViewStateMemento[resource.toString()] = fileViewState; @@ -59,9 +59,9 @@ export abstract class BaseWebviewEditor extends BaseEditor { protected loadViewState(resource: URI | string): HtmlPreviewEditorViewState | null { const memento = this.getMemento(this.storageService, Scope.WORKSPACE); - const editorViewStateMemento = memento[this.viewStateStorageKey]; + const editorViewStateMemento: { [key: string]: { [position: number]: HtmlPreviewEditorViewState } } = memento[this.viewStateStorageKey]; if (editorViewStateMemento) { - const fileViewState: HtmlPreviewEditorViewStates = editorViewStateMemento[resource.toString()]; + const fileViewState = editorViewStateMemento[resource.toString()]; if (fileViewState) { return fileViewState[this.position]; } diff --git a/src/vs/workbench/browser/parts/panel/panelActions.ts b/src/vs/workbench/browser/parts/panel/panelActions.ts index 934dacdb8b9..9e9831c5c0d 100644 --- a/src/vs/workbench/browser/parts/panel/panelActions.ts +++ b/src/vs/workbench/browser/parts/panel/panelActions.ts @@ -28,7 +28,7 @@ export class PanelAction extends Action { this.tooltip = nls.localize('panelActionTooltip', "{0} ({1})", panel.name, this.getKeybindingLabel(panel.commandId)); } - public run(event): TPromise { + public run(event: any): TPromise { return this.panelService.openPanel(this.panel.id, true).then(() => this.activate()); } diff --git a/src/vs/workbench/common/resources.ts b/src/vs/workbench/common/resources.ts index 8aa7b0ff5a2..830f77fd26f 100644 --- a/src/vs/workbench/common/resources.ts +++ b/src/vs/workbench/common/resources.ts @@ -59,7 +59,7 @@ export class ResourceContextKey implements IContextKey { export class ResourceGlobMatcher { - private static readonly NO_ROOT = null; + private static readonly NO_ROOT: string = null; private _onExpressionChange: Emitter; private toUnbind: IDisposable[]; diff --git a/src/vs/workbench/electron-browser/actions.ts b/src/vs/workbench/electron-browser/actions.ts index 69632444db1..5352574fb60 100644 --- a/src/vs/workbench/electron-browser/actions.ts +++ b/src/vs/workbench/electron-browser/actions.ts @@ -1204,7 +1204,7 @@ export class ToggleSharedProcessAction extends Action { } } -enum Direction { +export enum Direction { Next, Previous, } @@ -1277,7 +1277,7 @@ export abstract class BaseNavigationAction extends Action { return this.viewletService.openViewlet(activeViewletId, true); } - protected navigateAcrossEditorGroup(direction): TPromise { + protected navigateAcrossEditorGroup(direction: Direction): TPromise { const model = this.groupService.getStacksModel(); const currentPosition = model.positionOfGroup(model.activeGroup); const nextPosition = direction === Direction.Next ? currentPosition + 1 : currentPosition - 1; @@ -1330,7 +1330,7 @@ export class NavigateLeftAction extends BaseNavigationAction { super(id, label, groupService, panelService, partService, viewletService); } - protected navigateOnEditorFocus(isEditorGroupVertical, isSidebarPositionLeft): TPromise { + protected navigateOnEditorFocus(isEditorGroupVertical: boolean, isSidebarPositionLeft: boolean): TPromise { if (!isEditorGroupVertical) { if (isSidebarPositionLeft) { return this.navigateToSidebar(); @@ -1346,7 +1346,7 @@ export class NavigateLeftAction extends BaseNavigationAction { }); } - protected navigateOnPanelFocus(isEditorGroupVertical, isSidebarPositionLeft): TPromise { + protected navigateOnPanelFocus(isEditorGroupVertica: boolean, isSidebarPositionLeft: boolean): TPromise { if (isSidebarPositionLeft) { return this.navigateToSidebar(); } @@ -1354,7 +1354,7 @@ export class NavigateLeftAction extends BaseNavigationAction { return TPromise.as(false); } - protected navigateOnSidebarFocus(isEditorGroupVertical, isSidebarPositionLeft): TPromise { + protected navigateOnSidebarFocus(isEditorGroupVertical: boolean, isSidebarPositionLeft: boolean): TPromise { if (isSidebarPositionLeft) { return TPromise.as(false); } @@ -1383,7 +1383,7 @@ export class NavigateRightAction extends BaseNavigationAction { super(id, label, groupService, panelService, partService, viewletService); } - protected navigateOnEditorFocus(isEditorGroupVertical, isSidebarPositionLeft): TPromise { + protected navigateOnEditorFocus(isEditorGroupVertical: boolean, isSidebarPositionLeft: boolean): TPromise { if (!isEditorGroupVertical) { if (!isSidebarPositionLeft) { return this.navigateToSidebar(); @@ -1400,7 +1400,7 @@ export class NavigateRightAction extends BaseNavigationAction { }); } - protected navigateOnPanelFocus(isEditorGroupVertical, isSidebarPositionLeft): TPromise { + protected navigateOnPanelFocus(isEditorGroupVertical: boolean, isSidebarPositionLeft: boolean): TPromise { if (!isSidebarPositionLeft) { return this.navigateToSidebar(); } @@ -1408,7 +1408,7 @@ export class NavigateRightAction extends BaseNavigationAction { return TPromise.as(false); } - protected navigateOnSidebarFocus(isEditorGroupVertical, isSidebarPositionLeft): TPromise { + protected navigateOnSidebarFocus(isEditorGroupVertical: boolean, isSidebarPositionLeft: boolean): TPromise { if (!isSidebarPositionLeft) { return TPromise.as(false); } @@ -1437,14 +1437,14 @@ export class NavigateUpAction extends BaseNavigationAction { super(id, label, groupService, panelService, partService, viewletService); } - protected navigateOnEditorFocus(isEditorGroupVertical, isSidebarPositionLeft): TPromise { + protected navigateOnEditorFocus(isEditorGroupVertical: boolean, isSidebarPositionLeft: boolean): TPromise { if (isEditorGroupVertical) { return TPromise.as(false); } return this.navigateAcrossEditorGroup(Direction.Previous); } - protected navigateOnPanelFocus(isEditorGroupVertical, isSidebarPositionLeft): TPromise { + protected navigateOnPanelFocus(isEditorGroupVertical: boolean, isSidebarPositionLeft: boolean): TPromise { if (isEditorGroupVertical) { return this.navigateToLastActiveGroup(); } @@ -1468,7 +1468,7 @@ export class NavigateDownAction extends BaseNavigationAction { super(id, label, groupService, panelService, partService, viewletService); } - protected navigateOnEditorFocus(isEditorGroupVertical, isSidebarPositionLeft): TPromise { + protected navigateOnEditorFocus(isEditorGroupVertical: boolean, isSidebarPositionLeft: boolean): TPromise { if (isEditorGroupVertical) { return this.navigateToPanel(); } diff --git a/src/vs/workbench/electron-browser/window.ts b/src/vs/workbench/electron-browser/window.ts index 1c378617cd9..0bef05ddb8e 100644 --- a/src/vs/workbench/electron-browser/window.ts +++ b/src/vs/workbench/electron-browser/window.ts @@ -103,7 +103,7 @@ export class ElectronWindow extends Themable { // Handle window.open() calls const $this = this; - (window).open = function (url: string, target: string, features: string, replace: boolean) { + (window).open = function (url: string, target: string, features: string, replace: boolean): any { $this.windowsService.openExternal(url); return null; diff --git a/src/vs/workbench/node/extensionHostProcess.ts b/src/vs/workbench/node/extensionHostProcess.ts index f49c1175a82..0e68ea4e1a7 100644 --- a/src/vs/workbench/node/extensionHostProcess.ts +++ b/src/vs/workbench/node/extensionHostProcess.ts @@ -77,7 +77,7 @@ function connectToRenderer(protocol: IMessagePassingProtocol): TPromise[] = []; - process.on('unhandledRejection', (reason, promise) => { + process.on('unhandledRejection', (reason: any, promise: TPromise) => { unhandledPromises.push(promise); setTimeout(() => { const idx = unhandledPromises.indexOf(promise); @@ -88,7 +88,7 @@ function connectToRenderer(protocol: IMessagePassingProtocol): TPromise { + process.on('rejectionHandled', (promise: TPromise) => { const idx = unhandledPromises.indexOf(promise); if (idx >= 0) { unhandledPromises.splice(idx, 1); @@ -96,7 +96,7 @@ function connectToRenderer(protocol: IMessagePassingProtocol): TPromise result.push(t)); return result; } diff --git a/src/vs/workbench/parts/debug/node/v8Protocol.ts b/src/vs/workbench/parts/debug/node/v8Protocol.ts index 68a938cc11c..33a40bc0362 100644 --- a/src/vs/workbench/parts/debug/node/v8Protocol.ts +++ b/src/vs/workbench/parts/debug/node/v8Protocol.ts @@ -30,7 +30,7 @@ export abstract class V8Protocol { protected abstract onServerError(err: Error): void; protected abstract onEvent(event: DebugProtocol.Event): void; - protected abstract dispatchRequest(request: DebugProtocol.Request, response: DebugProtocol.Response); + protected abstract dispatchRequest(request: DebugProtocol.Request, response: DebugProtocol.Response): void; protected connect(readable: stream.Readable, writable: stream.Writable): void { @@ -43,7 +43,7 @@ export abstract class V8Protocol { } protected send(command: string, args: any): TPromise { - let errorCallback; + let errorCallback: (error: Error) => void; return new TPromise((completeDispatch, errorDispatch) => { errorCallback = errorDispatch; this.doSend(command, args, (result: R) => { diff --git a/src/vs/workbench/parts/emmet/electron-browser/emmetActions.ts b/src/vs/workbench/parts/emmet/electron-browser/emmetActions.ts index f30ecc008fa..97ba50abcce 100644 --- a/src/vs/workbench/parts/emmet/electron-browser/emmetActions.ts +++ b/src/vs/workbench/parts/emmet/electron-browser/emmetActions.ts @@ -46,7 +46,7 @@ class GrammarContributions implements IGrammarContributions { }); } - public getGrammar(mode): string { + public getGrammar(mode: string): string { return GrammarContributions._grammars[mode]; } } diff --git a/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts b/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts index 1f8d65165b1..f6f5717b865 100644 --- a/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts +++ b/src/vs/workbench/parts/execution/electron-browser/execution.contribution.ts @@ -163,7 +163,7 @@ export class OpenIntegratedTerminalAction extends AbstractOpenInTerminalAction { public run(event?: any): TPromise { let pathToOpen = this.getPathToOpen(); - var instance = this.integratedTerminalService.createInstance({ cwd: pathToOpen }, true); + const instance = this.integratedTerminalService.createInstance({ cwd: pathToOpen }, true); if (instance) { this.integratedTerminalService.setActiveInstance(instance); this.integratedTerminalService.showPanel(true); diff --git a/src/vs/workbench/parts/extensions/browser/extensionsList.ts b/src/vs/workbench/parts/extensions/browser/extensionsList.ts index 168870113c4..8a9c326d6a6 100644 --- a/src/vs/workbench/parts/extensions/browser/extensionsList.ts +++ b/src/vs/workbench/parts/extensions/browser/extensionsList.ts @@ -80,7 +80,7 @@ export class Renderer implements IPagedRenderer { }); actionbar.addListener(EventType.RUN, ({ error }) => error && this.messageService.show(Severity.Error, error)); - const versionWidget = this.instantiationService.createInstance(Label, version, e => e.version); + const versionWidget = this.instantiationService.createInstance(Label, version, (e: IExtension) => e.version); const installCountWidget = this.instantiationService.createInstance(InstallWidget, installCount, { small: true }); const ratingsWidget = this.instantiationService.createInstance(RatingsWidget, ratings, { small: true }); diff --git a/src/vs/workbench/parts/files/browser/views/explorerView.ts b/src/vs/workbench/parts/files/browser/views/explorerView.ts index ff59641a894..a299d91412a 100644 --- a/src/vs/workbench/parts/files/browser/views/explorerView.ts +++ b/src/vs/workbench/parts/files/browser/views/explorerView.ts @@ -118,7 +118,7 @@ export class ExplorerView extends CollapsibleView { this.filesExplorerFocusedContext = FilesExplorerFocusedContext.bindTo(contextKeyService); this.explorerFocusedContext = ExplorerFocusedContext.bindTo(contextKeyService); - this.fileEventsFilter = instantiationService.createInstance(ResourceGlobMatcher, root => this.getFileEventsExcludes(root), (expression: glob.IExpression) => glob.parse(expression)); + this.fileEventsFilter = instantiationService.createInstance(ResourceGlobMatcher, (root: URI) => this.getFileEventsExcludes(root), (expression: glob.IExpression) => glob.parse(expression)); } private getFileEventsExcludes(root?: URI): glob.IExpression { diff --git a/src/vs/workbench/parts/files/browser/views/explorerViewer.ts b/src/vs/workbench/parts/files/browser/views/explorerViewer.ts index 5a15094ce05..5eca34ae11a 100644 --- a/src/vs/workbench/parts/files/browser/views/explorerViewer.ts +++ b/src/vs/workbench/parts/files/browser/views/explorerViewer.ts @@ -362,7 +362,7 @@ export class FileRenderer implements IRenderer { inputBox.select({ start: 0, end: lastDot > 0 && !stat.isDirectory ? lastDot : value.length }); inputBox.focus(); - const done = once(commit => { + const done = once((commit: boolean) => { tree.clearHighlight(); if (commit && inputBox.value) { diff --git a/src/vs/workbench/parts/html/browser/webviewEditor.ts b/src/vs/workbench/parts/html/browser/webviewEditor.ts index 93abb074d0b..e859ca71b30 100644 --- a/src/vs/workbench/parts/html/browser/webviewEditor.ts +++ b/src/vs/workbench/parts/html/browser/webviewEditor.ts @@ -91,7 +91,7 @@ export abstract class WebviewEditor extends BaseWebviewEditor { return true; } - protected abstract createEditor(parent: Builder); + protected abstract createEditor(parent: Builder): void; } class ShowWebViewEditorFindCommand extends Command { diff --git a/src/vs/workbench/parts/html/browser/webviewFindWidget.ts b/src/vs/workbench/parts/html/browser/webviewFindWidget.ts index 0a98e95326e..fe9ecaa3fef 100644 --- a/src/vs/workbench/parts/html/browser/webviewFindWidget.ts +++ b/src/vs/workbench/parts/html/browser/webviewFindWidget.ts @@ -20,7 +20,7 @@ export class WebviewFindWidget extends SimpleFindWidget { this.onInputChanged = this.onInputChanged.bind(this); } - public find(previous) { + public find(previous: boolean) { let val = this.inputValue; if (this.webview !== null && val) { this.webview.find(val, { findNext: true, forward: !previous }); diff --git a/src/vs/workbench/parts/markers/browser/markersPanel.ts b/src/vs/workbench/parts/markers/browser/markersPanel.ts index f7762f7328c..d5554647c19 100644 --- a/src/vs/workbench/parts/markers/browser/markersPanel.ts +++ b/src/vs/workbench/parts/markers/browser/markersPanel.ts @@ -370,7 +370,7 @@ export class MarkersPanel extends Panel { return null; } - private hasSelectedMarkerFor(resource): boolean { + private hasSelectedMarkerFor(resource: Resource): boolean { let selectedElement = this.tree.getSelection(); if (selectedElement && selectedElement.length > 0) { if (selectedElement[0] instanceof Marker) { diff --git a/src/vs/workbench/parts/markers/common/markersModel.ts b/src/vs/workbench/parts/markers/common/markersModel.ts index be69523c4d2..561705c5a60 100644 --- a/src/vs/workbench/parts/markers/common/markersModel.ts +++ b/src/vs/workbench/parts/markers/common/markersModel.ts @@ -15,8 +15,8 @@ import Messages from 'vs/workbench/parts/markers/common/messages'; import { Schemas } from 'vs/base/common/network'; export interface BulkUpdater { - add(resource: URI, markers: IMarker[]); - done(); + add(resource: URI, markers: IMarker[]): void; + done(): void; } export class Resource { @@ -171,9 +171,9 @@ export class MarkersModel { }; } - public update(filterOptions: FilterOptions); - public update(resourceUri: URI, markers: IMarker[]); - public update(markers: IMarker[]); + public update(filterOptions: FilterOptions): void; + public update(resourceUri: URI, markers: IMarker[]): void; + public update(markers: IMarker[]): void; public update(arg1?: any, arg2?: any) { if (arg1 instanceof FilterOptions) { this._filterOptions = arg1; diff --git a/src/vs/workbench/parts/output/browser/outputServices.ts b/src/vs/workbench/parts/output/browser/outputServices.ts index 3c096a9ecd1..6f7f7326885 100644 --- a/src/vs/workbench/parts/output/browser/outputServices.ts +++ b/src/vs/workbench/parts/output/browser/outputServices.ts @@ -353,7 +353,7 @@ class OutputContentProvider implements ITextModelContentProvider { return panel && panel.getId() === OUTPUT_PANEL_ID && this.outputService.getActiveChannel().id === channel; } - public scrollLock(channelId): boolean { + public scrollLock(channelId: string): boolean { return this.channelIdsWithScrollLock.has(channelId); } diff --git a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts index 60b05a3f1d1..681d18159da 100644 --- a/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts +++ b/src/vs/workbench/parts/preferences/browser/preferencesRenderers.ts @@ -955,7 +955,7 @@ class UnsupportedWorkspaceSettingsRenderer extends Disposable { this._register(this.configurationService.onDidUpdateConfiguration(() => this.render())); } - private getMarkerMessage(settingKey): string { + private getMarkerMessage(settingKey: string): string { switch (settingKey) { case 'php.validate.executablePath': return nls.localize('unsupportedPHPExecutablePathSetting', "This setting must be a User Setting. To configure PHP for the workspace, open a PHP file and click on 'PHP Path' in the status bar."); diff --git a/src/vs/workbench/parts/preferences/common/keybindingsEditorModel.ts b/src/vs/workbench/parts/preferences/common/keybindingsEditorModel.ts index db3d49e7ed7..e83490c05ff 100644 --- a/src/vs/workbench/parts/preferences/common/keybindingsEditorModel.ts +++ b/src/vs/workbench/parts/preferences/common/keybindingsEditorModel.ts @@ -274,7 +274,7 @@ class KeybindingItemMatches { } private matchesWords(words: string[], wordToMatchAgainst: string, wordMatchesFilter: IFilter): IMatch[] { - let matches = []; + let matches: IMatch[] = []; for (const word of words) { const wordMatches = wordMatchesFilter(word, wordToMatchAgainst); if (wordMatches) { diff --git a/src/vs/workbench/parts/preferences/common/preferencesModels.ts b/src/vs/workbench/parts/preferences/common/preferencesModels.ts index d9e7d22cb19..f17231a589b 100644 --- a/src/vs/workbench/parts/preferences/common/preferencesModels.ts +++ b/src/vs/workbench/parts/preferences/common/preferencesModels.ts @@ -406,7 +406,7 @@ export class SettingsEditorModel extends AbstractSettingsModel implements ISetti } }, onArrayBegin: (offset: number, length: number) => { - let array = []; + let array: any[] = []; onValue(array, offset, length); previousParents.push(currentParent); currentParent = array; @@ -563,8 +563,8 @@ export class WorkspaceConfigModel extends SettingsEditorModel implements ISettin let settingsPropertyEndsAt = -1; let nodeAfterSettingStartsAt = -1; - let rootProperties = []; - let ancestors = []; + let rootProperties: string[] = []; + let ancestors: string[] = []; let currentProperty = ''; visit(content, { diff --git a/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts b/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts index 4aa1b060b93..091413ee7c5 100644 --- a/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts +++ b/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts @@ -511,7 +511,7 @@ export class CommandsHandler extends QuickOpenHandler { const aliasHighlights = alias ? wordFilter(searchValue, alias) : null; if (labelHighlights || aliasHighlights) { - entries.push(this.instantiationService.createInstance(CommandEntry, actionDescriptor.id, this.keybindingService.lookupKeybinding(actionDescriptor.id), label, alias, { label: labelHighlights, alias: aliasHighlights }, actionDescriptor, id => this.onBeforeRunCommand(id))); + entries.push(this.instantiationService.createInstance(CommandEntry, actionDescriptor.id, this.keybindingService.lookupKeybinding(actionDescriptor.id), label, alias, { label: labelHighlights, alias: aliasHighlights }, actionDescriptor, (id: string) => this.onBeforeRunCommand(id))); } } } @@ -537,7 +537,7 @@ export class CommandsHandler extends QuickOpenHandler { const aliasHighlights = alias ? wordFilter(searchValue, alias) : null; if (labelHighlights || aliasHighlights) { - entries.push(this.instantiationService.createInstance(EditorActionCommandEntry, action.id, this.keybindingService.lookupKeybinding(action.id), label, alias, { label: labelHighlights, alias: aliasHighlights }, action, id => this.onBeforeRunCommand(id))); + entries.push(this.instantiationService.createInstance(EditorActionCommandEntry, action.id, this.keybindingService.lookupKeybinding(action.id), label, alias, { label: labelHighlights, alias: aliasHighlights }, action, (id: string) => this.onBeforeRunCommand(id))); } } } @@ -580,7 +580,7 @@ export class CommandsHandler extends QuickOpenHandler { const aliasHighlights = alias ? wordFilter(searchValue, alias) : null; if (labelHighlights || aliasHighlights) { - entries.push(this.instantiationService.createInstance(ActionCommandEntry, action.id, this.keybindingService.lookupKeybinding(action.item.id), label, alias, { label: labelHighlights, alias: aliasHighlights }, action, id => this.onBeforeRunCommand(id))); + entries.push(this.instantiationService.createInstance(ActionCommandEntry, action.id, this.keybindingService.lookupKeybinding(action.item.id), label, alias, { label: labelHighlights, alias: aliasHighlights }, action, (id: string) => this.onBeforeRunCommand(id))); } } } diff --git a/src/vs/workbench/parts/scm/electron-browser/scmMenus.ts b/src/vs/workbench/parts/scm/electron-browser/scmMenus.ts index eb68ce4b647..89e93eccac8 100644 --- a/src/vs/workbench/parts/scm/electron-browser/scmMenus.ts +++ b/src/vs/workbench/parts/scm/electron-browser/scmMenus.ts @@ -85,8 +85,8 @@ export class SCMMenus implements IDisposable { contextKeyService.createKey('scmResourceGroup', getSCMResourceContextKey(resource)); const menu = this.menuService.createMenu(menuId, contextKeyService); - const primary = []; - const secondary = []; + const primary: IAction[] = []; + const secondary: IAction[] = []; const result = { primary, secondary }; fillInActions(menu, { shouldForwardArgs: true }, result, g => g === 'inline'); diff --git a/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts b/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts index c5ec16e14c9..56d1aab31c6 100644 --- a/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts +++ b/src/vs/workbench/parts/scm/electron-browser/scmViewlet.ts @@ -334,7 +334,7 @@ class SourceControlView extends CollapsibleView { this.listContainer = append(container, $('.scm-status.show-file-icons')); const delegate = new Delegate(); - const actionItemProvider = action => this.getActionItem(action); + const actionItemProvider = (action: IAction) => this.getActionItem(action); const renderers = [ new ResourceGroupRenderer(this.menus, actionItemProvider, this.themeService), diff --git a/src/vs/workbench/parts/search/browser/searchActions.ts b/src/vs/workbench/parts/search/browser/searchActions.ts index 9c676d7cb55..3b328409d7d 100644 --- a/src/vs/workbench/parts/search/browser/searchActions.ts +++ b/src/vs/workbench/parts/search/browser/searchActions.ts @@ -287,7 +287,7 @@ export class FocusActiveEditorAction extends Action { export abstract class FindOrReplaceInFilesAction extends Action { constructor(id: string, label: string, private viewletService: IViewletService, - private expandSearchReplaceWidget: boolean, private selectWidgetText, private focusReplace) { + private expandSearchReplaceWidget: boolean, private selectWidgetText: boolean, private focusReplace: boolean) { super(id, label); } diff --git a/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.ts b/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.ts index cd6f0b981f1..e2e6cb6a263 100644 --- a/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.ts +++ b/src/vs/workbench/parts/snippets/electron-browser/snippets.contribution.ts @@ -41,10 +41,10 @@ namespace OpenSnippetsAction { return windowsService.openWindow([filePath], { forceReuseWindow: true }); } - var modeIds = modeService.getRegisteredModes(); - var picks: IPickOpenEntry[] = []; + const modeIds = modeService.getRegisteredModes(); + let picks: IPickOpenEntry[] = []; modeIds.forEach((modeId) => { - var name = modeService.getLanguageName(modeId); + const name = modeService.getLanguageName(modeId); if (name) { picks.push({ label: name, id: modeId }); } @@ -55,12 +55,12 @@ namespace OpenSnippetsAction { return quickOpenService.pick(picks, { placeHolder: nls.localize('openSnippet.pickLanguage', "Select Language for Snippet") }).then((language) => { if (language) { - var snippetPath = join(environmentService.appSettingsHome, 'snippets', language.id + '.json'); + const snippetPath = join(environmentService.appSettingsHome, 'snippets', language.id + '.json'); return fileExists(snippetPath).then((success) => { if (success) { return openFile(snippetPath); } - var defaultContent = [ + const defaultContent = [ '{', '/*', '\t// Place your snippets for ' + language.label + ' here. Each snippet is defined under a snippet name and has a prefix, body and ', diff --git a/src/vs/workbench/parts/tasks/common/problemCollectors.ts b/src/vs/workbench/parts/tasks/common/problemCollectors.ts index aca53c554de..e886d8ef1a9 100644 --- a/src/vs/workbench/parts/tasks/common/problemCollectors.ts +++ b/src/vs/workbench/parts/tasks/common/problemCollectors.ts @@ -276,7 +276,7 @@ export class AbstractProblemCollector extends EventEmitter implements IDisposabl } } - private getDeliveredMarkersPerOwner(owner): Map { + private getDeliveredMarkersPerOwner(owner: string): Map { let result = this.deliveredMarkers.get(owner); if (!result) { result = new Map(); diff --git a/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts b/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts index a64c8e363c2..d5253749134 100644 --- a/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts +++ b/src/vs/workbench/parts/tasks/electron-browser/task.contribution.ts @@ -211,14 +211,14 @@ class ConfigureTaskRunnerAction extends OpenTaskConfigurationAction { public static TEXT = nls.localize('ConfigureTaskRunnerAction.label', "Configure Task Runner"); constructor(id: string, label: string, - @ITaskService taskService, @IConfigurationService configurationService: IConfigurationService, + @ITaskService taskService: ITaskService, @IConfigurationService configurationService: IConfigurationService, @IWorkbenchEditorService editorService: IWorkbenchEditorService, @IFileService fileService: IFileService, @IWorkspaceContextService contextService: IWorkspaceContextService, @IOutputService outputService: IOutputService, @IMessageService messageService: IMessageService, @IQuickOpenService quickOpenService: IQuickOpenService, @IEnvironmentService environmentService: IEnvironmentService, @IConfigurationResolverService configurationResolverService: IConfigurationResolverService, - @IExtensionService extensionService, - @ITelemetryService telemetryService) { + @IExtensionService extensionService: IExtensionService, + @ITelemetryService telemetryService: ITelemetryService) { super(id, label, taskService, configurationService, editorService, fileService, contextService, outputService, messageService, quickOpenService, environmentService, configurationResolverService, extensionService, telemetryService); @@ -230,14 +230,14 @@ class ConfigureBuildTaskAction extends OpenTaskConfigurationAction { public static TEXT = nls.localize('ConfigureBuildTaskAction.label', "Configure Build Task"); constructor(id: string, label: string, - @ITaskService taskService, @IConfigurationService configurationService: IConfigurationService, + @ITaskService taskService: ITaskService, @IConfigurationService configurationService: IConfigurationService, @IWorkbenchEditorService editorService: IWorkbenchEditorService, @IFileService fileService: IFileService, @IWorkspaceContextService contextService: IWorkspaceContextService, @IOutputService outputService: IOutputService, @IMessageService messageService: IMessageService, @IQuickOpenService quickOpenService: IQuickOpenService, @IEnvironmentService environmentService: IEnvironmentService, @IConfigurationResolverService configurationResolverService: IConfigurationResolverService, - @IExtensionService extensionService, - @ITelemetryService telemetryService) { + @IExtensionService extensionService: IExtensionService, + @ITelemetryService telemetryService: ITelemetryService) { super(id, label, taskService, configurationService, editorService, fileService, contextService, outputService, messageService, quickOpenService, environmentService, configurationResolverService, extensionService, telemetryService); diff --git a/src/vs/workbench/parts/tasks/node/processRunnerDetector.ts b/src/vs/workbench/parts/tasks/node/processRunnerDetector.ts index eb29e67c023..bbc05d0d7d4 100644 --- a/src/vs/workbench/parts/tasks/node/processRunnerDetector.ts +++ b/src/vs/workbench/parts/tasks/node/processRunnerDetector.ts @@ -38,7 +38,7 @@ interface TaskInfos { } interface TaskDetectorMatcher { - init(); + init(): void; match(tasks: string[], line: string); } diff --git a/src/vs/workbench/parts/tasks/node/taskConfiguration.ts b/src/vs/workbench/parts/tasks/node/taskConfiguration.ts index bb249c436e7..513e890116a 100644 --- a/src/vs/workbench/parts/tasks/node/taskConfiguration.ts +++ b/src/vs/workbench/parts/tasks/node/taskConfiguration.ts @@ -1053,7 +1053,7 @@ namespace ConfigurationProperties { { property: 'presentation', type: CommandConfiguration.PresentationOptions }, { property: 'problemMatchers' } ]; - export function from(this: void, external: ConfigurationProperties, context: ParseContext, includePresentation): Tasks.ConfigurationProperties { + export function from(this: void, external: ConfigurationProperties, context: ParseContext, includePresentation: boolean): Tasks.ConfigurationProperties { if (!external) { return undefined; } diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.ts index 04d982c1746..7ffa860ab6a 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminalFindWidget.ts @@ -20,7 +20,7 @@ export class TerminalFindWidget extends SimpleFindWidget { this._findInputFocused = KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_INPUT_FOCUSED.bindTo(this._contextKeyService); } - public find(previous) { + public find(previous: boolean) { let val = this.inputValue; let instance = this._terminalService.getActiveInstance(); if (instance !== null) { diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts b/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts index ca7a0317752..071f434f0fa 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminalLinkHandler.ts @@ -89,7 +89,7 @@ export class TerminalLinkHandler { } public registerCustomLinkHandler(regex: RegExp, handler: (uri: string) => void, matchIndex?: number, validationCallback?: XtermLinkMatcherValidationCallback): number { - const wrappedValidationCallback = (uri, element, callback) => { + const wrappedValidationCallback = (uri: string, element: HTMLElement, callback) => { this._addTooltipEventListeners(element); if (validationCallback) { validationCallback(uri, element, callback); @@ -195,7 +195,7 @@ export class TerminalLinkHandler { } private _addTooltipEventListeners(element: HTMLElement): void { - let timeout = null; + let timeout: number = null; let isMessageShowing = false; this._hoverDisposables.push(dom.addDisposableListener(element, dom.EventType.MOUSE_OVER, e => { element.classList.toggle('active', this._isLinkActivationModifierDown(e)); diff --git a/src/vs/workbench/parts/themes/electron-browser/themes.contribution.ts b/src/vs/workbench/parts/themes/electron-browser/themes.contribution.ts index d70f33282a9..2b83cfd4c32 100644 --- a/src/vs/workbench/parts/themes/electron-browser/themes.contribution.ts +++ b/src/vs/workbench/parts/themes/electron-browser/themes.contribution.ts @@ -54,7 +54,7 @@ export class SelectColorThemeAction extends Action { .map(theme => ({ id: theme.id, label: theme.label, description: theme.description })) .sort((t1, t2) => t1.label.localeCompare(t2.label)); - const selectTheme = (theme, applyTheme) => { + const selectTheme = (theme, applyTheme: boolean) => { if (theme === pickInMarketPlace) { theme = currentTheme; } @@ -120,7 +120,7 @@ class SelectIconThemeAction extends Action { picks.splice(0, 0, { id: '', label: localize('noIconThemeLabel', 'None'), description: localize('noIconThemeDesc', 'Disable file icons') }); - const selectTheme = (theme, applyTheme) => { + const selectTheme = (theme, applyTheme: boolean) => { if (theme === pickInMarketPlace) { theme = currentTheme; } diff --git a/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts b/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts index a921b824592..80924f706cb 100644 --- a/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts +++ b/src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts @@ -23,6 +23,7 @@ import { WebviewEditor } from 'vs/workbench/parts/html/browser/webviewEditor'; import { IStorageService } from 'vs/platform/storage/common/storage'; import { IContextViewService } from 'vs/platform/contextview/browser/contextView'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; +import { IMode } from 'vs/editor/common/modes'; function renderBody(body: string): string { return ` @@ -74,7 +75,7 @@ export class ReleaseNotesEditor extends WebviewEditor { await super.setInput(input, options); - const result = []; + const result: TPromise[] = []; const renderer = new marked.Renderer(); renderer.code = (code, lang) => { const modeId = this.modeService.getModeIdForLanguageName(lang); diff --git a/src/vs/workbench/parts/views/browser/treeView.ts b/src/vs/workbench/parts/views/browser/treeView.ts index 25dbf47ecc6..2ae8d3e7a21 100644 --- a/src/vs/workbench/parts/views/browser/treeView.ts +++ b/src/vs/workbench/parts/views/browser/treeView.ts @@ -442,8 +442,8 @@ class Menus implements IDisposable { contextKeyService.createKey(context.key, context.value); const menu = this.menuService.createMenu(menuId, contextKeyService); - const primary = []; - const secondary = []; + const primary: IAction[] = []; + const secondary: IAction[] = []; const result = { primary, secondary }; fillInActions(menu, { shouldForwardArgs: true }, result); diff --git a/src/vs/workbench/parts/views/browser/views.ts b/src/vs/workbench/parts/views/browser/views.ts index 42aec84fc9c..4d2505bfa90 100644 --- a/src/vs/workbench/parts/views/browser/views.ts +++ b/src/vs/workbench/parts/views/browser/views.ts @@ -529,7 +529,7 @@ export class ViewsViewlet extends Viewlet { }, [[], [], unregisteredViews]); - const toCreate = []; + const toCreate: IView[] = []; if (toAdd.length || toRemove.length) { for (const view of this.splitView.getViews()) { diff --git a/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts b/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts index 56c2706412b..94b2ba73526 100644 --- a/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts +++ b/src/vs/workbench/parts/welcome/page/electron-browser/welcomePage.ts @@ -212,7 +212,7 @@ class WelcomePage { name: localize('welcome.title', "Welcome"), resource, telemetryFrom, - onReady: container => this.onReady(container, recentlyOpened, installedExtensions) + onReady: (container: HTMLElement) => this.onReady(container, recentlyOpened, installedExtensions) }); } diff --git a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts index c8c2a0ebe74..65d4be0580d 100644 --- a/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts +++ b/src/vs/workbench/parts/welcome/walkThrough/electron-browser/walkThroughPart.ts @@ -483,7 +483,7 @@ export class WalkThroughPart extends BaseEditor { private saveTextEditorViewState(resource: URI): void { const memento = this.getMemento(this.storageService, Scope.WORKSPACE); - let editorViewStateMemento = memento[WALK_THROUGH_EDITOR_VIEW_STATE_PREFERENCE_KEY]; + let editorViewStateMemento: { [key: string]: { [position: number]: IWalkThroughEditorViewState } } = memento[WALK_THROUGH_EDITOR_VIEW_STATE_PREFERENCE_KEY]; if (!editorViewStateMemento) { editorViewStateMemento = Object.create(null); memento[WALK_THROUGH_EDITOR_VIEW_STATE_PREFERENCE_KEY] = editorViewStateMemento; @@ -497,7 +497,7 @@ export class WalkThroughPart extends BaseEditor { } }; - let fileViewState: IWalkThroughEditorViewStates = editorViewStateMemento[resource.toString()]; + let fileViewState = editorViewStateMemento[resource.toString()]; if (!fileViewState) { fileViewState = Object.create(null); editorViewStateMemento[resource.toString()] = fileViewState; @@ -510,11 +510,11 @@ export class WalkThroughPart extends BaseEditor { private loadTextEditorViewState(resource: URI) { const memento = this.getMemento(this.storageService, Scope.WORKSPACE); - const editorViewStateMemento = memento[WALK_THROUGH_EDITOR_VIEW_STATE_PREFERENCE_KEY]; + const editorViewStateMemento: { [key: string]: IWalkThroughEditorViewStates } = memento[WALK_THROUGH_EDITOR_VIEW_STATE_PREFERENCE_KEY]; if (editorViewStateMemento) { - const fileViewState: IWalkThroughEditorViewStates = editorViewStateMemento[resource.toString()]; + const fileViewState = editorViewStateMemento[resource.toString()]; if (fileViewState) { - const state: IWalkThroughEditorViewState = fileViewState[this.position]; + const state = fileViewState[this.position]; if (state) { this.scrollbar.setScrollPosition(state.viewState); } diff --git a/src/vs/workbench/services/files/node/fileService.ts b/src/vs/workbench/services/files/node/fileService.ts index c687b137fa7..5cf7b843c4e 100644 --- a/src/vs/workbench/services/files/node/fileService.ts +++ b/src/vs/workbench/services/files/node/fileService.ts @@ -29,7 +29,7 @@ import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace import pfs = require('vs/base/node/pfs'); import encoding = require('vs/base/node/encoding'); -import { IMimeAndEncoding, detectMimesFromFile } from 'vs/base/node/mime'; +import { detectMimesFromFile } from 'vs/base/node/mime'; import flow = require('vs/base/node/flow'); import { FileWatcher as UnixWatcherService } from 'vs/workbench/services/files/node/watcher/unix/watcherService'; import { FileWatcher as WindowsWatcherService } from 'vs/workbench/services/files/node/watcher/win32/watcherService'; @@ -229,7 +229,7 @@ export class FileService implements IFileService { // Return early if resource is a directory if (model.isDirectory) { return TPromise.wrapError(new FileOperationError( - nls.localize('fileIsDirectoryError', "File is directory ({0})", absolutePath), + nls.localize('fileIsDirectoryError', "File is directory"), FileOperationResult.FILE_IS_DIRECTORY )); } @@ -246,7 +246,7 @@ export class FileService implements IFileService { // 2.) detect mimes const autoGuessEncoding = (options && options.autoGuessEncoding) || this.configuredAutoGuessEncoding(resource); - return detectMimesFromFile(absolutePath, { autoGuessEncoding }).then((detected: IMimeAndEncoding) => { + return detectMimesFromFile(absolutePath, { autoGuessEncoding }).then(detected => { const isText = detected.mimes.indexOf(baseMime.MIME_BINARY) === -1; // Return error early if client only accepts text and this is not text @@ -277,7 +277,7 @@ export class FileService implements IFileService { // 3.) get content return contentResolver(model, preferredEncoding); }); - }, (error) => { + }, error => { // bubble up existing file operation results if (!types.isUndefinedOrNull((error).fileOperationResult)) { @@ -290,7 +290,7 @@ export class FileService implements IFileService { // Return if file not found if (!exists) { return TPromise.wrapError(new FileOperationError( - nls.localize('fileNotFoundError', "File not found ({0})", absolutePath), + nls.localize('fileNotFoundError', "File not found ({0})", resource.toString()), FileOperationResult.FILE_NOT_FOUND )); } @@ -881,7 +881,7 @@ export class StatResolver { return new TPromise((c, e) => { // Load children - this.resolveChildren(this.resource.fsPath, absoluteTargetPaths, options && options.resolveSingleChildDescendants, (children) => { + this.resolveChildren(this.resource.fsPath, absoluteTargetPaths, options && options.resolveSingleChildDescendants, children => { children = arrays.coalesce(children); // we don't want those null children (could be permission denied when reading a child) fileStat.hasChildren = children && children.length > 0; fileStat.children = children || []; diff --git a/src/vs/workbench/services/history/browser/history.ts b/src/vs/workbench/services/history/browser/history.ts index 0a61c7c71cc..45377e011ec 100644 --- a/src/vs/workbench/services/history/browser/history.ts +++ b/src/vs/workbench/services/history/browser/history.ts @@ -176,7 +176,7 @@ export class HistoryService extends BaseHistoryService implements IHistoryServic this.recentlyClosedFiles = []; this.loaded = false; this.registry = Registry.as(Extensions.Editors); - this.resourceFilter = instantiationService.createInstance(ResourceGlobMatcher, root => this.getExcludes(root), (expression: IExpression) => parse(expression)); + this.resourceFilter = instantiationService.createInstance(ResourceGlobMatcher, (root: URI) => this.getExcludes(root), (expression: IExpression) => parse(expression)); this.registerListeners(); } diff --git a/src/vs/workbench/services/scm/common/scmService.ts b/src/vs/workbench/services/scm/common/scmService.ts index d88e80f3f4e..6e429c117b1 100644 --- a/src/vs/workbench/services/scm/common/scmService.ts +++ b/src/vs/workbench/services/scm/common/scmService.ts @@ -50,7 +50,7 @@ class SCMRepository implements ISCMRepository { export class SCMService implements ISCMService { - _serviceBrand; + _serviceBrand: any; private _providerIds = new Set(); private _repositories: ISCMRepository[] = []; diff --git a/src/vs/workbench/services/search/node/ripgrepTextSearch.ts b/src/vs/workbench/services/search/node/ripgrepTextSearch.ts index 72913a99f20..925c395bf37 100644 --- a/src/vs/workbench/services/search/node/ripgrepTextSearch.ts +++ b/src/vs/workbench/services/search/node/ripgrepTextSearch.ts @@ -384,7 +384,7 @@ function foldersToRgExcludeGlobs(folderQueries: IFolderSearch[], globalExclude: } function foldersToIncludeGlobs(folderQueries: IFolderSearch[], globalInclude: glob.IExpression): string[] { - const globArgs = []; + const globArgs: string[] = []; folderQueries.forEach(folderQuery => { const totalIncludePattern = objects.assign({}, globalInclude || {}, folderQuery.includePattern || {}); const result = globExprsToRgGlobs(totalIncludePattern, folderQuery.folder); diff --git a/src/vs/workbench/services/textMate/electron-browser/TMHelper.ts b/src/vs/workbench/services/textMate/electron-browser/TMHelper.ts index 74c5b48f0c2..877f4885fc1 100644 --- a/src/vs/workbench/services/textMate/electron-browser/TMHelper.ts +++ b/src/vs/workbench/services/textMate/electron-browser/TMHelper.ts @@ -94,8 +94,8 @@ export class ThemeRule { return aParentScopesLen - bParentScopesLen; } for (let i = 0; i < aParentScopesLen; i++) { - var aLen = a.parentScopes[i].length; - var bLen = b.parentScopes[i].length; + const aLen = a.parentScopes[i].length; + const bLen = b.parentScopes[i].length; if (aLen !== bLen) { return aLen - bLen; } diff --git a/src/vs/workbench/services/textMate/electron-browser/textMateService.ts b/src/vs/workbench/services/textMate/electron-browser/textMateService.ts index 9e3b9eb2c03..c47fb4f275f 100644 --- a/src/vs/workbench/services/textMate/electron-browser/textMateService.ts +++ b/src/vs/workbench/services/textMate/electron-browser/textMateService.ts @@ -10,7 +10,7 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation' import { IGrammar } from 'vscode-textmate'; import { LanguageId } from 'vs/editor/common/modes'; -export var ITextMateService = createDecorator('textMateService'); +export const ITextMateService = createDecorator('textMateService'); export interface ITextMateService { _serviceBrand: any; diff --git a/src/vs/workbench/services/themes/electron-browser/colorThemeData.ts b/src/vs/workbench/services/themes/electron-browser/colorThemeData.ts index 344b546b82e..ebdb67e5e07 100644 --- a/src/vs/workbench/services/themes/electron-browser/colorThemeData.ts +++ b/src/vs/workbench/services/themes/electron-browser/colorThemeData.ts @@ -208,7 +208,7 @@ export function fromStorageData(input: string): ColorThemeData { } export function fromExtensionTheme(theme: IThemeExtensionPoint, normalizedAbsolutePath: string, extensionData: ExtensionData): ColorThemeData { - let baseTheme = theme['uiTheme'] || 'vs-dark'; + let baseTheme: string = theme['uiTheme'] || 'vs-dark'; let themeSelector = toCSSSelector(extensionData.extensionId + '-' + Paths.normalize(theme.path)); let themeData = new ColorThemeData(); diff --git a/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts b/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts index 0ebc6194b20..41aae76275d 100644 --- a/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts +++ b/src/vs/workbench/services/themes/electron-browser/workbenchThemeService.ts @@ -417,8 +417,8 @@ export class WorkbenchThemeService implements IWorkbenchThemeService { } private updateDynamicCSSRules(themeData: ITheme) { - let cssRules = []; - let hasRule = {}; + let cssRules: string[] = []; + let hasRule: { [rule: string]: boolean } = {}; let ruleCollector = { addRule: (rule: string) => { if (!hasRule[rule]) {