diff --git a/src/vs/workbench/browser/actions/openSettings.ts b/src/vs/workbench/browser/actions/openSettings.ts index 666e7d86eff84fa4048a91a532e2e62cd35b2b0d..d2228af7f517a5950deac58242e8f896f1df0ef5 100644 --- a/src/vs/workbench/browser/actions/openSettings.ts +++ b/src/vs/workbench/browser/actions/openSettings.ts @@ -7,7 +7,6 @@ import {Promise, TPromise} from 'vs/base/common/winjs.base'; import nls = require('vs/nls'); import URI from 'vs/base/common/uri'; -import network = require('vs/base/common/network'); import labels = require('vs/base/common/labels'); import {Registry} from 'vs/platform/platform'; import {Action} from 'vs/base/common/actions'; diff --git a/src/vs/workbench/browser/actions/triggerEditorActions.ts b/src/vs/workbench/browser/actions/triggerEditorActions.ts index 8790d0fb33b79d220369cfaf438774b4a81dd16b..0f6ce7f000bd498c133fa8b0f7664fa887532dd0 100644 --- a/src/vs/workbench/browser/actions/triggerEditorActions.ts +++ b/src/vs/workbench/browser/actions/triggerEditorActions.ts @@ -414,8 +414,6 @@ function toEditorQuickOpenEntry(element: any): IEditorQuickOpenEntry { return null; } -let CLOSE_EDITOR_ACTION_ID = 'workbench.action.closeActiveEditor'; -let CLOSE_EDITOR_ACTION_LABEL = nls.localize('closeActiveEditor', "Close Editor"); export class CloseEditorAction extends Action { constructor(id: string, label: string, @IWorkbenchEditorService private editorService: IWorkbenchEditorService) { diff --git a/src/vs/workbench/browser/composite.ts b/src/vs/workbench/browser/composite.ts index 319925013219eb961e77ad0499d29dc73a4d77e3..e1514306d4386812c709163454d9f68c06ec1e1c 100644 --- a/src/vs/workbench/browser/composite.ts +++ b/src/vs/workbench/browser/composite.ts @@ -5,9 +5,9 @@ import {Promise, TPromise} from 'vs/base/common/winjs.base'; import {IEventEmitter} from 'vs/base/common/eventEmitter'; -import {Dimension, Builder, $} from 'vs/base/browser/builder'; -import {IAction, IActionRunner, Action, ActionRunner} from 'vs/base/common/actions'; -import {IActionItem, ActionsOrientation} from 'vs/base/browser/ui/actionbar/actionbar'; +import {Dimension, Builder} from 'vs/base/browser/builder'; +import {IAction, IActionRunner, ActionRunner} from 'vs/base/common/actions'; +import {IActionItem} from 'vs/base/browser/ui/actionbar/actionbar'; import {WorkbenchComponent} from 'vs/workbench/common/component'; import {CompositeEvent} from 'vs/workbench/common/events'; import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry'; diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts index 79f3e703a1f91c4d7dae8fda9129da1350de8d9b..b25cfaa5585dacfea313eb52cda6c57452232d71 100644 --- a/src/vs/workbench/browser/layout.ts +++ b/src/vs/workbench/browser/layout.ts @@ -44,7 +44,7 @@ export class LayoutOptions { interface ComputedStyles { activitybar: { minWidth: number; }; sidebar: { minWidth: number; }; - panel: { minHeight: number; } + panel: { minHeight: number; }; editor: { minWidth: number; }; statusbar: { height: number; }; } diff --git a/src/vs/workbench/browser/panel.ts b/src/vs/workbench/browser/panel.ts index 66761ad5f5a6d7e811aa0f0dd02ca63f26ec78be..79d35311e43d920aa2586ed431dd6de38e3c8a78 100644 --- a/src/vs/workbench/browser/panel.ts +++ b/src/vs/workbench/browser/panel.ts @@ -6,7 +6,6 @@ import {Registry} from 'vs/platform/platform'; import {IPanel} from 'vs/workbench/common/panel'; import {Composite, CompositeDescriptor, CompositeRegistry} from 'vs/workbench/browser/composite'; -import {IPartService} from 'vs/workbench/services/part/common/partService'; export abstract class Panel extends Composite implements IPanel { } diff --git a/src/vs/workbench/browser/parts/compositePart.ts b/src/vs/workbench/browser/parts/compositePart.ts index 1211ff45dfa6aa17ba91c5d8b89103fd1f1ffc1b..c763485ff294f18eeedeca011a77ae0b2c002e73 100644 --- a/src/vs/workbench/browser/parts/compositePart.ts +++ b/src/vs/workbench/browser/parts/compositePart.ts @@ -18,14 +18,13 @@ import errors = require('vs/base/common/errors'); import {CONTEXT as ToolBarContext, ToolBar} from 'vs/base/browser/ui/toolbar/toolbar'; import {IActionItem, ActionsOrientation} from 'vs/base/browser/ui/actionbar/actionbar'; import {ProgressBar} from 'vs/base/browser/ui/progressbar/progressbar'; -import {Scope, IActionBarRegistry, Extensions, prepareActions} from 'vs/workbench/browser/actionBarRegistry'; +import {IActionBarRegistry, Extensions, prepareActions} from 'vs/workbench/browser/actionBarRegistry'; import {Action, IAction} from 'vs/base/common/actions'; import {Part} from 'vs/workbench/browser/part'; -import {Composite, CompositeDescriptor, CompositeRegistry} from 'vs/workbench/browser/composite'; +import {Composite, CompositeRegistry} from 'vs/workbench/browser/composite'; import {IComposite} from 'vs/workbench/common/composite'; import {EventType as WorkbenchEventType, CompositeEvent} from 'vs/workbench/common/events'; import {EventType as CompositeEventType} from 'vs/workbench/browser/composite'; -import {SyncActionDescriptor} from 'vs/platform/actions/common/actions'; import {WorkbenchProgressService} from 'vs/workbench/services/progress/browser/progressService'; import {IPartService} from 'vs/workbench/services/part/common/partService'; import {IStorageService, StorageScope} from 'vs/platform/storage/common/storage'; @@ -359,7 +358,7 @@ export abstract class CompositePart extends Part { this.titleLabel.safeInnerHtml(compositeTitle); this.titleLabel.title(keybinding ? nls.localize('compositeTitleTooltip', "{0} ({1})", compositeTitle, keybinding) : compositeTitle); - this.toolBar.setAriaLabel(nls.localize('ariaCompositeToolbarLabel',"{0} actions", compositeTitle)); + this.toolBar.setAriaLabel(nls.localize('ariaCompositeToolbarLabel', "{0} actions", compositeTitle)); } private collectCompositeActions(composite: Composite): () => void { diff --git a/src/vs/workbench/browser/parts/editor/editor.contribution.ts b/src/vs/workbench/browser/parts/editor/editor.contribution.ts index ba34f4bc25825b6812e28fbcad8f963fb38ff99f..ce08007154bf0218f692c26d6fcb40bf8d554b95 100644 --- a/src/vs/workbench/browser/parts/editor/editor.contribution.ts +++ b/src/vs/workbench/browser/parts/editor/editor.contribution.ts @@ -17,7 +17,7 @@ import {UntitledEditorInput} from 'vs/workbench/common/editor/untitledEditorInpu import {ResourceEditorInput} from 'vs/workbench/common/editor/resourceEditorInput'; import {IInstantiationService, ServicesAccessor} from 'vs/platform/instantiation/common/instantiation'; import {KeybindingsRegistry} from 'vs/platform/keybinding/common/keybindingsRegistry'; -import {KbExpr, IKeybindings} from 'vs/platform/keybinding/common/keybindingService'; +import {KbExpr} from 'vs/platform/keybinding/common/keybindingService'; import {TextDiffEditor} from 'vs/workbench/browser/parts/editor/textDiffEditor'; import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService'; import {BinaryResourceDiffEditor} from 'vs/workbench/browser/parts/editor/binaryDiffEditor'; @@ -25,7 +25,7 @@ import {IFrameEditor} from 'vs/workbench/browser/parts/editor/iframeEditor'; import {IFrameEditorInput} from 'vs/workbench/common/editor/iframeEditorInput'; import {ChangeEncodingAction, ChangeEOLAction, ChangeModeAction, EditorStatus} from 'vs/workbench/browser/parts/editor/editorStatus'; import {IWorkbenchActionRegistry, Extensions as ActionExtensions} from 'vs/workbench/common/actionRegistry'; -import {Scope, IActionBarRegistry, Extensions as ActionBarExtensions, ActionBarContributor} from 'vs/workbench/browser/actionBarRegistry'; +import {Scope, IActionBarRegistry, Extensions as ActionBarExtensions} from 'vs/workbench/browser/actionBarRegistry'; import {SyncActionDescriptor} from 'vs/platform/actions/common/actions'; import {SyncDescriptor} from 'vs/platform/instantiation/common/descriptors'; import {KeyMod, KeyCode} from 'vs/base/common/keyCodes'; diff --git a/src/vs/workbench/browser/parts/editor/iframeEditor.ts b/src/vs/workbench/browser/parts/editor/iframeEditor.ts index 607601ae9d03272852199480cd555b0e780c0b7e..7cccf8c281ecb43b229c584d18847397d04c16b2 100644 --- a/src/vs/workbench/browser/parts/editor/iframeEditor.ts +++ b/src/vs/workbench/browser/parts/editor/iframeEditor.ts @@ -7,16 +7,15 @@ import 'vs/css!./media/iframeeditor'; import nls = require('vs/nls'); -import {Promise, TPromise} from 'vs/base/common/winjs.base'; +import {TPromise} from 'vs/base/common/winjs.base'; import URI from 'vs/base/common/uri'; import {Dimension, Builder, $} from 'vs/base/browser/builder'; -import DOM = require('vs/base/browser/dom'); import errors = require('vs/base/common/errors'); import {EditorOptions, EditorInput} from 'vs/workbench/common/editor'; -import {EditorInputAction, BaseEditor} from 'vs/workbench/browser/parts/editor/baseEditor'; +import {BaseEditor} from 'vs/workbench/browser/parts/editor/baseEditor'; import {IFrameEditorInput} from 'vs/workbench/common/editor/iframeEditorInput'; import {IFrameEditorModel} from 'vs/workbench/common/editor/iframeEditorModel'; -import {IStorageService, StorageScope} from 'vs/platform/storage/common/storage'; +import {IStorageService} from 'vs/platform/storage/common/storage'; import {Position} from 'vs/platform/editor/common/editor'; import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry'; import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService'; diff --git a/src/vs/workbench/browser/parts/editor/stringEditor.ts b/src/vs/workbench/browser/parts/editor/stringEditor.ts index 18cff4f99e9d5853ee6dacbd602013b5aba92e63..207f1b9420908d591711b43cdc9dfd23fd302aeb 100644 --- a/src/vs/workbench/browser/parts/editor/stringEditor.ts +++ b/src/vs/workbench/browser/parts/editor/stringEditor.ts @@ -9,8 +9,6 @@ import nls = require('vs/nls'); import types = require('vs/base/common/types'); import {ICodeEditor} from 'vs/editor/browser/editorBrowser'; import {IEditorOptions, IEditorViewState} from 'vs/editor/common/editorCommon'; -import {DefaultConfig} from 'vs/editor/common/config/defaultConfig'; -import {EditorConfiguration} from 'vs/editor/common/config/commonEditorConfig'; import {TextEditorOptions, EditorModel, EditorInput, EditorOptions} from 'vs/workbench/common/editor'; import {BaseTextEditorModel} from 'vs/workbench/common/editor/textEditorModel'; import {UntitledEditorInput} from 'vs/workbench/common/editor/untitledEditorInput'; diff --git a/src/vs/workbench/browser/parts/editor/textEditor.ts b/src/vs/workbench/browser/parts/editor/textEditor.ts index 7e99f4cc432036a9ee50fc421a7fa3902fcdfe89..2f61ccb783200d237ce92b9fc256ef8cda8e9c2b 100644 --- a/src/vs/workbench/browser/parts/editor/textEditor.ts +++ b/src/vs/workbench/browser/parts/editor/textEditor.ts @@ -15,7 +15,7 @@ import {Preferences} from 'vs/workbench/common/constants'; import {IEditorViewState} from 'vs/editor/common/editorCommon'; import {OptionsChangeEvent, EventType as WorkbenchEventType, EditorEvent, TextEditorSelectionEvent} from 'vs/workbench/common/events'; import {Scope} from 'vs/workbench/common/memento'; -import {EditorInput, IFileEditorInput, EditorOptions} from 'vs/workbench/common/editor'; +import {EditorInput, EditorOptions} from 'vs/workbench/common/editor'; import {BaseEditor} from 'vs/workbench/browser/parts/editor/baseEditor'; import {EditorConfiguration} from 'vs/editor/common/config/commonEditorConfig'; import {IEditorSelection, IEditor, EventType, IConfigurationChangedEvent, IModelContentChangedEvent, IModelModeChangedEvent, ICursorPositionChangedEvent, IEditorOptions} from 'vs/editor/common/editorCommon'; diff --git a/src/vs/workbench/browser/parts/panel/panelPart.ts b/src/vs/workbench/browser/parts/panel/panelPart.ts index c322fc0e19d30eb24deeea2ca910ac3fc712c72b..06ef8d0fe206d1050fbba07d1d144502466b37cc 100644 --- a/src/vs/workbench/browser/parts/panel/panelPart.ts +++ b/src/vs/workbench/browser/parts/panel/panelPart.ts @@ -7,7 +7,6 @@ import 'vs/css!./media/panelPart'; import nls = require('vs/nls'); import {TPromise, Promise} from 'vs/base/common/winjs.base'; import {KeyMod, KeyCode, CommonKeybindings} from 'vs/base/common/keyCodes'; -import strings = require('vs/base/common/strings'); import {Action, IAction} from 'vs/base/common/actions'; import {Builder} from 'vs/base/browser/builder'; import dom = require('vs/base/browser/dom'); @@ -16,17 +15,15 @@ import {Scope} from 'vs/workbench/browser/actionBarRegistry'; import {SyncActionDescriptor} from 'vs/platform/actions/common/actions'; import {IWorkbenchActionRegistry, Extensions as WorkbenchExtensions} from 'vs/workbench/common/actionRegistry'; import {IPanel} from 'vs/workbench/common/panel'; -import {EventType as WorkbenchEventType, CompositeEvent} from 'vs/workbench/common/events'; import {CompositePart} from 'vs/workbench/browser/parts/compositePart'; import {Panel, PanelRegistry, Extensions as PanelExtensions} from 'vs/workbench/browser/panel'; import {IPanelService} from 'vs/workbench/services/panel/common/panelService'; import {IPartService} from 'vs/workbench/services/part/common/partService'; -import {IStorageService, StorageScope} from 'vs/platform/storage/common/storage'; +import {IStorageService} from 'vs/platform/storage/common/storage'; import {IContextMenuService} from 'vs/platform/contextview/browser/contextView'; import {IEventService} from 'vs/platform/event/common/event'; -import {IMessageService, Severity} from 'vs/platform/message/common/message'; +import {IMessageService} from 'vs/platform/message/common/message'; import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry'; -import {IWorkspaceContextService} from 'vs/workbench/services/workspace/common/contextService'; import {IKeybindingService} from 'vs/platform/keybinding/common/keybindingService'; export class PanelPart extends CompositePart implements IPanelService { @@ -65,7 +62,7 @@ export class PanelPart extends CompositePart implements IPanelService { public create(parent: Builder): void { super.create(parent); - + dom.addStandardDisposableListener(this.getContainer().getHTMLElement(), 'keyup', (e: dom.IKeyboardEvent) => { if (e.equals(CommonKeybindings.ESCAPE)) { this.partService.setPanelHidden(true); @@ -93,7 +90,7 @@ export class PanelPart extends CompositePart implements IPanelService { } protected getActions(): IAction[] { - return [this.instantiationService.createInstance(ClosePanelAction, ClosePanelAction.ID, ClosePanelAction.LABEL)] + return [this.instantiationService.createInstance(ClosePanelAction, ClosePanelAction.ID, ClosePanelAction.LABEL)]; } public getActivePanel(): IPanel { diff --git a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts index 6bbd79eddbeaf42d4480df6c923062e418dacfaa..143c3f90982bdb578d5592e35db040c3df4dbcf9 100644 --- a/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts +++ b/src/vs/workbench/browser/parts/quickopen/quickOpenController.ts @@ -216,7 +216,7 @@ export class QuickOpenController extends WorkbenchComponent implements IQuickOpe resolve(new TPromise(init)); } return !message; - }) + }); }, err => { // ignore }); diff --git a/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts b/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts index 4db0d6ed9d2c77f2d40cc2466fa53e80e5c4099a..a51bae8311eb175459fbd103db8e0b47bc86a331 100644 --- a/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts +++ b/src/vs/workbench/browser/parts/sidebar/sidebarPart.ts @@ -7,10 +7,8 @@ import 'vs/css!./media/sidebarpart'; import {TPromise} from 'vs/base/common/winjs.base'; import nls = require('vs/nls'); import {Registry} from 'vs/platform/platform'; -import strings = require('vs/base/common/strings'); -import {Action, IAction} from 'vs/base/common/actions'; +import {Action} from 'vs/base/common/actions'; import {CompositePart} from 'vs/workbench/browser/parts/compositePart'; -import {EventType as WorkbenchEventType, CompositeEvent} from 'vs/workbench/common/events'; import {Viewlet, ViewletRegistry, Extensions as ViewletExtensions} from 'vs/workbench/browser/viewlet'; import {IWorkbenchActionRegistry, Extensions as ActionExtensions} from 'vs/workbench/common/actionRegistry'; import {SyncActionDescriptor} from 'vs/platform/actions/common/actions'; @@ -18,10 +16,10 @@ import {IViewletService} from 'vs/workbench/services/viewlet/common/viewletServi import {IPartService} from 'vs/workbench/services/part/common/partService'; import {IViewlet} from 'vs/workbench/common/viewlet'; import {Scope} from 'vs/workbench/browser/actionBarRegistry'; -import {IStorageService, StorageScope} from 'vs/platform/storage/common/storage'; +import {IStorageService} from 'vs/platform/storage/common/storage'; import {IContextMenuService} from 'vs/platform/contextview/browser/contextView'; import {IEventService} from 'vs/platform/event/common/event'; -import {IMessageService, Severity} from 'vs/platform/message/common/message'; +import {IMessageService} from 'vs/platform/message/common/message'; import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry'; import {IKeybindingService} from 'vs/platform/keybinding/common/keybindingService'; import {KeyMod, KeyCode} from 'vs/base/common/keyCodes'; @@ -33,7 +31,6 @@ export class SidebarPart extends CompositePart implements IViewletServi public serviceId = IViewletService; private blockOpeningViewlet: boolean; - private currentViewletOpenToken: string; constructor( messageService: IMessageService, diff --git a/src/vs/workbench/browser/viewlet.ts b/src/vs/workbench/browser/viewlet.ts index e903248fd7a85f38b664c74c0384aed6ac460250..1584e5dc4d3a2766fee8a8173a2a8da8b5d093df 100644 --- a/src/vs/workbench/browser/viewlet.ts +++ b/src/vs/workbench/browser/viewlet.ts @@ -9,7 +9,7 @@ import DOM = require('vs/base/browser/dom'); import errors = require('vs/base/common/errors'); import {Registry} from 'vs/platform/platform'; import {Dimension, Builder, $} from 'vs/base/browser/builder'; -import {IAction, IActionRunner, Action, ActionRunner} from 'vs/base/common/actions'; +import {IAction, IActionRunner, Action} from 'vs/base/common/actions'; import {IActionItem, ActionsOrientation} from 'vs/base/browser/ui/actionbar/actionbar'; import {ITree, IFocusEvent, ISelectionEvent} from 'vs/base/parts/tree/browser/tree'; import {prepareActions} from 'vs/workbench/browser/actionBarRegistry'; @@ -291,7 +291,7 @@ export class AdaptiveCollapsibleViewletView extends FixedCollapsibleView impleme protected actionRunner: IActionRunner; protected isDisposed: boolean; - private dragHandler: DelayedDragHandler + private dragHandler: DelayedDragHandler; constructor( actionRunner: IActionRunner, diff --git a/src/vs/workbench/browser/workbench.ts b/src/vs/workbench/browser/workbench.ts index e2ff5d50ed25c5b8e037cca916d20040e0cd99bc..c195b9a39c195455d09002ae6f39af97a143803b 100644 --- a/src/vs/workbench/browser/workbench.ts +++ b/src/vs/workbench/browser/workbench.ts @@ -50,7 +50,7 @@ import {IActivityService} from 'vs/workbench/services/activity/common/activitySe import {IViewletService} from 'vs/workbench/services/viewlet/common/viewletService'; import {IPanelService} from 'vs/workbench/services/panel/common/panelService'; import {WorkbenchMessageService} from 'vs/workbench/services/message/browser/messageService'; -import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService' +import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService'; import {IQuickOpenService} from 'vs/workbench/services/quickopen/common/quickOpenService'; import {IHistoryService} from 'vs/workbench/services/history/common/history'; import {IEventService} from 'vs/platform/event/common/event'; @@ -291,7 +291,7 @@ export class Workbench implements IPartService { (this.keybindingService).setMessageService(messageService); } let threadService = this.instantiationService.getInstance(IThreadService); - let pluginService = this.instantiationService.getInstance(IPluginService); + this.instantiationService.getInstance(IPluginService); this.lifecycleService = this.instantiationService.getInstance(ILifecycleService); this.toDispose.push(this.lifecycleService.onShutdown(this.shutdownComponents, this)); let contextMenuService = this.instantiationService.getInstance(IContextMenuService); diff --git a/src/vs/workbench/common/contributions.ts b/src/vs/workbench/common/contributions.ts index 9ea3d2879a6297332887028d6ff5621dab87b9d5..11d99e8a993993408d6aed1fa6ec6bff40db4db3 100644 --- a/src/vs/workbench/common/contributions.ts +++ b/src/vs/workbench/common/contributions.ts @@ -22,7 +22,7 @@ export interface IWorkbenchContribution { export namespace Extensions { export const Workbench = 'workbench.contributions.kind'; -}; +} export type IWorkbenchContributionSignature = IConstructorSignature0 | INewConstructorSignature0; diff --git a/src/vs/workbench/common/editor/iframeEditorInput.ts b/src/vs/workbench/common/editor/iframeEditorInput.ts index c3683bd115862ff080e5f8120b2eadb8214ca1d6..005571b2b710ec84984159f5c7138944a82ea6ac 100644 --- a/src/vs/workbench/common/editor/iframeEditorInput.ts +++ b/src/vs/workbench/common/editor/iframeEditorInput.ts @@ -6,7 +6,6 @@ import {TPromise} from 'vs/base/common/winjs.base'; import {EditorModel, EditorInput} from 'vs/workbench/common/editor'; -import {Registry} from 'vs/platform/platform'; import URI from 'vs/base/common/uri'; /** diff --git a/src/vs/workbench/common/editor/resourceEditorInput.ts b/src/vs/workbench/common/editor/resourceEditorInput.ts index 5402e8470672ffa91472a676999c300ad90a6e46..9c687ef85870b996802c840ca90f5d3ca3c60201 100644 --- a/src/vs/workbench/common/editor/resourceEditorInput.ts +++ b/src/vs/workbench/common/editor/resourceEditorInput.ts @@ -89,7 +89,7 @@ export class ResourceEditorInput extends EditorInput { lastError = err; }); } - } + }; })).then(() => { if (!result && lastError) { reject(lastError); diff --git a/src/vs/workbench/electron-main/sharedProcessMain.ts b/src/vs/workbench/electron-main/sharedProcessMain.ts index 73f9017314fcc8031a14dfbae10365409c5b883e..eb81a08f8138c1b751334bfb08166a7b2992f6ee 100644 --- a/src/vs/workbench/electron-main/sharedProcessMain.ts +++ b/src/vs/workbench/electron-main/sharedProcessMain.ts @@ -30,7 +30,10 @@ interface IInitData { } function quit(err?: Error) { - if (err) console.error(err); + if (err) { + console.error(err); + } + process.exit(err ? 1 : 0); } diff --git a/src/vs/workbench/electron-main/window.ts b/src/vs/workbench/electron-main/window.ts index 50af169b7e2653f7ae5e25af14f307600c58edbb..6171a1a764a1c015ba7f74f14c7646f3abde189d 100644 --- a/src/vs/workbench/electron-main/window.ts +++ b/src/vs/workbench/electron-main/window.ts @@ -115,19 +115,17 @@ export interface IWindowConfiguration extends env.ICommandLineArguments { releaseNotesUrl: string; productDownloadUrl: string; enableTelemetry: boolean; - userEnv: env.IProcessEnvironment, + userEnv: env.IProcessEnvironment; aiConfig: { key: string; asimovKey: string; - }, + }; sendASmile: { reportIssueUrl: string, requestFeatureUrl: string - } + }; } -const enableDebugLogging = false; - export class VSCodeWindow { public static menuBarHiddenKey = 'menuBarHidden'; diff --git a/src/vs/workbench/parts/contentprovider/common/contentprovider.contribution.ts b/src/vs/workbench/parts/contentprovider/common/contentprovider.contribution.ts index adc053b08a2916aa9a094e930721f33536b9beee..fd265207035bcd3d890cfaae7b8f1e60e4b43802 100644 --- a/src/vs/workbench/parts/contentprovider/common/contentprovider.contribution.ts +++ b/src/vs/workbench/parts/contentprovider/common/contentprovider.contribution.ts @@ -37,7 +37,7 @@ export class WorkbenchContentProvider implements IWorkbenchContribution { } private start(): void { - ResourceEditorInput.registerResourceContentProvider("vscode", { + ResourceEditorInput.registerResourceContentProvider('vscode', { provideTextContent: (uri: URI): TPromise => { if (uri.scheme !== 'vscode') { return null; diff --git a/src/vs/workbench/parts/execution/electron-browser/terminalService.ts b/src/vs/workbench/parts/execution/electron-browser/terminalService.ts index 1b381b5d9977b937f6f105a92c931c007f8cb725..1fc0893fcd1b2b966e77214d787e2a1d55bbd58b 100644 --- a/src/vs/workbench/parts/execution/electron-browser/terminalService.ts +++ b/src/vs/workbench/parts/execution/electron-browser/terminalService.ts @@ -6,9 +6,8 @@ import errors = require('vs/base/common/errors'); import uri from 'vs/base/common/uri'; -import severity from 'vs/base/common/severity'; import {TPromise} from 'vs/base/common/winjs.base'; -import {ITerminalService, IExecutionService} from 'vs/workbench/parts/execution/common/execution'; +import {ITerminalService} from 'vs/workbench/parts/execution/common/execution'; import {IConfigurationService} from 'vs/platform/configuration/common/configuration'; import {IMessageService} from 'vs/platform/message/common/message'; diff --git a/src/vs/workbench/parts/feedback/browser/feedback.ts b/src/vs/workbench/parts/feedback/browser/feedback.ts index d9895e4ba73eb8864aee7641f30cdd3e893f8bb8..aa233ec7adc923a1b61411e3c8953e44cd9ba587 100644 --- a/src/vs/workbench/parts/feedback/browser/feedback.ts +++ b/src/vs/workbench/parts/feedback/browser/feedback.ts @@ -9,16 +9,11 @@ import 'vs/css!./media/feedback'; import nls = require('vs/nls'); import {IDisposable} from 'vs/base/common/lifecycle'; import {Builder, $} from 'vs/base/browser/builder'; -import errors = require('vs/base/common/errors'); -import {Promise} from 'vs/base/common/winjs.base'; import {Dropdown} from 'vs/base/browser/ui/dropdown/dropdown'; -import {IXHRResponse} from 'vs/base/common/http'; import {IContextViewService} from 'vs/platform/contextview/browser/contextView'; import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry'; import {IWorkspaceContextService} from 'vs/workbench/services/workspace/common/contextService'; -const STATUS_TIMEOUT = 500; - export interface IFeedback { feedback: string; sentiment: number; @@ -37,7 +32,7 @@ enum FormEvent { SENDING, SENT, SEND_ERROR -}; +} export class FeedbackDropdown extends Dropdown { protected static MAX_FEEDBACK_CHARS: number = 140; @@ -283,7 +278,9 @@ export class FeedbackDropdown extends Dropdown { } protected resetForm(): void { - if (this.feedbackDescriptionInput) this.feedbackDescriptionInput.value = ''; + if (this.feedbackDescriptionInput) { + this.feedbackDescriptionInput.value = ''; + } this.sentiment = 1; this.aliasEnabled = false; } diff --git a/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.ts b/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.ts index 7669da00f6212b9eca2c5f0c85665dfebe858223..28cea6fc5f3391d96047013d21d75997743580ab 100644 --- a/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.ts +++ b/src/vs/workbench/parts/feedback/electron-browser/feedbackStatusbarItem.ts @@ -10,13 +10,10 @@ import {IStatusbarItem} from 'vs/workbench/browser/parts/statusbar/statusbar'; import {FeedbackDropdown, IFeedback, IFeedbackService} from 'vs/workbench/parts/feedback/browser/feedback'; import {IContextViewService} from 'vs/platform/contextview/browser/contextView'; import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation'; -import {IRequestService} from 'vs/platform/request/common/request'; import {shell} from 'electron'; class TwitterFeedbackService implements IFeedbackService { - private serviceUrl: string; - private static TWITTER_URL: string = 'https://twitter.com/intent/tweet'; public submitFeedback(feedback: IFeedback): void { diff --git a/src/vs/workbench/parts/files/browser/fileActions.ts b/src/vs/workbench/parts/files/browser/fileActions.ts index 3f5a2d6e5f8aca758b1ee32384592eb4cfb82f7b..395d0ef12e0e583e3c86d95a23902fe19a5ec76f 100644 --- a/src/vs/workbench/parts/files/browser/fileActions.ts +++ b/src/vs/workbench/parts/files/browser/fileActions.ts @@ -25,7 +25,6 @@ import {disposeAll, IDisposable} from 'vs/base/common/lifecycle'; import {EventType as WorkbenchEventType, EditorEvent} from 'vs/workbench/common/events'; import Files = require('vs/workbench/parts/files/common/files'); import {IFileService, IFileStat, IImportResult} from 'vs/platform/files/common/files'; -import {EditorInputAction} from 'vs/workbench/browser/parts/editor/baseEditor'; import {DiffEditorInput} from 'vs/workbench/common/editor/diffEditorInput'; import workbenchEditorCommon = require('vs/workbench/common/editor'); import {IEditorSelection} from 'vs/editor/common/editorCommon'; @@ -1898,7 +1897,7 @@ export abstract class BaseCloseWorkingFileAction extends Action { input.dispose(); } } -}; +} export class CloseAllWorkingFilesAction extends BaseCloseWorkingFileAction { diff --git a/src/vs/workbench/parts/files/browser/saveErrorHandler.ts b/src/vs/workbench/parts/files/browser/saveErrorHandler.ts index ba5b4849fe4d080f349289c09b7715b6f25dce22..ffd0f39eb7d72417ca8d20160a8fc00414b12eb1 100644 --- a/src/vs/workbench/parts/files/browser/saveErrorHandler.ts +++ b/src/vs/workbench/parts/files/browser/saveErrorHandler.ts @@ -13,7 +13,6 @@ import URI from 'vs/base/common/uri'; import {EditorModel} from 'vs/workbench/common/editor'; import {guessMimeTypes} from 'vs/base/common/mime'; import {EditorInputAction} from 'vs/workbench/browser/parts/editor/baseEditor'; -import {IModel} from 'vs/editor/common/editorCommon'; import {ResourceEditorInput} from 'vs/workbench/common/editor/resourceEditorInput'; import {DiffEditorInput} from 'vs/workbench/common/editor/diffEditorInput'; import {DiffEditorModel} from 'vs/workbench/common/editor/diffEditorModel'; diff --git a/src/vs/workbench/parts/files/browser/textFileServices.ts b/src/vs/workbench/parts/files/browser/textFileServices.ts index 7f9ae80f50cd2b2c9b278ea6ec4eadf282a87b54..d20d8ae79eae376e240bbd369dccdb45addd27b3 100644 --- a/src/vs/workbench/parts/files/browser/textFileServices.ts +++ b/src/vs/workbench/parts/files/browser/textFileServices.ts @@ -264,7 +264,7 @@ export abstract class TextFileService implements ITextFileService { return { autoSaveDelay: this.configuredAutoSaveDelay && this.configuredAutoSaveDelay > 0 ? this.configuredAutoSaveDelay : void 0, autoSaveFocusChange: this.configuredAutoSaveOnFocusChange - } + }; } public dispose(): void { diff --git a/src/vs/workbench/parts/files/browser/views/explorerViewer.ts b/src/vs/workbench/parts/files/browser/views/explorerViewer.ts index 05ef2d91560a2485f59ad5bc12e88a572b68271f..cb0c3556579f8375ab62284fd1faf6babf94b3ab 100644 --- a/src/vs/workbench/parts/files/browser/views/explorerViewer.ts +++ b/src/vs/workbench/parts/files/browser/views/explorerViewer.ts @@ -27,7 +27,7 @@ import {IFileOperationResult, FileOperationResult, IFileStat, IFileService} from import {FileEditorInput} from 'vs/workbench/parts/files/browser/editors/fileEditorInput'; import {DuplicateFileAction, ImportFileAction, PasteFileAction, keybindingForAction, IEditableData, IFileViewletState} from 'vs/workbench/parts/files/browser/fileActions'; import {EditorOptions} from 'vs/workbench/common/editor'; -import {IDataSource, ITree, IElementCallback, IAccessibilityProvider, IRenderer, ContextMenuEvent, ISorter, IFilter, IDragAndDrop, IDragAndDropData, IDragOverReaction, DRAG_OVER_ACCEPT, DRAG_OVER_ACCEPT_BUBBLE_DOWN, DRAG_OVER_ACCEPT_BUBBLE_DOWN_COPY, DRAG_OVER_ACCEPT_BUBBLE_UP, DRAG_OVER_ACCEPT_BUBBLE_UP_COPY, DRAG_OVER_REJECT} from 'vs/base/parts/tree/browser/tree'; +import {IDataSource, ITree, IElementCallback, IAccessibilityProvider, IRenderer, ContextMenuEvent, ISorter, IFilter, IDragAndDrop, IDragAndDropData, IDragOverReaction, DRAG_OVER_ACCEPT_BUBBLE_DOWN, DRAG_OVER_ACCEPT_BUBBLE_DOWN_COPY, DRAG_OVER_ACCEPT_BUBBLE_UP, DRAG_OVER_ACCEPT_BUBBLE_UP_COPY, DRAG_OVER_REJECT} from 'vs/base/parts/tree/browser/tree'; import labels = require('vs/base/common/labels'); import {DesktopDragAndDropData, ExternalElementsDragAndDropData} from 'vs/base/parts/tree/browser/treeDnd'; import {ClickBehavior, DefaultController} from 'vs/base/parts/tree/browser/treeDefaults'; diff --git a/src/vs/workbench/parts/files/common/editors/textFileEditorModel.ts b/src/vs/workbench/parts/files/common/editors/textFileEditorModel.ts index 7b626c73114bb4368d143f1fa9261da38fe7524d..74c2e8731c5690709b2ad3ce95376dcc1fe7f1c7 100644 --- a/src/vs/workbench/parts/files/common/editors/textFileEditorModel.ts +++ b/src/vs/workbench/parts/files/common/editors/textFileEditorModel.ts @@ -72,7 +72,6 @@ export class TextFileEditorModel extends BaseTextEditorModel implements IEncodin public static ID = 'workbench.editors.files.textFileEditorModel'; - private static DEFAULT_AUTO_SAVE_DELAY = 1000; private static saveErrorHandler: ISaveErrorHandler; private resource: URI; @@ -749,7 +748,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements IEncodin isDirectory: stat.isDirectory, hasChildren: stat.hasChildren, children: stat.children - } + }; } } diff --git a/src/vs/workbench/parts/files/electron-browser/textFileServices.ts b/src/vs/workbench/parts/files/electron-browser/textFileServices.ts index 2ced7a94fa3bd4a1db79e9cc2212025ef7e616ad..b1b80340785ae1feb97c561c698f3814d740d34f 100644 --- a/src/vs/workbench/parts/files/electron-browser/textFileServices.ts +++ b/src/vs/workbench/parts/files/electron-browser/textFileServices.ts @@ -13,21 +13,18 @@ import paths = require('vs/base/common/paths'); import strings = require('vs/base/common/strings'); import {isWindows} from 'vs/base/common/platform'; import URI from 'vs/base/common/uri'; -import {Action} from 'vs/base/common/actions'; import {UntitledEditorModel} from 'vs/workbench/common/editor/untitledEditorModel'; import {IEventService} from 'vs/platform/event/common/event'; import {TextFileService as AbstractTextFileService} from 'vs/workbench/parts/files/browser/textFileServices'; import {CACHE, TextFileEditorModel} from 'vs/workbench/parts/files/common/editors/textFileEditorModel'; import {ITextFileOperationResult, ConfirmResult, AutoSaveMode} from 'vs/workbench/parts/files/common/files'; -import {IWorkbenchActionRegistry, Extensions as ActionExtensions} from 'vs/workbench/common/actionRegistry'; -import {SyncActionDescriptor} from 'vs/platform/actions/common/actions'; import {IUntitledEditorService} from 'vs/workbench/services/untitled/common/untitledEditorService'; import {IFileService} from 'vs/platform/files/common/files'; -import {IInstantiationService, INullService} from 'vs/platform/instantiation/common/instantiation'; +import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation'; import {IWorkspaceContextService} from 'vs/workbench/services/workspace/common/contextService'; import {ILifecycleService} from 'vs/platform/lifecycle/common/lifecycle'; import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry'; -import {IConfigurationService, IConfigurationServiceEvent, ConfigurationServiceEventTypes} from 'vs/platform/configuration/common/configuration'; +import {IConfigurationService} from 'vs/platform/configuration/common/configuration'; import {remote} from 'electron'; @@ -384,7 +381,7 @@ export class TextFileService extends AbstractTextFileService { return options; } - interface IFilter { name: string, extensions: string[] }; + interface IFilter { name: string; extensions: string[]; } // Build the file filter by using our known languages let ext: string = paths.extname(defaultPath); diff --git a/src/vs/workbench/parts/gettingStarted/common/abstractGettingStarted.ts b/src/vs/workbench/parts/gettingStarted/common/abstractGettingStarted.ts index f390376ac3d8d78c04edb8f1e1f3b4a1f48d076b..d6b404d3ce1b9dd9516e4cbdea38050a9133bf8e 100644 --- a/src/vs/workbench/parts/gettingStarted/common/abstractGettingStarted.ts +++ b/src/vs/workbench/parts/gettingStarted/common/abstractGettingStarted.ts @@ -6,7 +6,7 @@ import {IWorkbenchContribution} from 'vs/workbench/common/contributions'; import {IWorkspaceContextService} from 'vs/workbench/services/workspace/common/contextService'; -import {IStorageService, StorageScope, StorageEvent, StorageEventType} from 'vs/platform/storage/common/storage'; +import {IStorageService} from 'vs/platform/storage/common/storage'; import {ITelemetryService, ITelemetryInfo} from 'vs/platform/telemetry/common/telemetry'; /** diff --git a/src/vs/workbench/parts/markdown/browser/markdownActions.ts b/src/vs/workbench/parts/markdown/browser/markdownActions.ts index 5ec792bf97881de598cd047015c84f42e24b545e..b8a69c1a49a2f03c8bc1a4fc98e74aa33d0dbc57 100644 --- a/src/vs/workbench/parts/markdown/browser/markdownActions.ts +++ b/src/vs/workbench/parts/markdown/browser/markdownActions.ts @@ -10,17 +10,14 @@ import {Promise} from 'vs/base/common/winjs.base'; import {Action} from 'vs/base/common/actions'; import URI from 'vs/base/common/uri'; import errors = require('vs/base/common/errors'); -import paths = require('vs/base/common/paths'); import nls = require('vs/nls'); import {FileEditorInput} from 'vs/workbench/parts/files/common/files'; import {EditorInputAction} from 'vs/workbench/browser/parts/editor/baseEditor'; -import {EditorOptions, getUntitledOrFileResource} from 'vs/workbench/common/editor'; +import {getUntitledOrFileResource} from 'vs/workbench/common/editor'; import {MarkdownEditorInput} from 'vs/workbench/parts/markdown/common/markdownEditorInput'; import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService'; -import {IPartService} from 'vs/workbench/services/part/common/partService'; import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation'; import {IMessageService, Severity} from 'vs/platform/message/common/message'; -import {IWorkspaceContextService} from 'vs/workbench/services/workspace/common/contextService'; export class GlobalTogglePreviewMarkdownAction extends Action { diff --git a/src/vs/workbench/parts/output/browser/outputPanel.ts b/src/vs/workbench/parts/output/browser/outputPanel.ts index 28605929c603da3a7a0da8d4a33b1ff0ac1187fb..eb726a3f3711de51570f0c3743a77e441bdc3de6 100644 --- a/src/vs/workbench/parts/output/browser/outputPanel.ts +++ b/src/vs/workbench/parts/output/browser/outputPanel.ts @@ -81,10 +81,7 @@ export class OutputPanel extends StringEditor { options.glyphMargin = false; options.lineDecorationsWidth = 20; - let input = this.getInput(); - let ariaLabel: string; let channel = this.outputService.getActiveChannel(); - options.ariaLabel = channel ? nls.localize('outputPanelWithInputAriaLabel', "{0}, Output panel", channel) : nls.localize('outputPanelAriaLabel', "Output panel"); return options; diff --git a/src/vs/workbench/parts/output/common/output.ts b/src/vs/workbench/parts/output/common/output.ts index 4ddcc63b7b89fc5a974fd97054dce2f885229bf3..ec632b0798af166987d7f2ec1e12d49089a71922 100644 --- a/src/vs/workbench/parts/output/common/output.ts +++ b/src/vs/workbench/parts/output/common/output.ts @@ -8,7 +8,7 @@ import {TPromise} from 'vs/base/common/winjs.base'; import Event from 'vs/base/common/event'; import {Registry} from 'vs/platform/platform'; import {createDecorator, ServiceIdentifier} from 'vs/platform/instantiation/common/instantiation'; -import {IEditor, Position} from 'vs/platform/editor/common/editor'; +import {IEditor} from 'vs/platform/editor/common/editor'; /** * Mime type used by the output editor. diff --git a/src/vs/workbench/parts/output/common/outputEditorInput.ts b/src/vs/workbench/parts/output/common/outputEditorInput.ts index e56a986c1e0753296a1d885e271a17d79c5c327e..f7849acd2b4a0697fe1f99ecc2518422efb4ba95 100644 --- a/src/vs/workbench/parts/output/common/outputEditorInput.ts +++ b/src/vs/workbench/parts/output/common/outputEditorInput.ts @@ -97,7 +97,7 @@ export class OutputEditorInput extends StringEditorInput { let otherOutputEditorInput = otherInput; if (otherOutputEditorInput.getChannel() === this.channel) { return super.matches(otherInput); - }; + } } return false; diff --git a/src/vs/workbench/parts/output/common/outputServices.ts b/src/vs/workbench/parts/output/common/outputServices.ts index 4cd49a55b880bff6db2a5d652310aca68b68cb79..4961fdd9b2c7bca49e1a2776c875686dc447614b 100644 --- a/src/vs/workbench/parts/output/common/outputServices.ts +++ b/src/vs/workbench/parts/output/common/outputServices.ts @@ -3,10 +3,10 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import {Promise, TPromise} from 'vs/base/common/winjs.base'; +import {TPromise} from 'vs/base/common/winjs.base'; import strings = require('vs/base/common/strings'); import Event, {Emitter} from 'vs/base/common/event'; -import {IEditor, Position} from 'vs/platform/editor/common/editor'; +import {IEditor} from 'vs/platform/editor/common/editor'; import {IEventService} from 'vs/platform/event/common/event'; import {ILifecycleService} from 'vs/platform/lifecycle/common/lifecycle'; import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation'; diff --git a/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts b/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts index 11fa0204984d94e133d3dfd910185654c2fb046e..2d51d732b7bab732ae8284d378ea83ddfb151b5b 100644 --- a/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts +++ b/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts @@ -14,11 +14,11 @@ import strings = require('vs/base/common/strings'); import {IAction, Action} from 'vs/base/common/actions'; import {toErrorMessage} from 'vs/base/common/errors'; import {Mode, IContext, IAutoFocus} from 'vs/base/parts/quickopen/common/quickOpen'; -import {QuickOpenEntryGroup, IHighlight, QuickOpenModel, QuickOpenEntry} from 'vs/base/parts/quickopen/browser/quickOpenModel'; +import {QuickOpenEntryGroup, IHighlight, QuickOpenModel} from 'vs/base/parts/quickopen/browser/quickOpenModel'; import {SyncActionDescriptor, IActionsService} from 'vs/platform/actions/common/actions'; import {IWorkbenchActionRegistry, Extensions as ActionExtensions} from 'vs/workbench/common/actionRegistry'; import {Registry} from 'vs/platform/platform'; -import {Extensions as QuickOpenExtensions, QuickOpenHandler} from 'vs/workbench/browser/quickopen'; +import {QuickOpenHandler} from 'vs/workbench/browser/quickopen'; import {QuickOpenAction} from 'vs/workbench/browser/actions/quickOpenAction'; import filters = require('vs/base/common/filters'); import {ICommonCodeEditor, IEditorActionDescriptorData} from 'vs/editor/common/editorCommon'; diff --git a/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.ts b/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.ts index e4ccbd407787e579f918b0936c190f90e32eaf2c..e6d580c718c6d812902825459fdf464447026f8f 100644 --- a/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.ts +++ b/src/vs/workbench/parts/quickopen/browser/gotoLineHandler.ts @@ -10,8 +10,7 @@ import types = require('vs/base/common/types'); import errors = require('vs/base/common/errors'); import {IContext, Mode, IAutoFocus} from 'vs/base/parts/quickopen/common/quickOpen'; import {QuickOpenModel} from 'vs/base/parts/quickopen/browser/quickOpenModel'; -import {Extensions as ActionExtensions} from 'vs/workbench/common/actionRegistry'; -import {Extensions as QuickOpenExtensions, QuickOpenHandler, EditorQuickOpenEntry} from 'vs/workbench/browser/quickopen'; +import {QuickOpenHandler, EditorQuickOpenEntry} from 'vs/workbench/browser/quickopen'; import {QuickOpenAction} from 'vs/workbench/browser/actions/quickOpenAction'; import {TextEditorOptions, EditorOptions, EditorInput} from 'vs/workbench/common/editor'; import {BaseTextEditor} from 'vs/workbench/browser/parts/editor/textEditor'; diff --git a/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts b/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts index 54fe09ee9199c65208e7ba1d6506e81263176137..1bbd8f7197739f3837c82ef69762c1e839cac432 100644 --- a/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts +++ b/src/vs/workbench/parts/quickopen/browser/gotoSymbolHandler.ts @@ -14,8 +14,7 @@ import types = require('vs/base/common/types'); import strings = require('vs/base/common/strings'); import {IContext, Mode, IAutoFocus} from 'vs/base/parts/quickopen/common/quickOpen'; import {QuickOpenModel, IHighlight} from 'vs/base/parts/quickopen/browser/quickOpenModel'; -import {Extensions as ActionExtensions} from 'vs/workbench/common/actionRegistry'; -import {Extensions as QuickOpenExtensions, QuickOpenHandler, EditorQuickOpenEntryGroup} from 'vs/workbench/browser/quickopen'; +import {QuickOpenHandler, EditorQuickOpenEntryGroup} from 'vs/workbench/browser/quickopen'; import {QuickOpenAction} from 'vs/workbench/browser/actions/quickOpenAction'; import {BaseTextEditor} from 'vs/workbench/browser/parts/editor/textEditor'; import {TextEditorOptions, EditorOptions, EditorInput} from 'vs/workbench/common/editor'; diff --git a/src/vs/workbench/parts/quickopen/browser/markersHandler.ts b/src/vs/workbench/parts/quickopen/browser/markersHandler.ts index 20affc5b679c1848b3ae34ed9d43e039b7939fe1..cb5d97fbb91fa9b33c1e8939c75b1396d88a0f3b 100644 --- a/src/vs/workbench/parts/quickopen/browser/markersHandler.ts +++ b/src/vs/workbench/parts/quickopen/browser/markersHandler.ts @@ -87,13 +87,13 @@ class MarkerEntry extends QuickOpenEntryItem { dom.addClass(icon, `severity ${Severity.toString(this._marker.severity).toLowerCase()}`); row1.appendChild(icon); const labelContainer = document.createElement('div'); - dom.addClass(labelContainer, 'inline') + dom.addClass(labelContainer, 'inline'); new HighlightedLabel(labelContainer).set(this._label, labelHighlights); row1.appendChild(labelContainer); // fill second row with descriptions const descContainer = document.createElement('div'); - dom.addClass(descContainer, 'inline description') + dom.addClass(descContainer, 'inline description'); new HighlightedLabel(descContainer).set(this._description, descHighlights); row2.appendChild(descContainer); diff --git a/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.ts b/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.ts index 9173f373b1295f834eb2a4d4bbb26b189015ab8f..78539258d1c44b6d96ac9a44221b7f1e96222074 100644 --- a/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.ts +++ b/src/vs/workbench/parts/quickopen/browser/quickopen.contribution.ts @@ -12,7 +12,6 @@ import {Registry} from 'vs/platform/platform'; import {SyncActionDescriptor} from 'vs/platform/actions/common/actions'; import {IWorkbenchActionRegistry, Extensions as ActionExtensions} from 'vs/workbench/common/actionRegistry'; import {KeyMod, KeyCode} from 'vs/base/common/keyCodes'; -import {Extensions as ConfigurationExtensions} from 'vs/platform/configuration/common/configurationRegistry'; import {GotoSymbolAction, GOTO_SYMBOL_PREFIX, SCOPE_PREFIX} from 'vs/workbench/parts/quickopen/browser/gotoSymbolHandler'; import {ShowAllCommandsAction, ALL_COMMANDS_PREFIX} from 'vs/workbench/parts/quickopen/browser/commandsHandler'; import {GotoLineAction, GOTO_LINE_PREFIX} from 'vs/workbench/parts/quickopen/browser/gotoLineHandler'; diff --git a/src/vs/workbench/parts/search/browser/openAnythingHandler.ts b/src/vs/workbench/parts/search/browser/openAnythingHandler.ts index f279746c298df3b52e3714a7c0f63ab512995e6f..4b43d0b8efb07981ad7dffb630ee1da04639a5f7 100644 --- a/src/vs/workbench/parts/search/browser/openAnythingHandler.ts +++ b/src/vs/workbench/parts/search/browser/openAnythingHandler.ts @@ -12,12 +12,9 @@ import types = require('vs/base/common/types'); import {isWindows} from 'vs/base/common/platform'; import scorer = require('vs/base/common/scorer'); import paths = require('vs/base/common/paths'); -import filters = require('vs/base/common/filters'); import labels = require('vs/base/common/labels'); import strings = require('vs/base/common/strings'); import {IRange} from 'vs/editor/common/editorCommon'; -import {ListenerUnbind} from 'vs/base/common/eventEmitter'; -import {compareByPrefix} from 'vs/base/common/comparers'; import {IAutoFocus} from 'vs/base/parts/quickopen/common/quickOpen'; import {QuickOpenEntry, QuickOpenModel} from 'vs/base/parts/quickopen/browser/quickOpenModel'; import {QuickOpenHandler} from 'vs/workbench/browser/quickopen'; @@ -26,8 +23,7 @@ import * as openSymbolHandler from 'vs/workbench/parts/search/browser/openSymbol import {IMessageService, Severity} from 'vs/platform/message/common/message'; import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation'; import {IWorkspaceContextService} from 'vs/workbench/services/workspace/common/contextService'; -import {ISearchConfiguration} from 'vs/platform/search/common/search'; -import {IConfigurationService, IConfigurationServiceEvent, ConfigurationServiceEventTypes} from 'vs/platform/configuration/common/configuration'; +import {IConfigurationService} from 'vs/platform/configuration/common/configuration'; interface ISearchWithRange { search: string; @@ -53,7 +49,6 @@ export class OpenAnythingHandler extends QuickOpenHandler { private pendingSearch: TPromise; private isClosed: boolean; private scorerCache: { [key: string]: number }; - private configurationListenerUnbind: ListenerUnbind; constructor( @IMessageService private messageService: IMessageService, @@ -237,7 +232,7 @@ export class OpenAnythingHandler extends QuickOpenHandler { return { search: value.substr(0, patternMatch.index), // clear range suffix from search value range: range - } + }; } return null; diff --git a/src/vs/workbench/parts/search/browser/openFileHandler.ts b/src/vs/workbench/parts/search/browser/openFileHandler.ts index f23a5dda8840b17a9eecf56978224a5a57c1b639..e8d2bd50bd92a6ee08e2676d157f45640791bc69 100644 --- a/src/vs/workbench/parts/search/browser/openFileHandler.ts +++ b/src/vs/workbench/parts/search/browser/openFileHandler.ts @@ -6,7 +6,6 @@ import {TPromise} from 'vs/base/common/winjs.base'; import nls = require('vs/nls'); -import {ThrottledDelayer} from 'vs/base/common/async'; import paths = require('vs/base/common/paths'); import labels = require('vs/base/common/labels'); import URI from 'vs/base/common/uri';