diff --git a/src/vs/workbench/browser/actionRegistry.ts b/src/vs/workbench/browser/actionRegistry.ts index 9f81142559a..5db2336f67e 100644 --- a/src/vs/workbench/browser/actionRegistry.ts +++ b/src/vs/workbench/browser/actionRegistry.ts @@ -4,20 +4,17 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import nls = require('vs/nls'); import {TPromise} from 'vs/base/common/winjs.base'; import collections = require('vs/base/common/collections'); import {Registry} from 'vs/platform/platform'; import {IAction} from 'vs/base/common/actions'; import {KeybindingsRegistry,ICommandDescriptor} from 'vs/platform/keybinding/common/keybindingsRegistry'; -import {KeybindingsUtils} from 'vs/platform/keybinding/common/keybindingsUtils'; import {IPartService} from 'vs/workbench/services/part/common/partService'; import {ICommandHandler} from 'vs/platform/keybinding/common/keybindingService'; import {SyncActionDescriptor} from 'vs/platform/actions/common/actions'; -import {IMessageService, IMessageWithAction} from 'vs/platform/message/common/message'; +import {IMessageService} from 'vs/platform/message/common/message'; import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry'; import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation'; -import {Keybinding} from 'vs/base/common/keyCodes'; import Severity from 'vs/base/common/severity'; export const Extensions = { @@ -82,7 +79,6 @@ class WorkbenchActionRegistry implements IWorkbenchActionRegistry { return false; } - let descriptor = this.workbenchActions[id]; delete this.workbenchActions[id]; delete this.mapActionIdToCategory[id]; diff --git a/src/vs/workbench/browser/component.ts b/src/vs/workbench/browser/component.ts index e1d003d75b3..e9f660903f6 100644 --- a/src/vs/workbench/browser/component.ts +++ b/src/vs/workbench/browser/component.ts @@ -4,7 +4,6 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import {TPromise} from 'vs/base/common/winjs.base'; import {EventEmitter, IEventEmitter} from 'vs/base/common/eventEmitter'; import {IDisposable} from 'vs/base/common/lifecycle'; import {Scope, Memento} from 'vs/workbench/common/memento'; diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts index 9bb7c8681f3..4cb3e6c0639 100644 --- a/src/vs/workbench/browser/layout.ts +++ b/src/vs/workbench/browser/layout.ts @@ -14,7 +14,7 @@ import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/edito import {IPartService, Position} from 'vs/workbench/services/part/common/partService'; import {IWorkspaceContextService} from 'vs/workbench/services/workspace/common/contextService'; import {IStorageService, StorageScope, StorageEventType} from 'vs/platform/storage/common/storage'; -import {IContextViewService, IContextMenuService} from 'vs/platform/contextview/browser/contextView'; +import {IContextViewService} from 'vs/platform/contextview/browser/contextView'; import {IEventService} from 'vs/platform/event/common/event'; const DEFAULT_MIN_PART_WIDTH = 170; diff --git a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts index 2d37cb0f45c..2d1c2e87da6 100644 --- a/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts +++ b/src/vs/workbench/browser/parts/activitybar/activitybarPart.ts @@ -28,7 +28,6 @@ import {IInstantiationService} from 'vs/platform/instantiation/common/instantiat import {IMessageService, Severity} from 'vs/platform/message/common/message'; import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry'; import {IKeybindingService} from 'vs/platform/keybinding/common/keybindingService'; -import {KeybindingsUtils} from 'vs/platform/keybinding/common/keybindingsUtils'; export class ActivitybarPart extends Part implements IActivityService { public serviceId = IActivityService; diff --git a/src/vs/workbench/browser/parts/editor/baseEditor.ts b/src/vs/workbench/browser/parts/editor/baseEditor.ts index 101ddc5a046..22498d48d4f 100644 --- a/src/vs/workbench/browser/parts/editor/baseEditor.ts +++ b/src/vs/workbench/browser/parts/editor/baseEditor.ts @@ -9,7 +9,6 @@ import {Action, IAction} from 'vs/base/common/actions'; import {ActionBarContributor} from 'vs/workbench/browser/actionBarRegistry'; import types = require('vs/base/common/types'); import {Builder} from 'vs/base/browser/builder'; -import URI from 'vs/base/common/uri'; import {Registry} from 'vs/platform/platform'; import {Viewlet} from 'vs/workbench/browser/viewlet'; import {EditorInput, IFileEditorInput, EditorOptions} from 'vs/workbench/common/editor'; diff --git a/src/vs/workbench/browser/parts/editor/binaryEditor.ts b/src/vs/workbench/browser/parts/editor/binaryEditor.ts index 63a61cbf43f..8d6249fdb01 100644 --- a/src/vs/workbench/browser/parts/editor/binaryEditor.ts +++ b/src/vs/workbench/browser/parts/editor/binaryEditor.ts @@ -7,7 +7,6 @@ import 'vs/css!./media/binaryeditor'; import nls = require('vs/nls'); -import DOM = require('vs/base/browser/dom'); import {TPromise} from 'vs/base/common/winjs.base'; import {Dimension, Builder, $} from 'vs/base/browser/builder'; import {ResourceViewer} from 'vs/base/browser/ui/resourceviewer/resourceViewer'; diff --git a/src/vs/workbench/browser/parts/editor/editor.contribution.ts b/src/vs/workbench/browser/parts/editor/editor.contribution.ts index 742991c1433..3ae4f8f6d22 100644 --- a/src/vs/workbench/browser/parts/editor/editor.contribution.ts +++ b/src/vs/workbench/browser/parts/editor/editor.contribution.ts @@ -15,7 +15,6 @@ import {UntitledEditorInput} from 'vs/workbench/browser/parts/editor/untitledEdi import {ResourceEditorInput} from 'vs/workbench/browser/parts/editor/resourceEditorInput'; import {TextDiffEditor} from 'vs/workbench/browser/parts/editor/textDiffEditor'; import {BinaryResourceDiffEditor} from 'vs/workbench/browser/parts/editor/binaryDiffEditor'; -import {BinaryResourceEditor} from 'vs/workbench/browser/parts/editor/binaryEditor'; import {IFrameEditor} from 'vs/workbench/browser/parts/editor/iframeEditor'; import {IFrameEditorInput} from 'vs/workbench/browser/parts/editor/iframeEditorInput'; import {ChangeEncodingAction, ChangeEOLAction, ChangeModeAction, EditorStatus} from 'vs/workbench/browser/parts/editor/editorStatus'; diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts index 73d0fd2004a..d03308c331f 100644 --- a/src/vs/workbench/browser/parts/editor/editorPart.ts +++ b/src/vs/workbench/browser/parts/editor/editorPart.ts @@ -65,7 +65,6 @@ export class EditorPart extends Part implements IEditorPart { private instantiationService: IInstantiationService; private dimension: Dimension; private sideBySideControl: SideBySideEditorControl; - private quickStartTimer: timer.ITimerEvent; private memento: any; // The following data structures are partitioned into array of Position as provided by Services.POSITION array @@ -212,7 +211,7 @@ export class EditorPart extends Part implements IEditorPart { // To prevent race conditions, we call the close in a timeout because it can well be // that an input is being disposed with the intent to replace it with some other input - // right after. + // right after. setTimeout(() => { if (input === this.visibleInputs[position]) { this.closeEditors(false, input).done(null, errors.onUnexpectedError); diff --git a/src/vs/workbench/browser/parts/editor/editorStatus.ts b/src/vs/workbench/browser/parts/editor/editorStatus.ts index b926498ec3c..8732c23ceb6 100644 --- a/src/vs/workbench/browser/parts/editor/editorStatus.ts +++ b/src/vs/workbench/browser/parts/editor/editorStatus.ts @@ -15,15 +15,14 @@ import strings = require('vs/base/common/strings'); import types = require('vs/base/common/types'); import uri from 'vs/base/common/uri'; import errors = require('vs/base/common/errors'); -import Severity from 'vs/base/common/severity'; import {IStatusbarItem} from 'vs/workbench/browser/parts/statusbar/statusbar'; import {Action} from 'vs/base/common/actions'; import {IEditorModesRegistry, Extensions} from 'vs/editor/common/modes/modesRegistry'; import {Registry} from 'vs/platform/platform'; import {BaseEditor} from 'vs/workbench/browser/parts/editor/baseEditor'; import {UntitledEditorInput} from 'vs/workbench/browser/parts/editor/untitledEditorInput'; -import {IFileEditorInput, EditorInput, EncodingMode, IEncodingSupport, asFileEditorInput, getUntitledOrFileResource} from 'vs/workbench/common/editor'; -import {toDisposable, IDisposable, combinedDispose} from 'vs/base/common/lifecycle'; +import {IFileEditorInput, EncodingMode, IEncodingSupport, asFileEditorInput, getUntitledOrFileResource} from 'vs/workbench/common/editor'; +import {IDisposable, combinedDispose} from 'vs/base/common/lifecycle'; import {ICodeEditor, IDiffEditor} from 'vs/editor/browser/editorBrowser'; import {EndOfLineSequence, ITokenizedModel, EditorType, IEditorSelection, ITextModel, IDiffEditorModel, IEditor} from 'vs/editor/common/editorCommon'; import {EventType, EditorEvent, TextEditorSelectionEvent, ResourceEvent} from 'vs/workbench/browser/events'; diff --git a/src/vs/workbench/browser/parts/editor/resourceEditorInput.ts b/src/vs/workbench/browser/parts/editor/resourceEditorInput.ts index 3f49c3598f7..989e2867c82 100644 --- a/src/vs/workbench/browser/parts/editor/resourceEditorInput.ts +++ b/src/vs/workbench/browser/parts/editor/resourceEditorInput.ts @@ -5,7 +5,6 @@ 'use strict'; import {TPromise} from 'vs/base/common/winjs.base'; -import {MIME_TEXT} from 'vs/base/common/mime'; import {EditorModel, EditorInput} from 'vs/workbench/common/editor'; import {ResourceEditorModel} from 'vs/workbench/browser/parts/editor/resourceEditorModel'; import URI from 'vs/base/common/uri'; diff --git a/src/vs/workbench/browser/parts/editor/resourceEditorModel.ts b/src/vs/workbench/browser/parts/editor/resourceEditorModel.ts index 4ae00bcecfd..170f354da29 100644 --- a/src/vs/workbench/browser/parts/editor/resourceEditorModel.ts +++ b/src/vs/workbench/browser/parts/editor/resourceEditorModel.ts @@ -13,7 +13,6 @@ import {IModelService} from 'vs/editor/common/services/modelService'; * An editor model whith an in-memory, readonly content that is backed by an existing editor model. */ export class ResourceEditorModel extends BaseTextEditorModel { - private resource: URI; constructor( resource: URI, diff --git a/src/vs/workbench/browser/parts/editor/sideBySideEditorControl.ts b/src/vs/workbench/browser/parts/editor/sideBySideEditorControl.ts index 59cf74d2c27..3d9b64a2d93 100644 --- a/src/vs/workbench/browser/parts/editor/sideBySideEditorControl.ts +++ b/src/vs/workbench/browser/parts/editor/sideBySideEditorControl.ts @@ -71,8 +71,6 @@ export class SideBySideEditorControl extends EventEmitter implements IVerticalSa private editorActionsToolbar: ToolBar[]; private closeEditorAction: Action[]; - private editorInputStateHoverTimeout: number; - private splitEditorAction: Action; private leftSash: Sash; diff --git a/src/vs/workbench/browser/parts/editor/stringEditor.ts b/src/vs/workbench/browser/parts/editor/stringEditor.ts index 9490de96a38..080ac43c360 100644 --- a/src/vs/workbench/browser/parts/editor/stringEditor.ts +++ b/src/vs/workbench/browser/parts/editor/stringEditor.ts @@ -20,7 +20,7 @@ import {UntitledEditorEvent, EventType} from 'vs/workbench/browser/events'; import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry'; import {IWorkspaceContextService} from 'vs/workbench/services/workspace/common/contextService'; import {IStorageService} from 'vs/platform/storage/common/storage'; -import {IConfigurationService, IConfigurationServiceEvent, ConfigurationServiceEventTypes} from 'vs/platform/configuration/common/configuration'; +import {IConfigurationService} from 'vs/platform/configuration/common/configuration'; import {IEventService} from 'vs/platform/event/common/event'; import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation'; import {IMessageService} from 'vs/platform/message/common/message'; diff --git a/src/vs/workbench/browser/parts/editor/stringEditorModel.ts b/src/vs/workbench/browser/parts/editor/stringEditorModel.ts index 9ae7491dd0e..88ec375a3a6 100644 --- a/src/vs/workbench/browser/parts/editor/stringEditorModel.ts +++ b/src/vs/workbench/browser/parts/editor/stringEditorModel.ts @@ -6,7 +6,6 @@ import {TPromise} from 'vs/base/common/winjs.base'; import {BaseTextEditorModel} from 'vs/workbench/browser/parts/editor/textEditorModel'; -import {IIdentifiedSingleEditOperation} from 'vs/editor/common/editorCommon'; import {EditorModel} from 'vs/workbench/common/editor'; import URI from 'vs/base/common/uri'; import {Position} from 'vs/editor/common/core/position'; diff --git a/src/vs/workbench/browser/parts/editor/textDiffEditor.ts b/src/vs/workbench/browser/parts/editor/textDiffEditor.ts index 449888aa908..5d72eba75f1 100644 --- a/src/vs/workbench/browser/parts/editor/textDiffEditor.ts +++ b/src/vs/workbench/browser/parts/editor/textDiffEditor.ts @@ -28,7 +28,7 @@ import {IFileOperationResult, FileOperationResult} from 'vs/platform/files/commo import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry'; import {IWorkspaceContextService} from 'vs/workbench/services/workspace/common/contextService'; import {IStorageService} from 'vs/platform/storage/common/storage'; -import {IConfigurationService, IConfigurationServiceEvent, ConfigurationServiceEventTypes} from 'vs/platform/configuration/common/configuration'; +import {IConfigurationService} from 'vs/platform/configuration/common/configuration'; import {IEventService} from 'vs/platform/event/common/event'; import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation'; import {IMessageService} from 'vs/platform/message/common/message'; diff --git a/src/vs/workbench/browser/parts/quickopen/editorHistoryModel.ts b/src/vs/workbench/browser/parts/quickopen/editorHistoryModel.ts index 3e470b9759d..a1cf9f0e242 100644 --- a/src/vs/workbench/browser/parts/quickopen/editorHistoryModel.ts +++ b/src/vs/workbench/browser/parts/quickopen/editorHistoryModel.ts @@ -6,13 +6,11 @@ import {Registry} from 'vs/platform/platform'; import filters = require('vs/base/common/filters'); -import strings = require('vs/base/common/strings'); import types = require('vs/base/common/types'); import paths = require('vs/base/common/paths'); import URI from 'vs/base/common/uri'; import labels = require('vs/base/common/labels'); import {EventType} from 'vs/base/common/events'; -import comparers = require('vs/base/common/comparers'); import {Mode, IContext} from 'vs/base/parts/quickopen/browser/quickOpen'; import {QuickOpenEntry, QuickOpenModel, IHighlight} from 'vs/base/parts/quickopen/browser/quickOpenModel'; import {EditorInput, getUntitledOrFileResource} from 'vs/workbench/common/editor'; diff --git a/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts b/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts index f02e133a5db..2c1f964c61b 100644 --- a/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts +++ b/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts @@ -39,7 +39,6 @@ import {IMessageService, Severity} from 'vs/platform/message/common/message'; import {IProgressService} from 'vs/platform/progress/common/progress'; import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry'; import {IKeybindingService} from 'vs/platform/keybinding/common/keybindingService'; -import {KeybindingsUtils} from 'vs/platform/keybinding/common/keybindingsUtils'; import {KeyMod, KeyCode} from 'vs/base/common/keyCodes'; export class SidebarPart extends Part implements IViewletService { diff --git a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts index aae2b2dd78f..bd555ff144d 100644 --- a/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts +++ b/src/vs/workbench/browser/parts/statusbar/statusbarPart.ts @@ -10,12 +10,12 @@ import dom = require('vs/base/browser/dom'); import types = require('vs/base/common/types'); import nls = require('vs/nls'); import {toErrorMessage} from 'vs/base/common/errors'; -import {Promise, TPromise} from 'vs/base/common/winjs.base'; +import {Promise} from 'vs/base/common/winjs.base'; import {disposeAll, IDisposable} from 'vs/base/common/lifecycle'; import {Builder, $} from 'vs/base/browser/builder'; import {Registry} from 'vs/platform/platform'; import {IKeybindingService} from 'vs/platform/keybinding/common/keybindingService'; -import {IAction, Action} from 'vs/base/common/actions'; +import {IAction} from 'vs/base/common/actions'; import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService'; import {Part} from 'vs/workbench/browser/part'; import {IWorkbenchActionRegistry, Extensions as ActionExtensions} from 'vs/workbench/browser/actionRegistry'; diff --git a/src/vs/workbench/browser/quickopen.ts b/src/vs/workbench/browser/quickopen.ts index 9c2425d4b09..7e5f1838b8c 100644 --- a/src/vs/workbench/browser/quickopen.ts +++ b/src/vs/workbench/browser/quickopen.ts @@ -317,9 +317,9 @@ export abstract class CommandQuickOpenHandler extends QuickOpenHandler { } public getResults(input: string): TPromise { - var match: RegExpMatchArray; - var command = arrays.first(this.commands, c => !!(match = input.match(c.regexp))); - var promise: TPromise; + let match: RegExpMatchArray; + let command = arrays.first(this.commands, c => !!(match = input.match(c.regexp))); + let promise: TPromise; if (command) { promise = command.command.getResults(input.substr(match[0].length)); @@ -333,7 +333,7 @@ export abstract class CommandQuickOpenHandler extends QuickOpenHandler { } private getCommands(input: string): TPromise { - var entries: QuickOpenEntry[] = this.commands + let entries: QuickOpenEntry[] = this.commands .map(c => ({ command: c.command, highlights: filters.matchesFuzzy(input, c.command.aliases[0]) })) .filter(({ command, highlights }) => !!highlights || command.aliases.some(a => input === a)) .map(({ command, highlights }) => new CommandEntry(this.quickOpenService, this.prefix, command, highlights)); @@ -362,8 +362,8 @@ export abstract class CommandQuickOpenHandler extends QuickOpenHandler { } public getEmptyLabel(input: string): string { - var match: RegExpMatchArray; - var command = arrays.first(this.commands, c => !!(match = input.match(c.regexp))); + let match: RegExpMatchArray; + let command = arrays.first(this.commands, c => !!(match = input.match(c.regexp))); if (!command) { return nls.localize('noCommands', "No commands matching"); diff --git a/src/vs/workbench/browser/workbench.ts b/src/vs/workbench/browser/workbench.ts index 1315311da20..93708fb4b60 100644 --- a/src/vs/workbench/browser/workbench.ts +++ b/src/vs/workbench/browser/workbench.ts @@ -42,7 +42,7 @@ import {Position, Parts, IPartService} from 'vs/workbench/services/part/common/p import {DEFAULT_THEME_ID} from 'vs/platform/theme/common/themes'; import {IWorkspaceContextService as IWorkbenchWorkspaceContextService} from 'vs/workbench/services/workspace/common/contextService'; import {IStorageService, StorageScope, StorageEvent, StorageEventType} from 'vs/platform/storage/common/storage'; -import {IWorkspaceContextService, IWorkspace, IConfiguration} from 'vs/platform/workspace/common/workspace'; +import {IWorkspace, IConfiguration} from 'vs/platform/workspace/common/workspace'; import {IKeybindingService} from 'vs/platform/keybinding/common/keybindingService'; import {IContextMenuService} from 'vs/platform/contextview/browser/contextView'; import {IActivityService} from 'vs/workbench/services/activity/common/activityService'; diff --git a/src/vs/workbench/common/contributions.ts b/src/vs/workbench/common/contributions.ts index 7af7994bb4c..9ea3d2879a6 100644 --- a/src/vs/workbench/common/contributions.ts +++ b/src/vs/workbench/common/contributions.ts @@ -5,7 +5,7 @@ 'use strict'; import {Registry, BaseRegistry} from 'vs/platform/platform'; -import {IInstantiationService, IConstructorSignature0, INewConstructorSignature0, ServiceIdentifier} from 'vs/platform/instantiation/common/instantiation'; +import {IInstantiationService, IConstructorSignature0, INewConstructorSignature0} from 'vs/platform/instantiation/common/instantiation'; // --- Workbench Contribution Registry diff --git a/src/vs/workbench/common/memento.ts b/src/vs/workbench/common/memento.ts index b02ebb3dc07..b3efc53d0e2 100644 --- a/src/vs/workbench/common/memento.ts +++ b/src/vs/workbench/common/memento.ts @@ -4,7 +4,6 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import {TPromise} from 'vs/base/common/winjs.base'; import types = require('vs/base/common/types'); import {IStorageService, StorageScope} from 'vs/platform/storage/common/storage'; diff --git a/src/vs/workbench/common/options.ts b/src/vs/workbench/common/options.ts index 3611ee5aa1d..ae9fa829e19 100644 --- a/src/vs/workbench/common/options.ts +++ b/src/vs/workbench/common/options.ts @@ -29,7 +29,7 @@ export interface IOptions { /** * Instructs the workbench to install the extensions from the provided local paths. */ - extensionsToInstall?: string[] + extensionsToInstall?: string[]; /** * A boolean flag indicating if the workbench is in file mode where some UI gets hidden. Does not override an existing setting by the user. diff --git a/src/vs/workbench/common/textEditorWorker.ts b/src/vs/workbench/common/textEditorWorker.ts index d10d0cf465f..82a0c75a803 100644 --- a/src/vs/workbench/common/textEditorWorker.ts +++ b/src/vs/workbench/common/textEditorWorker.ts @@ -98,29 +98,29 @@ export class TextEditorWorker extends AbstractModeWorker { while ((match = pattern.exec(line)) !== null) { // Convert the relative path information to a resource that we can use in links - var workspaceRelativePath = strings.replaceAll(strings.rtrim(match[1], '.'), '\\', '/'); // remove trailing "." that likely indicate end of sentence - var resource:string; + let workspaceRelativePath = strings.replaceAll(strings.rtrim(match[1], '.'), '\\', '/'); // remove trailing "." that likely indicate end of sentence + let resource:string; try { - resource = contextService.toResource(workspaceRelativePath).toString() + resource = contextService.toResource(workspaceRelativePath).toString(); } catch (error) { continue; // we might find an invalid URI and then we dont want to loose all other links } // Append line/col information to URI if matching if (match[3]) { - var lineNumber = match[3]; + let lineNumber = match[3]; if (match[5]) { - var columnNumber = match[5]; + let columnNumber = match[5]; resource = strings.format('{0}#{1},{2}', resource, lineNumber, columnNumber); } else { resource = strings.format('{0}#{1}', resource, lineNumber); } } - var fullMatch = strings.rtrim(match[0], '.'); // remove trailing "." that likely indicate end of sentence + let fullMatch = strings.rtrim(match[0], '.'); // remove trailing "." that likely indicate end of sentence - var index = line.indexOf(fullMatch, offset); + let index = line.indexOf(fullMatch, offset); offset += index + fullMatch.length; var linkRange = { diff --git a/src/vs/workbench/electron-browser/actions.ts b/src/vs/workbench/electron-browser/actions.ts index 9f0f47410fc..1bdb6689390 100644 --- a/src/vs/workbench/electron-browser/actions.ts +++ b/src/vs/workbench/electron-browser/actions.ts @@ -9,17 +9,14 @@ import {Promise, TPromise} from 'vs/base/common/winjs.base'; import timer = require('vs/base/common/timer'); import paths = require('vs/base/common/paths'); import {Action} from 'vs/base/common/actions'; -import {SyncActionDescriptor} from 'vs/platform/actions/common/actions'; import {IWindowService} from 'vs/workbench/services/window/electron-browser/windowService'; import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService'; import nls = require('vs/nls'); import {IMessageService, Severity} from 'vs/platform/message/common/message'; -import {IThreadService} from 'vs/platform/thread/common/thread'; import {IWindowConfiguration} from 'vs/workbench/electron-browser/window'; import {IWorkspaceContextService} from 'vs/platform/workspace/common/workspace'; import {IQuickOpenService} from 'vs/workbench/services/quickopen/browser/quickOpenService'; import {INullService} from 'vs/platform/instantiation/common/instantiation'; -import {KeyMod, KeyCode} from 'vs/base/common/keyCodes'; import {IConfigurationService} from 'vs/platform/configuration/common/configuration'; import ipc = require('ipc'); @@ -398,7 +395,7 @@ export class OpenRecentAction extends Action { label: paths.basename(p), description: paths.dirname(p), path: p - } + }; }); return this.quickOpenService.pick(picks, { diff --git a/src/vs/workbench/electron-browser/crashReporter.ts b/src/vs/workbench/electron-browser/crashReporter.ts index 21ca289bb0b..73972165305 100644 --- a/src/vs/workbench/electron-browser/crashReporter.ts +++ b/src/vs/workbench/electron-browser/crashReporter.ts @@ -9,7 +9,6 @@ import {IConfigurationRegistry, Extensions} from 'vs/platform/configuration/comm import {IConfigurationService} from 'vs/platform/configuration/common/configuration'; import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry'; import {Registry} from 'vs/platform/platform'; -import platform = require('vs/base/common/platform'); import crashReporter = require('crash-reporter'); import ipc = require('ipc'); diff --git a/src/vs/workbench/electron-browser/main.ts b/src/vs/workbench/electron-browser/main.ts index 345f0733c39..0614f210707 100644 --- a/src/vs/workbench/electron-browser/main.ts +++ b/src/vs/workbench/electron-browser/main.ts @@ -21,7 +21,6 @@ import {IWorkspace, IConfiguration, IEnvironment} from 'vs/platform/workspace/co import path = require('path'); import fs = require('fs'); -import child_process = require('child_process'); import gracefulFs = require('graceful-fs'); gracefulFs.gracefulify(fs); @@ -32,12 +31,6 @@ export interface IPath { columnNumber?: number; } -export interface IMainConfiguration { - window: { - - } -} - export interface IMainEnvironment extends IEnvironment { workspacePath?: string; autoSaveDelay?: number; diff --git a/src/vs/workbench/electron-browser/shell.ts b/src/vs/workbench/electron-browser/shell.ts index 11a76364d7b..fcc1fd38e8d 100644 --- a/src/vs/workbench/electron-browser/shell.ts +++ b/src/vs/workbench/electron-browser/shell.ts @@ -17,10 +17,9 @@ import 'vs/css!vs/workbench/browser/media/hc-black-theme'; import {Promise, TPromise} from 'vs/base/common/winjs.base'; import {Dimension, Builder, $} from 'vs/base/browser/builder'; import objects = require('vs/base/common/objects'); -import env = require('vs/base/common/flags'); import dom = require('vs/base/browser/dom'); -import Event, { Emitter } from 'vs/base/common/event'; -import { IDisposable } from 'vs/base/common/lifecycle'; +import {Emitter} from 'vs/base/common/event'; +import {IDisposable} from 'vs/base/common/lifecycle'; import errors = require('vs/base/common/errors'); import {ContextViewService} from 'vs/platform/contextview/browser/contextViewService'; import {ContextMenuService} from 'vs/workbench/services/contextview/electron-browser/contextmenuService'; @@ -83,7 +82,7 @@ import {IEventService} from 'vs/platform/event/common/event'; import {IFileService} from 'vs/platform/files/common/files'; import {IKeybindingService} from 'vs/platform/keybinding/common/keybindingService'; import {ILifecycleService} from 'vs/platform/lifecycle/common/lifecycle'; -import {IMarkerService, IMarkerData} from 'vs/platform/markers/common/markers'; +import {IMarkerService} from 'vs/platform/markers/common/markers'; import {IMessageService, Severity} from 'vs/platform/message/common/message'; import {IRequestService} from 'vs/platform/request/common/request'; import {ISearchService} from 'vs/platform/search/common/search'; @@ -99,10 +98,9 @@ import { IServiceCtor, isServiceEvent } from 'vs/base/common/service'; import { connect, Client } from 'vs/base/node/service.net'; import { IExtensionsService } from 'vs/workbench/parts/extensions/common/extensions'; import { ExtensionsService } from 'vs/workbench/parts/extensions/node/extensionsService'; -import webFrame = require('web-frame'); /** - * This ugly beast is needed because at the point when we need shared services + * This ugly code is needed because at the point when we need shared services * in the instantiation service, the connection to the shared process is not yet * completed. This create a delayed service wrapper that waits on that connection * and then relays all requests to the shared services. @@ -418,7 +416,7 @@ export class WorkbenchShell { if (!themeId) { return; } - var applyTheme = () => { + let applyTheme = () => { if (this.currentTheme) { $(this.container).removeClass(this.currentTheme); } @@ -428,7 +426,7 @@ export class WorkbenchShell { if (layout) { this.layout(); } - } + }; if (!themes.getSyntaxThemeId(themeId)) { applyTheme(); @@ -443,8 +441,6 @@ export class WorkbenchShell { errors.onUnexpectedError(error); }); } - - } private registerListeners(): void { diff --git a/src/vs/workbench/electron-browser/update.ts b/src/vs/workbench/electron-browser/update.ts index ac333be7da4..4170ddb2287 100644 --- a/src/vs/workbench/electron-browser/update.ts +++ b/src/vs/workbench/electron-browser/update.ts @@ -72,9 +72,6 @@ export class Update { // manually check for update on linux if (isLinux && updateFeedUrl) { - const updateChannel = env.updateChannel; - const platform = `${process.platform}-${process.arch}`; - this.requestService.makeRequest({ url: updateFeedUrl }).done(res => { if (res.status !== 200) { return; // no update available diff --git a/src/vs/workbench/electron-browser/window.ts b/src/vs/workbench/electron-browser/window.ts index af785181ab6..f15db882a1e 100644 --- a/src/vs/workbench/electron-browser/window.ts +++ b/src/vs/workbench/electron-browser/window.ts @@ -14,8 +14,6 @@ import workbenchEditorCommon = require('vs/workbench/common/editor'); import {IViewletService} from 'vs/workbench/services/viewlet/common/viewletService'; import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService'; import dom = require('vs/base/browser/dom'); -import {AnchorAlignment, ContextView} from 'vs/base/browser/ui/contextview/contextview'; -import {IDisposable} from 'vs/base/common/lifecycle'; import {IStorageService} from 'vs/platform/storage/common/storage'; import {IEventService} from 'vs/platform/event/common/event'; import {IWorkspaceContextService} from 'vs/platform/workspace/common/workspace'; @@ -31,7 +29,7 @@ export interface IWindowConfiguration { openFilesInNewWindow: boolean; reopenFolders: string; zoomLevel: number; - } + }; } export class ElectronWindow { diff --git a/src/vs/workbench/electron-main/env.ts b/src/vs/workbench/electron-main/env.ts index bb8a7a3792c..67eea41b1a6 100644 --- a/src/vs/workbench/electron-main/env.ts +++ b/src/vs/workbench/electron-main/env.ts @@ -12,10 +12,8 @@ import os = require('os'); import app = require('app'); import arrays = require('vs/base/common/arrays'); -import objects = require('vs/base/common/objects'); import strings = require('vs/base/common/strings'); import platform = require('vs/base/common/platform'); -import paths = require('vs/base/common/paths'); import uri from 'vs/base/common/uri'; import types = require('vs/base/common/types'); @@ -30,7 +28,7 @@ export interface IProductConfiguration { application: { png: string; } - }, + }; win32AppUserModelId: string; dataFolderName: string; downloadUrl: string; @@ -49,19 +47,19 @@ export interface IProductConfiguration { aiConfig: { key: string; asimovKey: string; - }, + }; sendASmile: { submitUrl: string, reportIssueUrl: string, requestFeatureUrl: string - }, - documentationUrl: string, - releaseNotesUrl: string, - twitterUrl: string, - requestFeatureUrl: string, - reportIssueUrl: string, - licenseUrl: string, - privacyStatementUrl: string + }; + documentationUrl: string; + releaseNotesUrl: string; + twitterUrl: string; + requestFeatureUrl: string; + reportIssueUrl: string; + licenseUrl: string; + privacyStatementUrl: string; } export const isBuilt = !process.env.VSCODE_DEV; @@ -368,7 +366,7 @@ export function parseLineAndColumnAware(rawPath: string): IParsedPath { path: path, line: line !== null ? line : void 0, column: column !== null ? column : line !== null ? 1 : void 0 // if we have a line, make sure column is also set - } + }; } export function toLineAndColumnPath(parsedPath: IParsedPath): string { diff --git a/src/vs/workbench/electron-main/lifecycle.ts b/src/vs/workbench/electron-main/lifecycle.ts index b1963df8953..5f17781d9b4 100644 --- a/src/vs/workbench/electron-main/lifecycle.ts +++ b/src/vs/workbench/electron-main/lifecycle.ts @@ -8,7 +8,6 @@ import app = require('app'); import events = require('events'); import ipc = require('ipc'); -import browserwindow = require('browser-window'); import {TPromise, TValueCallback} from 'vs/base/common/winjs.base'; import {ReadyState, VSCodeWindow} from 'vs/workbench/electron-main/window'; diff --git a/src/vs/workbench/electron-main/main.ts b/src/vs/workbench/electron-main/main.ts index 9cbfe693e66..72c988faea2 100644 --- a/src/vs/workbench/electron-main/main.ts +++ b/src/vs/workbench/electron-main/main.ts @@ -69,7 +69,7 @@ function quit(message?: string); function quit(arg?: any) { let exitCode = 0; if (typeof arg === 'string') { - env.log(arg) + env.log(arg); } else { exitCode = 1; // signal error to the outside if (arg.stack) { @@ -82,7 +82,6 @@ function quit(arg?: any) { process.exit(exitCode); } - function main(ipcServer: Server, userEnv: env.IProcessEnvironment): void { env.log('### VSCode main.js ###'); env.log(env.appRoot, env.cliArgs); @@ -90,7 +89,7 @@ function main(ipcServer: Server, userEnv: env.IProcessEnvironment): void { // Setup Windows mutex let windowsMutex: Mutex = null; try { - var Mutex = ( require.__$__nodeRequire('windows-mutex')).Mutex; + const Mutex = (require.__$__nodeRequire('windows-mutex')).Mutex; windowsMutex = new Mutex('vscode'); } catch (e) { // noop @@ -129,7 +128,9 @@ function main(ipcServer: Server, userEnv: env.IProcessEnvironment): void { } sharedProcess.kill(); - windowsMutex && windowsMutex.release(); + if (windowsMutex) { + windowsMutex.release(); + } }); // Lifecycle diff --git a/src/vs/workbench/electron-main/menus.ts b/src/vs/workbench/electron-main/menus.ts index d54db380d0c..a06c5341c0a 100644 --- a/src/vs/workbench/electron-main/menus.ts +++ b/src/vs/workbench/electron-main/menus.ts @@ -11,9 +11,7 @@ import Menu = require('menu'); import MenuItem = require('menu-item'); import Dialog = require('dialog'); import shell = require('shell'); -import os = require('os'); import ipc = require('ipc'); -import browserWindow = require('browser-window'); import nls = require('vs/nls'); import platform = require('vs/base/common/platform'); @@ -24,7 +22,6 @@ import env = require('vs/workbench/electron-main/env'); import storage = require('vs/workbench/electron-main/storage'); import um = require('vs/workbench/electron-main/update-manager'); import {Keybinding} from 'vs/base/common/keyCodes'; -import {KeybindingsUtils} from 'vs/platform/keybinding/common/keybindingsUtils'; let UpdateManager = um.Instance; @@ -66,7 +63,7 @@ export class VSCodeMenu { // Keep flag when app quits app.on('will-quit', () => { - this.isQuitting = true + this.isQuitting = true; }); // Listen to "open" & "close" event from window manager @@ -697,7 +694,7 @@ export class VSCodeMenu { if (windowInFocus.win.isDevToolsFocused()) { devToolsFocusedFn(windowInFocus.win.devToolsWebContents); } else { - windows.manager.sendToFocused('vscode:runAction', actionId) + windows.manager.sendToFocused('vscode:runAction', actionId); } } }); diff --git a/src/vs/workbench/electron-main/sharedProcessMain.ts b/src/vs/workbench/electron-main/sharedProcessMain.ts index 72b586607ae..f4e2b06b540 100644 --- a/src/vs/workbench/electron-main/sharedProcessMain.ts +++ b/src/vs/workbench/electron-main/sharedProcessMain.ts @@ -7,7 +7,6 @@ import * as fs from 'fs'; import platform = require('vs/base/common/platform'); import { serve, Server, connect } from 'vs/base/node/service.net'; import { TPromise } from 'vs/base/common/winjs.base'; -import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { create as createInstantiationService } from 'vs/platform/instantiation/common/instantiationService'; import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors'; diff --git a/src/vs/workbench/electron-main/win32/auto-updater.win32.ts b/src/vs/workbench/electron-main/win32/auto-updater.win32.ts index 07e5146e4a4..db8d779c460 100644 --- a/src/vs/workbench/electron-main/win32/auto-updater.win32.ts +++ b/src/vs/workbench/electron-main/win32/auto-updater.win32.ts @@ -7,17 +7,14 @@ import events = require('events'); import {IAutoUpdater, IUpdate} from 'auto-updater'; -import app = require('app'); import path = require('path'); import os = require('os'); -import fs = require('fs'); import cp = require('child_process'); import pfs = require('vs/base/node/pfs'); -import {ClientRequest} from 'http'; import {mkdirp} from 'vs/base/node/extfs'; import {isString} from 'vs/base/common/types'; import {Promise, TPromise} from 'vs/base/common/winjs.base'; -import {IRequestOptions, download, json } from 'vs/base/node/request'; +import {download, json } from 'vs/base/node/request'; import { getProxyAgent } from 'vs/workbench/node/proxy'; import {manager as Settings} from 'vs/workbench/electron-main/settings'; import {manager as Lifecycle} from 'vs/workbench/electron-main/lifecycle'; diff --git a/src/vs/workbench/electron-main/windows.ts b/src/vs/workbench/electron-main/windows.ts index 5f903d5121c..8df70b601cd 100644 --- a/src/vs/workbench/electron-main/windows.ts +++ b/src/vs/workbench/electron-main/windows.ts @@ -24,7 +24,6 @@ import lifecycle = require('vs/workbench/electron-main/lifecycle'); import nls = require('vs/nls'); import paths = require('vs/base/common/paths'); import arrays = require('vs/base/common/arrays'); -import types = require('vs/base/common/types'); import objects = require('vs/base/common/objects'); import storage = require('vs/workbench/electron-main/storage'); import settings = require('vs/workbench/electron-main/settings'); @@ -123,7 +122,7 @@ export class WindowsManager { cliArgWithoutPath.pathArguments = []; this.windowsState.openedFolders = []; // make sure we do not restore too much - manager.open({ cli: cliArgWithoutPath }); + this.open({ cli: cliArgWithoutPath }); } }); @@ -144,7 +143,7 @@ export class WindowsManager { // Handle paths delayed in case more are coming! runningTimeout = setTimeout(() => { - manager.open({ cli: env.cliArgs, pathsToOpen: macOpenFiles, forceNewWindow: true /* dropping on the dock should force open in a new window */ }); + this.open({ cli: env.cliArgs, pathsToOpen: macOpenFiles, forceNewWindow: true /* dropping on the dock should force open in a new window */ }); macOpenFiles = []; runningTimeout = null; }, 100); @@ -162,7 +161,7 @@ export class WindowsManager { env.log('IPC#vscode-windowOpen: ', paths); if (paths && paths.length) { - manager.open({ cli: env.cliArgs, pathsToOpen: paths, forceNewWindow: forceNewWindow }); + this.open({ cli: env.cliArgs, pathsToOpen: paths, forceNewWindow: forceNewWindow }); } }); @@ -181,13 +180,13 @@ export class WindowsManager { ipc.on('vscode:openFilePicker', (event: Event) => { env.log('IPC#vscode-openFilePicker'); - manager.openFilePicker(); + this.openFilePicker(); }); ipc.on('vscode:openFolderPicker', (event: Event) => { env.log('IPC#vscode-openFolderPicker'); - manager.openFolderPicker(); + this.openFolderPicker(); }); ipc.on('vscode:closeFolder', (event: Event, windowId: number) => { @@ -195,20 +194,20 @@ export class WindowsManager { let win = this.getWindowById(windowId); if (win) { - manager.open({ cli: env.cliArgs, forceEmpty: true, windowToUse: win }); + this.open({ cli: env.cliArgs, forceEmpty: true, windowToUse: win }); } }); ipc.on('vscode:openNewWindow', (event: Event) => { env.log('IPC#vscode-openNewWindow'); - manager.openNewWindow(); + this.openNewWindow(); }); ipc.on('vscode:openFileFolderPicker', (event: Event) => { env.log('IPC#vscode-openFileFolderPicker'); - manager.openFolderPicker(); + this.openFolderPicker(); }); ipc.on('vscode:reloadWindow', (event: Event, windowId: number) => { @@ -318,7 +317,7 @@ export class WindowsManager { return { workspacePath: w.openedWorkspacePath, uiState: w.serializeWindowState() - } + }; }); }); diff --git a/src/vs/workbench/node/pluginHostMain.ts b/src/vs/workbench/node/pluginHostMain.ts index 7e29e1179ff..eb2329f9bc8 100644 --- a/src/vs/workbench/node/pluginHostMain.ts +++ b/src/vs/workbench/node/pluginHostMain.ts @@ -15,10 +15,8 @@ import pfs = require('vs/base/node/pfs'); import URI from 'vs/base/common/uri'; import {TPromise} from 'vs/base/common/winjs.base'; -import json = require('vs/base/common/json'); -import strings = require('vs/base/common/strings'); import paths = require('vs/base/common/paths'); -import {IPluginService, IPluginDescription, IMessage} from 'vs/platform/plugins/common/plugins'; +import {IPluginService, IPluginDescription} from 'vs/platform/plugins/common/plugins'; import {PluginsRegistry, PluginsMessageCollector, IPluginsMessageCollector} from 'vs/platform/plugins/common/pluginsRegistry'; import {ExtHostAPIImplementation} from 'vs/workbench/api/browser/extHost.api.impl'; import { create as createIPC, IPluginsIPC } from 'vs/platform/plugins/common/ipcRemoteCom'; @@ -32,11 +30,7 @@ import {ExtHostTelemetryService} from 'vs/workbench/api/common/extHostTelemetry' import {BaseRequestService} from 'vs/platform/request/common/baseRequestService'; import {BaseWorkspaceContextService} from 'vs/platform/workspace/common/baseWorkspaceContextService'; import {ModeServiceImpl} from 'vs/editor/common/services/modeServiceImpl'; -import {IThemeExtensionPoint} from 'vs/platform/theme/common/themeExtensionPoint'; -import {ILanguageExtensionPoint} from 'vs/editor/common/modes/languageExtensionPoint'; -import {ITMSyntaxExtensionPoint} from 'vs/editor/node/textMate/TMSyntax'; import {PluginScanner} from 'vs/workbench/node/extensionPoints'; -import Severity from 'vs/base/common/severity'; import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; import { Client } from 'vs/base/node/service.net'; import { IExtensionsService } from 'vs/workbench/parts/extensions/common/extensions'; @@ -99,7 +93,7 @@ export function createServices(remoteCom: IPluginsIPC, initData: IInitData, shar } interface ITestRunner { - run(testsRoot:string, clb: (error:Error, failures?: number) => void): void; + run(testsRoot: string, clb: (error: Error, failures?: number) => void): void; } export class PluginHostMain { @@ -133,13 +127,13 @@ export class PluginHostMain { activatedExtensions.forEach((extensionId) => { this.pluginService.deactivate(extensionId); }); - } catch(err) { + } catch (err) { // TODO: write to log once we have one } // Give extensions 1 second to wrap up any async dispose, then exit setTimeout(() => { - exit() + exit(); }, 1000); } @@ -252,8 +246,8 @@ export class PluginHostMain { } // Require the test runner via node require from the provided path - let testRunner:ITestRunner; - let requireError:Error; + let testRunner: ITestRunner; + let requireError: Error; try { testRunner = require.__$__nodeRequire(env.pluginTestsPath); } catch (error) { diff --git a/src/vs/workbench/node/pluginHostProcess.ts b/src/vs/workbench/node/pluginHostProcess.ts index ee57a5c42e5..a383255a8d8 100644 --- a/src/vs/workbench/node/pluginHostProcess.ts +++ b/src/vs/workbench/node/pluginHostProcess.ts @@ -18,7 +18,7 @@ interface IRendererConnection { // This calls exit directly in case the initialization is not finished and we need to exit // Otherwise, if initialization completed we go to pluginHostMain.terminate() -var onTerminate = function() { +let onTerminate = function() { exit(); }; @@ -70,7 +70,7 @@ function connectToRenderer(): TPromise { setInterval(function() { if (stats.length >= 250) { let total = stats.reduce((prev, current) => prev + current, 0); - console.warn(`MANY messages are being SEND FROM the extension host!`) + console.warn(`MANY messages are being SEND FROM the extension host!`); console.warn(`SEND during 1sec: message_count=${stats.length}, total_len=${total}`); } stats.length = 0; diff --git a/src/vs/workbench/node/userSettings.ts b/src/vs/workbench/node/userSettings.ts index 4c02c997c10..f2f154622af 100644 --- a/src/vs/workbench/node/userSettings.ts +++ b/src/vs/workbench/node/userSettings.ts @@ -18,7 +18,7 @@ import {IWorkspaceContextService} from 'vs/workbench/services/workspace/common/c export interface ISettings { settings: any; settingsParseErrors?: string[]; - keybindings: any + keybindings: any; } export class UserSettings {