diff --git a/src/vs/workbench/browser/parts/editor/baseEditor.ts b/src/vs/workbench/browser/parts/editor/baseEditor.ts index c0536ea4e54..aa27a69c0d2 100644 --- a/src/vs/workbench/browser/parts/editor/baseEditor.ts +++ b/src/vs/workbench/browser/parts/editor/baseEditor.ts @@ -225,7 +225,7 @@ class EditorRegistry implements IEditorRegistry { const inputClass = inputDescriptors[j].ctor; // Direct check on constructor type (ignores prototype chain) - if (!byInstanceOf && (input).constructor === inputClass) { + if (!byInstanceOf && input.constructor === inputClass) { matchingDescriptors.push(editor); break; } diff --git a/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts b/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts index dbad923d8e6..769aa2e46a0 100644 --- a/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts +++ b/src/vs/workbench/browser/parts/editor/editorGroupsControl.ts @@ -1233,7 +1233,7 @@ export class EditorGroupsControl implements IEditorGroupsControl, IVerticalSashL titleContainer.on(DOM.EventType.MOUSE_DOWN, (e: MouseEvent) => { const position = this.findPosition(titleContainer.getHTMLElement()); const titleAreaControl = this.getTitleAreaControl(position); - if (!titleAreaControl.allowDragging(e.target || e.srcElement)) { + if (!titleAreaControl.allowDragging((e.target || e.srcElement) as HTMLElement)) { return; // return early if we are not in the drag zone of the title widget } diff --git a/src/vs/workbench/browser/parts/editor/editorStatus.ts b/src/vs/workbench/browser/parts/editor/editorStatus.ts index cd564410ea7..b0897bc5214 100644 --- a/src/vs/workbench/browser/parts/editor/editorStatus.ts +++ b/src/vs/workbench/browser/parts/editor/editorStatus.ts @@ -624,7 +624,7 @@ export class EditorStatus implements IStatusbarItem { // We only support text based editors if (getEditorWidget(e)) { - const encodingSupport: IEncodingSupport = asFileOrUntitledEditorInput(e.input); + const encodingSupport: IEncodingSupport = asFileOrUntitledEditorInput(e.input); if (encodingSupport && types.isFunction(encodingSupport.getEncoding)) { const rawEncoding = encodingSupport.getEncoding(); const encodingInfo = SUPPORTED_ENCODINGS[rawEncoding]; @@ -1018,7 +1018,7 @@ export class ChangeEncodingAction extends Action { return this.quickOpenService.pick([{ label: nls.localize('noEditor', "No text editor active at this time") }]); } - let encodingSupport: IEncodingSupport = asFileOrUntitledEditorInput(activeEditor.input); + let encodingSupport: IEncodingSupport = asFileOrUntitledEditorInput(activeEditor.input); if (!types.areFunctions(encodingSupport.setEncoding, encodingSupport.getEncoding)) { return this.quickOpenService.pick([{ label: nls.localize('noFileEditor', "No file active at this time") }]); } @@ -1086,7 +1086,7 @@ export class ChangeEncodingAction extends Action { }).then(encoding => { if (encoding) { activeEditor = this.editorService.getActiveEditor(); - encodingSupport = asFileOrUntitledEditorInput(activeEditor.input); + encodingSupport = asFileOrUntitledEditorInput(activeEditor.input); if (encodingSupport && types.areFunctions(encodingSupport.setEncoding, encodingSupport.getEncoding) && encodingSupport.getEncoding() !== encoding.id) { encodingSupport.setEncoding(encoding.id, isReopenWithEncoding ? EncodingMode.Decode : EncodingMode.Encode); // Set new encoding } diff --git a/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts index 7d969698c09..4dc538a2393 100644 --- a/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts +++ b/src/vs/workbench/browser/parts/editor/noTabsTitleControl.ts @@ -84,7 +84,7 @@ export class NoTabsTitleControl extends TitleControl { } // Focus editor group unless click on toolbar - else if (this.stacks.groups.length === 1 && !DOM.isAncestor(e.target || e.srcElement, this.editorActionsToolbar.getContainer().getHTMLElement())) { + else if (this.stacks.groups.length === 1 && !DOM.isAncestor((e.target || e.srcElement) as HTMLElement, this.editorActionsToolbar.getContainer().getHTMLElement())) { this.editorGroupService.focusGroup(group); } } diff --git a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts index 9997234119d..d9b50136166 100644 --- a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts +++ b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts @@ -412,7 +412,7 @@ export class TabsTitleControl extends TitleControl { this.tabDisposeables.push(DOM.addDisposableListener(tab, DOM.EventType.MOUSE_DOWN, (e: MouseEvent) => { tab.blur(); - if (e.button === 0 /* Left Button */ && !DOM.findParentWithClass(e.target || e.srcElement, 'monaco-action-bar', 'tab')) { + if (e.button === 0 /* Left Button */ && !DOM.findParentWithClass((e.target || e.srcElement) as HTMLElement, 'monaco-action-bar', 'tab')) { setTimeout(() => this.editorService.openEditor(editor, null, position).done(null, errors.onUnexpectedError)); // timeout to keep focus in editor after mouse up } })); diff --git a/src/vs/workbench/browser/parts/editor/textDiffEditor.ts b/src/vs/workbench/browser/parts/editor/textDiffEditor.ts index 93bf9d0b405..5d372e82267 100644 --- a/src/vs/workbench/browser/parts/editor/textDiffEditor.ts +++ b/src/vs/workbench/browser/parts/editor/textDiffEditor.ts @@ -307,7 +307,7 @@ export class TextDiffEditor extends BaseTextEditor { } public getControl(): IDiffEditor { - return super.getControl(); + return super.getControl() as IDiffEditor; } public dispose(): void { diff --git a/src/vs/workbench/electron-browser/workbench.ts b/src/vs/workbench/electron-browser/workbench.ts index 02a1aef8cdc..4a7785f466f 100644 --- a/src/vs/workbench/electron-browser/workbench.ts +++ b/src/vs/workbench/electron-browser/workbench.ts @@ -412,7 +412,7 @@ export class Workbench implements IPartService { this.contextKeyService = this.instantiationService.createInstance(ContextKeyService); serviceCollection.set(IContextKeyService, this.contextKeyService); - this.keybindingService = this.instantiationService.createInstance(WorkbenchKeybindingService, window); + this.keybindingService = this.instantiationService.createInstance(WorkbenchKeybindingService, window); serviceCollection.set(IKeybindingService, this.keybindingService); // Context Menu diff --git a/src/vs/workbench/node/extensionHostMain.ts b/src/vs/workbench/node/extensionHostMain.ts index 2abb5d4111d..d8ea9818d64 100644 --- a/src/vs/workbench/node/extensionHostMain.ts +++ b/src/vs/workbench/node/extensionHostMain.ts @@ -20,7 +20,7 @@ import * as errors from 'vs/base/common/errors'; const nativeExit = process.exit.bind(process); process.exit = function () { const err = new Error('An extension called process.exit() and this was prevented.'); - console.warn((err).stack); + console.warn(err.stack); }; export function exit(code?: number) { nativeExit(code); diff --git a/src/vs/workbench/parts/files/browser/fileActions.ts b/src/vs/workbench/parts/files/browser/fileActions.ts index bf2c58ea514..72e6eea3445 100644 --- a/src/vs/workbench/parts/files/browser/fileActions.ts +++ b/src/vs/workbench/parts/files/browser/fileActions.ts @@ -895,7 +895,7 @@ export class ImportFileAction extends BaseFileAction { const importPromisesFactory: ITask>[] = []; filesArray.forEach((file) => { importPromisesFactory.push(() => { - const sourceFile = URI.file((file).path); + const sourceFile = URI.file(file.path); return this.fileService.importFile(sourceFile, targetElement.resource).then((result: IImportResult) => { if (result.stat) { diff --git a/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts b/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts index 6235236e1ff..ccfec2794a6 100644 --- a/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts +++ b/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts @@ -97,17 +97,12 @@ class BaseCommandEntry extends QuickOpenEntryGroup { protected onError(error?: Error): void; protected onError(messagesWithAction?: IMessageWithAction): void; protected onError(arg1?: any): void { - let message: any; - const messagesWithAction: IMessageWithAction = arg1; if (messagesWithAction && typeof messagesWithAction.message === 'string' && Array.isArray(messagesWithAction.actions)) { - message = messagesWithAction; + this.messageService.show(Severity.Error, messagesWithAction); } else { - message = !arg1 ? nls.localize('canNotRun', "Command '{0}' can not be run from here.", this.label) : toErrorMessage(arg1); + this.messageService.show(Severity.Error, !arg1 ? nls.localize('canNotRun', "Command '{0}' can not be run from here.", this.label) : toErrorMessage(arg1)); } - - - this.messageService.show(Severity.Error, message); } protected runAction(action: IAction): void { @@ -152,7 +147,7 @@ class CommandEntry extends BaseCommandEntry { public run(mode: Mode, context: IEntryRunContext): boolean { if (mode === Mode.OPEN) { - let action = this.instantiationService.createInstance(this.actionDescriptor.syncDescriptor); + const action = this.instantiationService.createInstance(this.actionDescriptor.syncDescriptor); this.runAction(action); return true; @@ -256,30 +251,30 @@ export class CommandsHandler extends QuickOpenHandler { // Workbench Actions (if prefix asks for all commands) let workbenchEntries: CommandEntry[] = []; if (this.includeWorkbenchCommands()) { - let workbenchActions = (Registry.as(ActionExtensions.WorkbenchActions)).getWorkbenchActions(); + const workbenchActions = (Registry.as(ActionExtensions.WorkbenchActions)).getWorkbenchActions(); workbenchEntries = this.actionDescriptorsToEntries(workbenchActions, searchValue); } // Editor Actions - let activeEditor = this.editorService.getActiveEditor(); - let activeEditorControl = (activeEditor ? activeEditor.getControl() : null); + const activeEditor = this.editorService.getActiveEditor(); + const activeEditorControl = activeEditor ? activeEditor.getControl() : null; let editorActions: IEditorAction[] = []; if (activeEditorControl) { - let editor = activeEditorControl; + const editor = activeEditorControl; if (types.isFunction(editor.getSupportedActions)) { editorActions = editor.getSupportedActions(); } } - let editorEntries = this.editorActionsToEntries(editorActions, searchValue); + const editorEntries = this.editorActionsToEntries(editorActions, searchValue); // Other Actions - let otherActions = this.menuService.getCommandActions().map(command => { + const otherActions = this.menuService.getCommandActions().map(command => { return this.instantiationService.createInstance(ExecuteCommandAction, command.id, command.category ? nls.localize('', "{0}: {1}", command.category, command.title) : command.title); }); - let otherEntries = this.otherActionsToEntries(otherActions, searchValue); + const otherEntries = this.otherActionsToEntries(otherActions, searchValue); // Concat let entries = [...workbenchEntries, ...editorEntries, ...otherEntries]; @@ -294,28 +289,28 @@ export class CommandsHandler extends QuickOpenHandler { } private actionDescriptorsToEntries(actionDescriptors: SyncActionDescriptor[], searchValue: string): CommandEntry[] { - let entries: CommandEntry[] = []; - let registry = Registry.as(ActionExtensions.WorkbenchActions); + const entries: CommandEntry[] = []; + const registry = Registry.as(ActionExtensions.WorkbenchActions); for (let i = 0; i < actionDescriptors.length; i++) { - let actionDescriptor = actionDescriptors[i]; - let keys = this.keybindingService.lookupKeybindings(actionDescriptor.id); - let keyLabel = keys.map(k => this.keybindingService.getLabelFor(k)); - let keyAriaLabel = keys.map(k => this.keybindingService.getAriaLabelFor(k)); + const actionDescriptor = actionDescriptors[i]; + const keys = this.keybindingService.lookupKeybindings(actionDescriptor.id); + const keyLabel = keys.map(k => this.keybindingService.getLabelFor(k)); + const keyAriaLabel = keys.map(k => this.keybindingService.getAriaLabelFor(k)); if (actionDescriptor.label) { // Label (with optional category) let label = actionDescriptor.label; - let category = registry.getCategory(actionDescriptor.id); + const category = registry.getCategory(actionDescriptor.id); if (category) { label = nls.localize('commandLabel', "{0}: {1}", category, label); } // Alias for non default languages - let alias = (language !== LANGUAGE_DEFAULT) ? registry.getAlias(actionDescriptor.id) : null; - let labelHighlights = wordFilter(searchValue, label); - let aliasHighlights = alias ? wordFilter(searchValue, alias) : null; + const alias = (language !== LANGUAGE_DEFAULT) ? registry.getAlias(actionDescriptor.id) : null; + const labelHighlights = wordFilter(searchValue, label); + const aliasHighlights = alias ? wordFilter(searchValue, alias) : null; if (labelHighlights || aliasHighlights) { entries.push(this.instantiationService.createInstance(CommandEntry, keyLabel.length > 0 ? keyLabel.join(', ') : '', keyAriaLabel.length > 0 ? keyAriaLabel.join(', ') : '', label, alias, labelHighlights, aliasHighlights, actionDescriptor)); } @@ -326,22 +321,22 @@ export class CommandsHandler extends QuickOpenHandler { } private editorActionsToEntries(actions: IEditorAction[], searchValue: string): EditorActionCommandEntry[] { - let entries: EditorActionCommandEntry[] = []; + const entries: EditorActionCommandEntry[] = []; for (let i = 0; i < actions.length; i++) { - let action = actions[i]; + const action = actions[i]; - let keys = this.keybindingService.lookupKeybindings(action.id); - let keyLabel = keys.map(k => this.keybindingService.getLabelFor(k)); - let keyAriaLabel = keys.map(k => this.keybindingService.getAriaLabelFor(k)); - let label = action.label; + const keys = this.keybindingService.lookupKeybindings(action.id); + const keyLabel = keys.map(k => this.keybindingService.getLabelFor(k)); + const keyAriaLabel = keys.map(k => this.keybindingService.getAriaLabelFor(k)); + const label = action.label; if (label) { // Alias for non default languages - let alias = (language !== LANGUAGE_DEFAULT) ? action.alias : null; - let labelHighlights = wordFilter(searchValue, label); - let aliasHighlights = alias ? wordFilter(searchValue, alias) : null; + const alias = (language !== LANGUAGE_DEFAULT) ? action.alias : null; + const labelHighlights = wordFilter(searchValue, label); + const aliasHighlights = alias ? wordFilter(searchValue, alias) : null; if (labelHighlights || aliasHighlights) { entries.push(this.instantiationService.createInstance(EditorActionCommandEntry, keyLabel.length > 0 ? keyLabel.join(', ') : '', keyAriaLabel.length > 0 ? keyAriaLabel.join(', ') : '', label, alias, labelHighlights, aliasHighlights, action)); } @@ -352,13 +347,13 @@ export class CommandsHandler extends QuickOpenHandler { } private otherActionsToEntries(actions: IAction[], searchValue: string): ActionCommandEntry[] { - let entries: ActionCommandEntry[] = []; + const entries: ActionCommandEntry[] = []; for (let action of actions) { - let keys = this.keybindingService.lookupKeybindings(action.id); - let keyLabel = keys.map(k => this.keybindingService.getLabelFor(k)); - let keyAriaLabel = keys.map(k => this.keybindingService.getAriaLabelFor(k)); - let highlights = wordFilter(searchValue, action.label); + const keys = this.keybindingService.lookupKeybindings(action.id); + const keyLabel = keys.map(k => this.keybindingService.getLabelFor(k)); + const keyAriaLabel = keys.map(k => this.keybindingService.getAriaLabelFor(k)); + const highlights = wordFilter(searchValue, action.label); if (highlights) { entries.push(this.instantiationService.createInstance(ActionCommandEntry, keyLabel.join(', '), keyAriaLabel.join(', '), action.label, null, highlights, null, action)); } diff --git a/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts b/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts index 2fd0a3099d7..501d38dedd4 100644 --- a/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts +++ b/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts @@ -65,7 +65,7 @@ class OutlineModel extends QuickOpenModel { // Filter by search if (normalizedSearchValue) { - let highlights = filters.matchesFuzzy(normalizedSearchValue, entry.getLabel()); + const highlights = filters.matchesFuzzy(normalizedSearchValue, entry.getLabel()); if (highlights) { entry.setHighlights(highlights); entry.setHidden(false); @@ -90,14 +90,14 @@ class OutlineModel extends QuickOpenModel { } // Mark all type groups - let visibleResults = this.getEntries(true); + const visibleResults = this.getEntries(true); if (visibleResults.length > 0 && searchValue.indexOf(SCOPE_PREFIX) === 0) { let currentType: string = null; let currentResult: SymbolEntry = null; let typeCounter = 0; for (let i = 0; i < visibleResults.length; i++) { - let result = visibleResults[i]; + const result = visibleResults[i]; // Found new type if (currentType !== result.getType()) { @@ -143,18 +143,18 @@ class OutlineModel extends QuickOpenModel { return -1; } - let elementAName = elementA.getLabel().toLowerCase(); - let elementBName = elementB.getLabel().toLowerCase(); + const elementAName = elementA.getLabel().toLowerCase(); + const elementBName = elementB.getLabel().toLowerCase(); // Compare by name - let r = elementAName.localeCompare(elementBName); + const r = elementAName.localeCompare(elementBName); if (r !== 0) { return r; } // If name identical sort by range instead - let elementARange = elementA.getRange(); - let elementBRange = elementB.getRange(); + const elementARange = elementA.getRange(); + const elementBRange = elementB.getRange(); return elementARange.startLineNumber - elementBRange.startLineNumber; } @@ -174,8 +174,8 @@ class OutlineModel extends QuickOpenModel { searchValue = searchValue.substr(SCOPE_PREFIX.length); // Sort by type first if scoped search - let elementAType = elementA.getType(); - let elementBType = elementB.getType(); + const elementAType = elementA.getType(); + const elementBType = elementB.getType(); let r = elementAType.localeCompare(elementBType); if (r !== 0) { return r; @@ -183,8 +183,8 @@ class OutlineModel extends QuickOpenModel { // Special sort when searching in scoped mode if (searchValue) { - let elementAName = elementA.getLabel().toLowerCase(); - let elementBName = elementB.getLabel().toLowerCase(); + const elementAName = elementA.getLabel().toLowerCase(); + const elementBName = elementB.getLabel().toLowerCase(); // Compare by name r = elementAName.localeCompare(elementBName); @@ -194,15 +194,15 @@ class OutlineModel extends QuickOpenModel { } // Default to sort by range - let elementARange = elementA.getRange(); - let elementBRange = elementB.getRange(); + const elementARange = elementA.getRange(); + const elementBRange = elementB.getRange(); return elementARange.startLineNumber - elementBRange.startLineNumber; } private renderGroupLabel(type: string, count: number, outline: Outline): string { - let pattern = OutlineModel.getDefaultGroupLabelPatterns()[type]; + const pattern = OutlineModel.getDefaultGroupLabelPatterns()[type]; if (pattern) { return strings.format(pattern, count); } @@ -308,17 +308,17 @@ class SymbolEntry extends EditorQuickOpenEntryGroup { private runOpen(context: IEntryRunContext): boolean { // Check for sideBySide use - let sideBySide = context.keymods.indexOf(KeyMod.CtrlCmd) >= 0; + const sideBySide = context.keymods.indexOf(KeyMod.CtrlCmd) >= 0; if (sideBySide) { this.editorService.openEditor(this.getInput(), this.getOptions(), true).done(null, errors.onUnexpectedError); } // Apply selection and focus else { - let range = this.toSelection(); - let activeEditor = this.editorService.getActiveEditor(); + const range = this.toSelection(); + const activeEditor = this.editorService.getActiveEditor(); if (activeEditor) { - let editor = activeEditor.getControl(); + const editor = activeEditor.getControl(); editor.setSelection(range); editor.revealRangeInCenter(range); } @@ -330,10 +330,10 @@ class SymbolEntry extends EditorQuickOpenEntryGroup { private runPreview(): boolean { // Select Outline Position - let range = this.toSelection(); - let activeEditor = this.editorService.getActiveEditor(); + const range = this.toSelection(); + const activeEditor = this.editorService.getActiveEditor(); if (activeEditor) { - let editorControl = activeEditor.getControl(); + const editorControl = activeEditor.getControl(); editorControl.revealRangeInCenter(range); // Decorate if possible @@ -384,7 +384,7 @@ export class GotoSymbolHandler extends QuickOpenHandler { // Remember view state to be able to restore on cancel if (!this.lastKnownEditorViewState) { - let editor = this.editorService.getActiveEditor(); + const editor = this.editorService.getActiveEditor(); this.lastKnownEditorViewState = (editor.getControl()).saveViewState(); } @@ -443,17 +443,17 @@ export class GotoSymbolHandler extends QuickOpenHandler { } private toQuickOpenEntries(flattened: SymbolInformation[]): SymbolEntry[] { - let results: SymbolEntry[] = []; + const results: SymbolEntry[] = []; for (let i = 0; i < flattened.length; i++) { - let element = flattened[i]; - let label = strings.trim(element.name); + const element = flattened[i]; + const label = strings.trim(element.name); // Show parent scope as description - let description: string = element.containerName; + const description: string = element.containerName; // Add - let icon = SymbolKind.from(element.kind); + const icon = SymbolKind.from(element.kind); results.push(new SymbolEntry(i, label, SymbolKind.from(element.kind), description, icon, element.location.range, null, this.editorService, this)); } @@ -479,14 +479,14 @@ export class GotoSymbolHandler extends QuickOpenHandler { if (model && types.isFunction((model).getMode)) { // Ask cache first - let modelId = (model).id; + const modelId = (model).id; if (this.outlineToModelCache[modelId]) { return TPromise.as(this.outlineToModelCache[modelId]); } return getDocumentSymbols(model).then(outline => { - let model = new OutlineModel(outline, this.toQuickOpenEntries(outline.entries)); + const model = new OutlineModel(outline, this.toQuickOpenEntries(outline.entries)); this.outlineToModelCache = {}; // Clear cache, only keep 1 outline this.outlineToModelCache[modelId] = model; @@ -501,7 +501,7 @@ export class GotoSymbolHandler extends QuickOpenHandler { public decorateOutline(fullRange: IRange, startRange: IRange, editor: IEditor, position: Position): void { editor.changeDecorations((changeAccessor: IModelDecorationsChangeAccessor) => { - let deleteDecorations: string[] = []; + const deleteDecorations: string[] = []; if (this.rangeHighlightDecorationId) { deleteDecorations.push(this.rangeHighlightDecorationId.lineDecorationId); @@ -509,7 +509,7 @@ export class GotoSymbolHandler extends QuickOpenHandler { this.rangeHighlightDecorationId = null; } - let newDecorations: IModelDeltaDecoration[] = [ + const newDecorations: IModelDeltaDecoration[] = [ // rangeHighlight at index 0 { @@ -534,9 +534,9 @@ export class GotoSymbolHandler extends QuickOpenHandler { ]; - let decorations = changeAccessor.deltaDecorations(deleteDecorations, newDecorations); - let rangeHighlightId = decorations[0]; - let lineDecorationId = decorations[1]; + const decorations = changeAccessor.deltaDecorations(deleteDecorations, newDecorations); + const rangeHighlightId = decorations[0]; + const lineDecorationId = decorations[1]; this.rangeHighlightDecorationId = { rangeHighlightId: rangeHighlightId, @@ -550,7 +550,7 @@ export class GotoSymbolHandler extends QuickOpenHandler { if (this.rangeHighlightDecorationId) { this.editorService.getVisibleEditors().forEach((editor) => { if (editor.position === this.rangeHighlightDecorationId.position) { - let editorControl = editor.getControl(); + const editorControl = editor.getControl(); editorControl.changeDecorations((changeAccessor: IModelDecorationsChangeAccessor) => { changeAccessor.deltaDecorations([ this.rangeHighlightDecorationId.lineDecorationId, @@ -574,9 +574,9 @@ export class GotoSymbolHandler extends QuickOpenHandler { // Restore selection if canceled if (canceled && this.lastKnownEditorViewState) { - let activeEditor = this.editorService.getActiveEditor(); + const activeEditor = this.editorService.getActiveEditor(); if (activeEditor) { - let editor = activeEditor.getControl(); + const editor = activeEditor.getControl(); editor.restoreViewState(this.lastKnownEditorViewState); } } diff --git a/src/vs/workbench/services/configuration/node/configurationEditingService.ts b/src/vs/workbench/services/configuration/node/configurationEditingService.ts index dcb2a03967d..3b68c03d4c9 100644 --- a/src/vs/workbench/services/configuration/node/configurationEditingService.ts +++ b/src/vs/workbench/services/configuration/node/configurationEditingService.ts @@ -93,7 +93,7 @@ export class ConfigurationEditingService implements IConfigurationEditingService }); } - private writeToBuffer(contents: string, operation: IConfigurationEditOperation, resource: URI, options: IConfigurationEditingOptions): TPromise { + private writeToBuffer(contents: string, operation: IConfigurationEditOperation, resource: URI, options: IConfigurationEditingOptions): TPromise { const isDirtyBefore = this.textFileService.isDirty(resource); const edit = this.getEdits(contents, operation)[0]; return this.textModelResolverService.createModelReference(resource). @@ -120,7 +120,7 @@ export class ConfigurationEditingService implements IConfigurationEditingService return false; } - private writeToDisk(contents: string, operation: IConfigurationEditOperation, resource: URI): TPromise { + private writeToDisk(contents: string, operation: IConfigurationEditOperation, resource: URI): TPromise { // Apply all edits to the configuration file const result = this.applyEdits(contents, operation); diff --git a/src/vs/workbench/services/files/node/fileService.ts b/src/vs/workbench/services/files/node/fileService.ts index 2add9acc0b6..0b83943f32c 100644 --- a/src/vs/workbench/services/files/node/fileService.ts +++ b/src/vs/workbench/services/files/node/fileService.ts @@ -480,7 +480,7 @@ export class FileService implements IFileService { const reader = fs.createReadStream(absolutePath).pipe(encoding.decodeStream(fileEncoding)); // decode takes care of stripping any BOMs from the file content - const content: IStreamContent = model; + const content = model as IFileStat & IStreamContent; content.value = reader; content.encoding = fileEncoding; // make sure to store the encoding in the model to restore it later when writing @@ -489,7 +489,7 @@ export class FileService implements IFileService { } private resolveFileContent(resource: uri, etag?: string, enc?: string): TPromise { - return this.resolveFileStreamContent(resource, etag, enc).then((streamContent) => { + return this.resolveFileStreamContent(resource, etag, enc).then(streamContent => { return new TPromise((c, e) => { let done = false; const chunks: string[] = []; diff --git a/src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts b/src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts index c04207e8d22..60dd1fab10e 100644 --- a/src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts +++ b/src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts @@ -123,7 +123,7 @@ export class WorkbenchKeybindingService extends AbstractKeybindingService { private userKeybindings: ConfigWatcher; constructor( - domNode: HTMLElement, + windowElement: Window, @IContextKeyService contextKeyService: IContextKeyService, @ICommandService commandService: ICommandService, @ITelemetryService private telemetryService: ITelemetryService, @@ -156,7 +156,7 @@ export class WorkbenchKeybindingService extends AbstractKeybindingService { keybindings: event.config }))); - this.toDispose.push(dom.addDisposableListener(domNode, dom.EventType.KEY_DOWN, (e: KeyboardEvent) => { + this.toDispose.push(dom.addDisposableListener(windowElement, dom.EventType.KEY_DOWN, (e: KeyboardEvent) => { let keyEvent = new StandardKeyboardEvent(e); let shouldPreventDefault = this._dispatch(keyEvent.toKeybinding(), keyEvent.target); if (shouldPreventDefault) { diff --git a/src/vs/workbench/services/message/browser/messageList.ts b/src/vs/workbench/services/message/browser/messageList.ts index cae18f520a3..d782b0998fa 100644 --- a/src/vs/workbench/services/message/browser/messageList.ts +++ b/src/vs/workbench/services/message/browser/messageList.ts @@ -166,9 +166,7 @@ export class MessageList { aria.alert(alertText); - return () => { - this.hideMessage(id); - }; + return () => this.hideMessage(id); } private renderMessages(animate: boolean, delta: number): void { @@ -188,7 +186,7 @@ export class MessageList { } // Render Messages as List Items - $(this.messageListContainer).ul({ 'class': 'message-list' }, (ul: Builder) => { + $(this.messageListContainer).ul({ 'class': 'message-list' }, ul => { const messages = this.prepareMessages(); if (messages.length > 0) { this._onMessagesShowing.fire(); @@ -226,15 +224,15 @@ export class MessageList { } private renderMessage(message: IMessageEntry, container: Builder, total: number, delta: number): void { - container.li({ class: 'message-list-entry message-list-entry-with-action' }, (li) => { + container.li({ class: 'message-list-entry message-list-entry-with-action' }, li => { // Actions (if none provided, add one default action to hide message) const messageActions = this.getMessageActions(message); - li.div({ class: 'actions-container' }, (actionContainer) => { + li.div({ class: 'actions-container' }, actionContainer => { for (let i = 0; i < messageActions.length; i++) { const action = messageActions[i]; - actionContainer.div({ class: 'message-action' }, (div) => { - div.a({ class: 'action-button', tabindex: '0', role: 'button' }).text(action.label).on([DOM.EventType.CLICK, DOM.EventType.KEY_DOWN], (e) => { + actionContainer.div({ class: 'message-action' }, div => { + div.a({ class: 'action-button', tabindex: '0', role: 'button' }).text(action.label).on([DOM.EventType.CLICK, DOM.EventType.KEY_DOWN], e => { if (e instanceof KeyboardEvent) { const event = new StandardKeyboardEvent(e); if (!event.equals(KeyCode.Enter) && !event.equals(KeyCode.Space)) { @@ -249,9 +247,9 @@ export class MessageList { } (action.run() || TPromise.as(null)) - .then(null, error => this.showMessage(Severity.Error, error)) - .done((r) => { - if (r === false) { + .then(null, error => this.showMessage(Severity.Error, error)) + .done(r => { + if (typeof r === 'boolean' && r === false) { return; } @@ -264,7 +262,7 @@ export class MessageList { // Text const text = message.text.substr(0, this.options.maxMessageLength); - li.div({ class: 'message-left-side' }, (div) => { + li.div({ class: 'message-left-side' }, div => { div.addClass('message-overflow-ellipsis'); // Severity indicator @@ -273,13 +271,13 @@ export class MessageList { $().span({ class: 'message-left-side severity ' + ((sev === Severity.Error) ? 'app-error' : (sev === Severity.Warning) ? 'app-warning' : 'app-info'), text: label }).appendTo(div); // Error message - const messageContentElement: HTMLElement = htmlRenderer.renderHtml({ + const messageContentElement = htmlRenderer.renderHtml({ tagName: 'span', className: 'message-left-side', formattedText: text }); - $(messageContentElement).title(messageContentElement.textContent).appendTo(div); + $(messageContentElement as HTMLElement).title(messageContentElement.textContent).appendTo(div); }); }); } @@ -327,13 +325,13 @@ export class MessageList { } private disposeMessages(messages: IMessageEntry[]): void { - messages.forEach((message) => { + messages.forEach(message => { if (message.onHide) { message.onHide(); } if (message.actions) { - message.actions.forEach((action) => { + message.actions.forEach(action => { action.dispose(); }); }