From 6e5a331ac701fc9028aac577a4b188686fc9330a Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Sun, 21 Feb 2016 23:54:14 +0100 Subject: [PATCH] Organize imports --- src/vs/base/browser/dom.ts | 18 +- src/vs/base/browser/globalMouseMoveMonitor.ts | 14 +- src/vs/base/browser/idleMonitor.ts | 12 +- src/vs/base/browser/keyboardEvent.ts | 20 +- src/vs/base/browser/mouseEvent.ts | 8 +- src/vs/base/common/worker/simpleWorker.ts | 4 +- src/vs/base/common/worker/workerClient.ts | 68 ++--- src/vs/base/common/worker/workerProtocol.ts | 8 +- src/vs/base/common/worker/workerServer.ts | 64 ++--- src/vs/base/worker/defaultWorkerFactory.ts | 12 +- .../browser/referenceSearch.ts | 6 +- .../browser/referenceSearchModel.ts | 10 +- .../browser/referenceSearchWidget.ts | 234 +++++++++--------- .../contrib/smartSelect/common/smartSelect.ts | 34 +-- .../common/tokenSelectionSupport.ts | 30 ++- .../test/common/tokenSelectionSupport.test.ts | 14 +- src/vs/editor/node/textMate/TMSnippets.ts | 43 ++-- .../browser/keybindingServiceImpl.ts | 19 +- .../keybinding/common/keybindingResolver.ts | 10 +- .../keybinding/common/keybindingService.ts | 8 +- .../keybinding/common/keybindingsRegistry.ts | 12 +- .../test/common/keybindingIO.test.ts | 2 +- .../test/common/keybindingService.test.ts | 6 +- .../test/common/mockKeybindingService.ts | 4 +- .../plugins/common/abstractPluginService.ts | 42 ++-- .../plugins/common/nativePluginService.ts | 62 ++--- src/vs/platform/plugins/common/plugins.ts | 4 +- .../plugins/common/pluginsRegistry.ts | 24 +- .../plugins/node/pluginVersionValidator.ts | 2 +- .../test/node/pluginVersionValidator.test.ts | 9 +- 30 files changed, 397 insertions(+), 406 deletions(-) diff --git a/src/vs/base/browser/dom.ts b/src/vs/base/browser/dom.ts index be02496f2ce..4964d28c457 100644 --- a/src/vs/base/browser/dom.ts +++ b/src/vs/base/browser/dom.ts @@ -4,15 +4,15 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import {IMouseEvent, StandardMouseEvent} from 'vs/base/browser/mouseEvent'; -import {IKeyboardEvent, StandardKeyboardEvent} from 'vs/base/browser/keyboardEvent'; -import {isChrome, isWebKit} from 'vs/base/browser/browser'; -import types = require('vs/base/common/types'); +import {TimeoutTimer} from 'vs/base/common/async'; +import {onUnexpectedError} from 'vs/base/common/errors'; import {EventEmitter} from 'vs/base/common/eventEmitter'; import {Disposable, IDisposable} from 'vs/base/common/lifecycle'; -import {onUnexpectedError} from 'vs/base/common/errors'; -import browserService = require('vs/base/browser/browserService'); -import {TimeoutTimer} from 'vs/base/common/async'; +import {isObject} from 'vs/base/common/types'; +import {isChrome, isWebKit} from 'vs/base/browser/browser'; +import {getService} from 'vs/base/browser/browserService'; +import {IKeyboardEvent, StandardKeyboardEvent} from 'vs/base/browser/keyboardEvent'; +import {IMouseEvent, StandardMouseEvent} from 'vs/base/browser/mouseEvent'; export function clearNode(node: HTMLElement) { while (node.firstChild) { @@ -34,7 +34,7 @@ export function safeStringifyDOMAware(obj: any): string { return '[Element]'; } - if (types.isObject(value) || Array.isArray(value)) { + if (isObject(value) || Array.isArray(value)) { if (seen.indexOf(value) !== -1) { return '[Circular]'; } else { @@ -776,7 +776,7 @@ export function removeCSSRulesWithPrefix(ruleName: string, style = sharedStyle): } export function isHTMLElement(o: any): o is HTMLElement { - return browserService.getService().isHTMLElement(o); + return getService().isHTMLElement(o); } export const EventType = { diff --git a/src/vs/base/browser/globalMouseMoveMonitor.ts b/src/vs/base/browser/globalMouseMoveMonitor.ts index f6ccbfa0280..0b7d3fa81f7 100644 --- a/src/vs/base/browser/globalMouseMoveMonitor.ts +++ b/src/vs/base/browser/globalMouseMoveMonitor.ts @@ -4,10 +4,10 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as DomUtils from 'vs/base/browser/dom'; import {IDisposable, disposeAll} from 'vs/base/common/lifecycle'; -import {StandardMouseEvent} from 'vs/base/browser/mouseEvent'; +import * as dom from 'vs/base/browser/dom'; import {IframeUtils} from 'vs/base/browser/iframe'; +import {StandardMouseEvent} from 'vs/base/browser/mouseEvent'; export interface IStandardMouseMoveEventData { leftButton:boolean; @@ -92,32 +92,32 @@ export class GlobalMouseMoveMonitor implements IDisposable { let windowChain = IframeUtils.getSameOriginWindowChain(); for (let i = 0; i < windowChain.length; i++) { - this.hooks.push(DomUtils.addDisposableThrottledListener(windowChain[i].window.document, 'mousemove', + this.hooks.push(dom.addDisposableThrottledListener(windowChain[i].window.document, 'mousemove', (data:R) => this.mouseMoveCallback(data), (lastEvent:R, currentEvent:MouseEvent) => this.mouseMoveEventMerger(lastEvent, currentEvent) )); - this.hooks.push(DomUtils.addDisposableListener(windowChain[i].window.document, 'mouseup', (e:MouseEvent) => this.stopMonitoring(true))); + this.hooks.push(dom.addDisposableListener(windowChain[i].window.document, 'mouseup', (e:MouseEvent) => this.stopMonitoring(true))); } if (IframeUtils.hasDifferentOriginAncestor()) { let lastSameOriginAncestor = windowChain[windowChain.length - 1]; // We might miss a mouse up if it happens outside the iframe // This one is for Chrome - this.hooks.push(DomUtils.addDisposableListener(lastSameOriginAncestor.window.document, 'mouseout', (browserEvent:MouseEvent) => { + this.hooks.push(dom.addDisposableListener(lastSameOriginAncestor.window.document, 'mouseout', (browserEvent:MouseEvent) => { let e = new StandardMouseEvent(browserEvent); if (e.target.tagName.toLowerCase() === 'html') { this.stopMonitoring(true); } })); // This one is for FF - this.hooks.push(DomUtils.addDisposableListener(lastSameOriginAncestor.window.document, 'mouseover', (browserEvent:MouseEvent) => { + this.hooks.push(dom.addDisposableListener(lastSameOriginAncestor.window.document, 'mouseover', (browserEvent:MouseEvent) => { let e = new StandardMouseEvent(browserEvent); if (e.target.tagName.toLowerCase() === 'html') { this.stopMonitoring(true); } })); // This one is for IE - this.hooks.push(DomUtils.addDisposableListener(lastSameOriginAncestor.window.document.body, 'mouseleave', (browserEvent:MouseEvent) => { + this.hooks.push(dom.addDisposableListener(lastSameOriginAncestor.window.document.body, 'mouseleave', (browserEvent:MouseEvent) => { this.stopMonitoring(true); })); } diff --git a/src/vs/base/browser/idleMonitor.ts b/src/vs/base/browser/idleMonitor.ts index 6c427858062..4268a7b4fc9 100644 --- a/src/vs/base/browser/idleMonitor.ts +++ b/src/vs/base/browser/idleMonitor.ts @@ -4,11 +4,11 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as DomUtils from 'vs/base/browser/dom'; -import {Disposable, IDisposable} from 'vs/base/common/lifecycle'; -import {EventEmitter} from 'vs/base/common/eventEmitter'; -import {getService} from 'vs/base/browser/browserService'; import {TimeoutTimer} from 'vs/base/common/async'; +import {EventEmitter} from 'vs/base/common/eventEmitter'; +import {Disposable, IDisposable} from 'vs/base/common/lifecycle'; +import {getService} from 'vs/base/browser/browserService'; +import * as dom from 'vs/base/browser/dom'; export enum UserStatus { Idle, @@ -34,8 +34,8 @@ export class IdleMonitor extends Disposable { this._idleTime = idleTime; this._eventEmitter = this._register(new EventEmitter()); - this._register(DomUtils.addDisposableListener(getService().document, 'mousemove', () => this._onUserActive())); - this._register(DomUtils.addDisposableListener(getService().document, 'keydown', () => this._onUserActive())); + this._register(dom.addDisposableListener(getService().document, 'mousemove', () => this._onUserActive())); + this._register(dom.addDisposableListener(getService().document, 'keydown', () => this._onUserActive())); this._onUserActive(); } diff --git a/src/vs/base/browser/keyboardEvent.ts b/src/vs/base/browser/keyboardEvent.ts index e4b52599d52..83ae4845ce4 100644 --- a/src/vs/base/browser/keyboardEvent.ts +++ b/src/vs/base/browser/keyboardEvent.ts @@ -5,9 +5,9 @@ 'use strict'; -import * as Platform from 'vs/base/common/platform'; -import * as Browser from 'vs/base/browser/browser'; -import {KeyMod, KeyCode} from 'vs/base/common/keyCodes'; +import {KeyCode, KeyMod} from 'vs/base/common/keyCodes'; +import * as platform from 'vs/base/common/platform'; +import * as browser from 'vs/base/browser/browser'; let KEY_CODE_MAP: {[keyCode:number]:KeyCode} = {}; (function() { @@ -127,18 +127,18 @@ let KEY_CODE_MAP: {[keyCode:number]:KeyCode} = {}; KEY_CODE_MAP[226] = KeyCode.OEM_102; - if (Browser.isIE11orEarlier) { + if (browser.isIE11orEarlier) { KEY_CODE_MAP[91] = KeyCode.Meta; - } else if (Browser.isFirefox) { + } else if (browser.isFirefox) { KEY_CODE_MAP[59] = KeyCode.US_SEMICOLON; KEY_CODE_MAP[107] = KeyCode.US_EQUAL; KEY_CODE_MAP[109] = KeyCode.US_MINUS; - if (Platform.isMacintosh) { + if (platform.isMacintosh) { KEY_CODE_MAP[224] = KeyCode.Meta; } - } else if (Browser.isWebKit) { + } else if (browser.isWebKit) { KEY_CODE_MAP[91] = KeyCode.Meta; - if (Platform.isMacintosh) { + if (platform.isMacintosh) { // the two meta keys in the Mac have different key codes (91 and 93) KEY_CODE_MAP[93] = KeyCode.Meta; } else { @@ -187,10 +187,10 @@ export interface IKeyboardEvent { stopPropagation(): void; } -const ctrlKeyMod = (Platform.isMacintosh ? KeyMod.WinCtrl : KeyMod.CtrlCmd); +const ctrlKeyMod = (platform.isMacintosh ? KeyMod.WinCtrl : KeyMod.CtrlCmd); const altKeyMod = KeyMod.Alt; const shiftKeyMod = KeyMod.Shift; -const metaKeyMod = (Platform.isMacintosh ? KeyMod.CtrlCmd : KeyMod.WinCtrl); +const metaKeyMod = (platform.isMacintosh ? KeyMod.CtrlCmd : KeyMod.WinCtrl); export class StandardKeyboardEvent implements IKeyboardEvent { diff --git a/src/vs/base/browser/mouseEvent.ts b/src/vs/base/browser/mouseEvent.ts index 6ba1c4cf240..a336354e9fe 100644 --- a/src/vs/base/browser/mouseEvent.ts +++ b/src/vs/base/browser/mouseEvent.ts @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as Platform from 'vs/base/common/platform'; -import * as Browser from 'vs/base/browser/browser'; +import * as platform from 'vs/base/common/platform'; +import * as browser from 'vs/base/browser/browser'; import {IframeUtils} from 'vs/base/browser/iframe'; export interface IMouseEvent { @@ -83,7 +83,7 @@ export class StandardMouseEvent implements IMouseEvent { }; let test1 = readPageCoords, test2 = readClientCoords; - if (Browser.isIE10) { + if (browser.isIE10) { // The if A elseif B logic here is inversed in IE10 due to an IE10 issue test1 = readClientCoords; test2 = readPageCoords; @@ -184,7 +184,7 @@ export class StandardMouseWheelEvent { // horizontal delta scroll if (typeof e1.wheelDeltaX !== 'undefined') { - if (Browser.isSafari && Platform.isWindows) { + if (browser.isSafari && platform.isWindows) { this.deltaX = - (e1.wheelDeltaX / 120); } else { this.deltaX = e1.wheelDeltaX / 120; diff --git a/src/vs/base/common/worker/simpleWorker.ts b/src/vs/base/common/worker/simpleWorker.ts index 07522e90b21..0d700e296b1 100644 --- a/src/vs/base/common/worker/simpleWorker.ts +++ b/src/vs/base/common/worker/simpleWorker.ts @@ -4,10 +4,10 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import {IWorker, IWorkerFactory} from './workerClient'; -import {TPromise, ValueCallback, ErrorCallback} from 'vs/base/common/winjs.base'; import {transformErrorForSerialization} from 'vs/base/common/errors'; import {Disposable} from 'vs/base/common/lifecycle'; +import {ErrorCallback, TPromise, ValueCallback} from 'vs/base/common/winjs.base'; +import {IWorker, IWorkerFactory} from './workerClient'; const INITIALIZE = '$initialize'; diff --git a/src/vs/base/common/worker/workerClient.ts b/src/vs/base/common/worker/workerClient.ts index 6dcb7fac16c..27c6c3e7077 100644 --- a/src/vs/base/common/worker/workerClient.ts +++ b/src/vs/base/common/worker/workerClient.ts @@ -4,12 +4,12 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; +import {onUnexpectedError, transformErrorForSerialization} from 'vs/base/common/errors'; +import {parse, stringify} from 'vs/base/common/marshalling'; +import {IRemoteCom} from 'vs/base/common/remote'; import * as timer from 'vs/base/common/timer'; import {TPromise} from 'vs/base/common/winjs.base'; -import {onUnexpectedError, transformErrorForSerialization} from 'vs/base/common/errors'; -import protocol = require('vs/base/common/worker/workerProtocol'); -import remote = require('vs/base/common/remote'); -import marshalling = require('vs/base/common/marshalling'); +import * as workerProtocol from 'vs/base/common/worker/workerProtocol'; export interface IWorker { getId():number; @@ -39,17 +39,17 @@ export class WorkerClient { private _promises:{[id:string]:IActiveRequest;}; private _worker:IWorker; - private _messagesQueue:protocol.IClientMessage[]; + private _messagesQueue:workerProtocol.IClientMessage[]; private _processQueueTimeout:number; private _waitingForWorkerReply:boolean; private _lastTimerEvent:timer.ITimerEvent; - private _remoteCom: protocol.RemoteCom; - private _decodeMessageName: (msg: protocol.IClientMessage) => string; + private _remoteCom: workerProtocol.RemoteCom; + private _decodeMessageName: (msg: workerProtocol.IClientMessage) => string; public onModuleLoaded:TPromise; - constructor(workerFactory:IWorkerFactory, moduleId:string, decodeMessageName:(msg:protocol.IClientMessage)=>string) { + constructor(workerFactory:IWorkerFactory, moduleId:string, decodeMessageName:(msg:workerProtocol.IClientMessage)=>string) { this._decodeMessageName = decodeMessageName; this._lastMessageId = 0; this._promises = {}; @@ -74,7 +74,7 @@ export class WorkerClient { let MonacoEnvironment = (window).MonacoEnvironment || null; - this.onModuleLoaded = this._sendMessage(protocol.MessageType.INITIALIZE, { + this.onModuleLoaded = this._sendMessage(workerProtocol.MessageType.INITIALIZE, { id: this._worker.getId(), moduleId: moduleId, loaderConfiguration: loaderConfiguration, @@ -82,10 +82,10 @@ export class WorkerClient { }); this.onModuleLoaded.then(null, (e) => this._onError('Worker failed to load ' + moduleId, e)); - this._remoteCom = new protocol.RemoteCom(this); + this._remoteCom = new workerProtocol.RemoteCom(this); } - public getRemoteCom(): remote.IRemoteCom { + public getRemoteCom(): IRemoteCom { return this._remoteCom; } @@ -172,7 +172,7 @@ export class WorkerClient { return promise; } - private _enqueueMessage(msg:protocol.IClientMessage): void { + private _enqueueMessage(msg:workerProtocol.IClientMessage): void { let lastIndexSmallerOrEqual = -1, i:number; @@ -232,13 +232,13 @@ export class WorkerClient { } private _postMessage(msg:any): void { - this._worker.postMessage(marshalling.stringify(msg)); + this._worker.postMessage(stringify(msg)); } private _onSerializedMessage(msg:string): void { - let message:protocol.IServerMessage = null; + let message:workerProtocol.IServerMessage = null; try { - message = marshalling.parse(msg); + message = parse(msg); } catch (e) { // nothing } @@ -247,7 +247,7 @@ export class WorkerClient { } } - private _onmessage(msg:protocol.IServerMessage): void { + private _onmessage(msg:workerProtocol.IServerMessage): void { if (!msg.monacoWorker) { return; } @@ -256,8 +256,8 @@ export class WorkerClient { } switch (msg.type) { - case protocol.MessageType.REPLY: - let serverReplyMessage = msg; + case workerProtocol.MessageType.REPLY: + let serverReplyMessage = msg; this._waitingForWorkerReply = false; if(this._lastTimerEvent) { @@ -270,12 +270,12 @@ export class WorkerClient { } switch (serverReplyMessage.action) { - case protocol.ReplyType.COMPLETE: + case workerProtocol.ReplyType.COMPLETE: this._promises[serverReplyMessage.id].complete(serverReplyMessage.payload); delete this._promises[serverReplyMessage.id]; break; - case protocol.ReplyType.ERROR: + case workerProtocol.ReplyType.ERROR: this._onError('Main Thread sent to worker the following message:', { type: this._promises[serverReplyMessage.id].type, payload: this._promises[serverReplyMessage.id].payload @@ -286,14 +286,14 @@ export class WorkerClient { delete this._promises[serverReplyMessage.id]; break; - case protocol.ReplyType.PROGRESS: + case workerProtocol.ReplyType.PROGRESS: this._promises[serverReplyMessage.id].progress(serverReplyMessage.payload); break; } break; - case protocol.MessageType.PRINT: - let serverPrintMessage = msg; + case workerProtocol.MessageType.PRINT: + let serverPrintMessage = msg; this._consoleLog(serverPrintMessage.level, serverPrintMessage.payload); break; @@ -304,11 +304,11 @@ export class WorkerClient { this._processMessagesQueue(); } - private _dispatchRequestFromWorker(msg:protocol.IServerMessage): void { + private _dispatchRequestFromWorker(msg:workerProtocol.IServerMessage): void { this._handleWorkerRequest(msg).then((result) => { - let reply: protocol.IClientReplyMessage = { + let reply: workerProtocol.IClientReplyMessage = { id: 0, - type: protocol.MessageType.REPLY, + type: workerProtocol.MessageType.REPLY, timestamp: (new Date()).getTime(), seq: msg.req, @@ -317,9 +317,9 @@ export class WorkerClient { }; this._postMessage(reply); }, (err) => { - let reply: protocol.IClientReplyMessage = { + let reply: workerProtocol.IClientReplyMessage = { id: 0, - type: protocol.MessageType.REPLY, + type: workerProtocol.MessageType.REPLY, timestamp: (new Date()).getTime(), seq: msg.req, @@ -330,7 +330,7 @@ export class WorkerClient { }); } - private _handleWorkerRequest(msg:protocol.IServerMessage): TPromise { + private _handleWorkerRequest(msg:workerProtocol.IServerMessage): TPromise { if (msg.type === '_proxyObj') { return this._remoteCom.handleMessage(msg.payload); } @@ -353,19 +353,19 @@ export class WorkerClient { _consoleLog(level:string, payload:any): void { switch (level) { - case protocol.PrintType.LOG: + case workerProtocol.PrintType.LOG: console.log(payload); break; - case protocol.PrintType.DEBUG: + case workerProtocol.PrintType.DEBUG: console.info(payload); break; - case protocol.PrintType.INFO: + case workerProtocol.PrintType.INFO: console.info(payload); break; - case protocol.PrintType.WARN: + case workerProtocol.PrintType.WARN: console.warn(payload); break; - case protocol.PrintType.ERROR: + case workerProtocol.PrintType.ERROR: console.error(payload); break; default: diff --git a/src/vs/base/common/worker/workerProtocol.ts b/src/vs/base/common/worker/workerProtocol.ts index 9b339b9a47d..a539987eb24 100644 --- a/src/vs/base/common/worker/workerProtocol.ts +++ b/src/vs/base/common/worker/workerProtocol.ts @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; +import {IManyHandler, IRemoteCom} from 'vs/base/common/remote'; import {TPromise} from 'vs/base/common/winjs.base'; -import remote = require('vs/base/common/remote'); /** * A message sent from the UI thread to a worker @@ -75,10 +75,10 @@ export interface IRequester { request(requestName: string, payload: any): TPromise; } -export class RemoteCom implements remote.IRemoteCom { +export class RemoteCom implements IRemoteCom { private _requester: IRequester; - private _bigHandler: remote.IManyHandler; + private _bigHandler: IManyHandler; constructor(requester:IRequester) { this._requester = requester; @@ -93,7 +93,7 @@ export class RemoteCom implements remote.IRemoteCom { }); } - public setManyHandler(handler:remote.IManyHandler): void { + public setManyHandler(handler:IManyHandler): void { this._bigHandler = handler; } diff --git a/src/vs/base/common/worker/workerServer.ts b/src/vs/base/common/worker/workerServer.ts index d2abfbc2383..3e83acec4d7 100644 --- a/src/vs/base/common/worker/workerServer.ts +++ b/src/vs/base/common/worker/workerServer.ts @@ -4,11 +4,11 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; +import {setUnexpectedErrorHandler, transformErrorForSerialization} from 'vs/base/common/errors'; +import {parse, stringify} from 'vs/base/common/marshalling'; +import {IRemoteCom} from 'vs/base/common/remote'; import {TPromise} from 'vs/base/common/winjs.base'; -import protocol = require('vs/base/common/worker/workerProtocol'); -import errors = require('vs/base/common/errors'); -import remote = require('vs/base/common/remote'); -import marshalling = require('vs/base/common/marshalling'); +import * as workerProtocol from 'vs/base/common/worker/workerProtocol'; interface IReplyCallbacks { c: (value:any)=>void; @@ -23,7 +23,7 @@ export class WorkerServer { private _requestHandler:any; private _lastReq: number; private _awaitedReplies: { [req:string]: IReplyCallbacks; }; - private _remoteCom: protocol.RemoteCom; + private _remoteCom: workerProtocol.RemoteCom; constructor(postSerializedMessage:(msg:string)=>void) { this._postSerializedMessage = postSerializedMessage; @@ -33,33 +33,33 @@ export class WorkerServer { this._awaitedReplies = {}; this._bindConsole(); - this._remoteCom = new protocol.RemoteCom(this); + this._remoteCom = new workerProtocol.RemoteCom(this); } - public getRemoteCom(): remote.IRemoteCom { + public getRemoteCom(): IRemoteCom { return this._remoteCom; } private _bindConsole(): void { ( self).console = { - log: this._sendPrintMessage.bind(this, protocol.PrintType.LOG), - debug: this._sendPrintMessage.bind(this, protocol.PrintType.DEBUG), - info: this._sendPrintMessage.bind(this, protocol.PrintType.INFO), - warn: this._sendPrintMessage.bind(this, protocol.PrintType.WARN), - error: this._sendPrintMessage.bind(this, protocol.PrintType.ERROR) + log: this._sendPrintMessage.bind(this, workerProtocol.PrintType.LOG), + debug: this._sendPrintMessage.bind(this, workerProtocol.PrintType.DEBUG), + info: this._sendPrintMessage.bind(this, workerProtocol.PrintType.INFO), + warn: this._sendPrintMessage.bind(this, workerProtocol.PrintType.WARN), + error: this._sendPrintMessage.bind(this, workerProtocol.PrintType.ERROR) }; - errors.setUnexpectedErrorHandler((e) => { + setUnexpectedErrorHandler((e) => { self.console.error(e); }); } private _sendPrintMessage(level:string, ...objects:any[]): void { - var transformedObjects = objects.map((obj) => (obj instanceof Error) ? errors.transformErrorForSerialization(obj) : obj); - var msg:protocol.IServerPrintMessage = { + var transformedObjects = objects.map((obj) => (obj instanceof Error) ? transformErrorForSerialization(obj) : obj); + var msg:workerProtocol.IServerPrintMessage = { monacoWorker: true, from: this._workerId, req: '0', - type: protocol.MessageType.PRINT, + type: workerProtocol.MessageType.PRINT, level: level, payload: (transformedObjects.length === 1 ? transformedObjects[0] : transformedObjects) }; @@ -67,14 +67,14 @@ export class WorkerServer { } private _sendReply(msgId:number, action:string, payload:any): void { - var msg:protocol.IServerReplyMessage = { + var msg:workerProtocol.IServerReplyMessage = { monacoWorker: true, from: this._workerId, req: '0', id: msgId, - type: protocol.MessageType.REPLY, + type: workerProtocol.MessageType.REPLY, action: action, - payload: (payload instanceof Error) ? errors.transformErrorForSerialization(payload) : payload + payload: (payload instanceof Error) ? transformErrorForSerialization(payload) : payload }; this._postMessage(msg); } @@ -86,7 +86,7 @@ export class WorkerServer { var req = String(++this._lastReq); - var msg:protocol.IServerMessage = { + var msg:workerProtocol.IServerMessage = { monacoWorker: true, from: this._workerId, req: req, @@ -120,19 +120,19 @@ export class WorkerServer { } public onmessage(msg:string): void { - this._onmessage(marshalling.parse(msg)); + this._onmessage(parse(msg)); } - private _postMessage(msg:protocol.IServerMessage): void { - this._postSerializedMessage(marshalling.stringify(msg)); + private _postMessage(msg:workerProtocol.IServerMessage): void { + this._postSerializedMessage(stringify(msg)); } - private _onmessage(msg:protocol.IClientMessage): void { + private _onmessage(msg:workerProtocol.IClientMessage): void { - if (msg.type === protocol.MessageType.REPLY) { + if (msg.type === workerProtocol.MessageType.REPLY) { // this message is a reply to a request we've made to the main thread previously - var typedMsg = msg; + var typedMsg = msg; if (!typedMsg.seq || !this._awaitedReplies.hasOwnProperty(typedMsg.seq)) { console.error('Worker received unexpected reply from main thread', msg); @@ -151,12 +151,12 @@ export class WorkerServer { return; } - var c = this._sendReply.bind(this, msg.id, protocol.ReplyType.COMPLETE); - var e = this._sendReply.bind(this, msg.id, protocol.ReplyType.ERROR); - var p = this._sendReply.bind(this, msg.id, protocol.ReplyType.PROGRESS); + var c = this._sendReply.bind(this, msg.id, workerProtocol.ReplyType.COMPLETE); + var e = this._sendReply.bind(this, msg.id, workerProtocol.ReplyType.ERROR); + var p = this._sendReply.bind(this, msg.id, workerProtocol.ReplyType.PROGRESS); switch(msg.type) { - case protocol.MessageType.INITIALIZE: + case workerProtocol.MessageType.INITIALIZE: this._workerId = msg.payload.id; var loaderConfig = msg.payload.loaderConfiguration; @@ -201,7 +201,7 @@ export class WorkerServer { } } - private _handleMessage(msg:protocol.IClientMessage, c:(value:any)=>void, e:(err:any)=>void, p:(progress:any)=>void): void { + private _handleMessage(msg:workerProtocol.IClientMessage, c:(value:any)=>void, e:(err:any)=>void, p:(progress:any)=>void): void { if (msg.type === '_proxyObj') { this._remoteCom.handleMessage(msg.payload).then(c, e, p); @@ -218,7 +218,7 @@ export class WorkerServer { try { this._requestHandler[msg.type].call(this._requestHandler, this, c, e, p, msg.payload); } catch (handlerError) { - e(errors.transformErrorForSerialization(handlerError)); + e(transformErrorForSerialization(handlerError)); } // var what = msg.type; // console.info(what + ' took ' + ((new Date().getTime())-now)); diff --git a/src/vs/base/worker/defaultWorkerFactory.ts b/src/vs/base/worker/defaultWorkerFactory.ts index d3b887aedb1..e8ab9ca5312 100644 --- a/src/vs/base/worker/defaultWorkerFactory.ts +++ b/src/vs/base/worker/defaultWorkerFactory.ts @@ -4,15 +4,15 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import dom = require('vs/base/browser/dom'); -import lifecycle = require('vs/base/common/lifecycle'); -import env = require('vs/base/common/flags'); +import * as flags from 'vs/base/common/flags'; +import {IDisposable, disposeAll} from 'vs/base/common/lifecycle'; import {IWorker, IWorkerCallback, IWorkerFactory} from 'vs/base/common/worker/workerClient'; +import * as dom from 'vs/base/browser/dom'; function defaultGetWorkerUrl(workerId:string, label:string): string { return require.toUrl('./' + workerId + '?' + encodeURIComponent(label)); } -var getWorkerUrl = env.getCrossOriginWorkerScriptUrl || defaultGetWorkerUrl; +var getWorkerUrl = flags.getCrossOriginWorkerScriptUrl || defaultGetWorkerUrl; /** @@ -60,7 +60,7 @@ class FrameWorker implements IWorker { private loaded: boolean; private beforeLoadMessages: any[]; - private _listeners: lifecycle.IDisposable[]; + private _listeners: IDisposable[]; constructor(moduleId:string, id: number, onMessageCallback:IWorkerCallback) { this.id = id; @@ -87,7 +87,7 @@ class FrameWorker implements IWorker { } public dispose(): void { - this._listeners = lifecycle.disposeAll(this._listeners); + this._listeners = disposeAll(this._listeners); window.removeEventListener('message', this.onMessage); window.frames[this.iframeId()].close(); } diff --git a/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.ts b/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.ts index 602de2d8650..7985939efb8 100644 --- a/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.ts +++ b/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.ts @@ -30,7 +30,7 @@ import {ICodeEditor} from 'vs/editor/browser/editorBrowser'; import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions'; import {Events, IPeekViewService, getOuterEditor} from 'vs/editor/contrib/zoneWidget/browser/peekViewWidget'; import {ReferenceRegistry, findReferences} from '../common/referenceSearch'; -import {EventType, Model} from './referenceSearchModel'; +import {EventType, ReferencesModel} from './referenceSearchModel'; import {ReferenceWidget} from './referenceSearchWidget'; export class FindReferencesController implements editorCommon.IEditorContribution { @@ -41,7 +41,7 @@ export class FindReferencesController implements editorCommon.IEditorContributio private widget:ReferenceWidget; private requestIdPool: number; private callOnClear:Function[]; - private model:Model; + private model:ReferencesModel; private modelRevealing:boolean; private editorService: IEditorService; @@ -162,7 +162,7 @@ export class FindReferencesController implements editorCommon.IEditorContributio } // create result model - this.model = new Model(references, this.editorService); + this.model = new ReferencesModel(references, this.editorService); this.model.currentReference = this.model.findReference(editorModel.getAssociatedResource(), range.getStartPosition()); var unbind = this.model.addListener(EventType.CurrentReferenceChanged, () => { diff --git a/src/vs/editor/contrib/referenceSearch/browser/referenceSearchModel.ts b/src/vs/editor/contrib/referenceSearch/browser/referenceSearchModel.ts index 672de9bd884..80d1662df3a 100644 --- a/src/vs/editor/contrib/referenceSearch/browser/referenceSearchModel.ts +++ b/src/vs/editor/contrib/referenceSearch/browser/referenceSearchModel.ts @@ -99,7 +99,7 @@ export class FileReferences { private _preview: FilePreview; private _resolved: boolean; - constructor(private _parent: Model, private _resource: URI, private _editorService: IEditorService) { + constructor(private _parent: ReferencesModel, private _resource: URI, private _editorService: IEditorService) { this._children = []; } @@ -107,7 +107,7 @@ export class FileReferences { return this._resource.toString(); } - public get parent(): Model { + public get parent(): ReferencesModel { return this._parent; } @@ -145,7 +145,7 @@ export class FileReferences { } } -export class Model extends EventEmitter { +export class ReferencesModel extends EventEmitter { private _references: FileReferences[]; private _currentReference: OneReference; @@ -161,7 +161,7 @@ export class Model extends EventEmitter { references.forEach(reference => { - let hash = Model._hash(reference); + let hash = ReferencesModel._hash(reference); if (!seen[hash]) { seen[hash] = true; @@ -174,7 +174,7 @@ export class Model extends EventEmitter { }); this._references = collections.values(referencesByFile); - this._references.sort(Model._compare); + this._references.sort(ReferencesModel._compare); } public get children(): FileReferences[] { diff --git a/src/vs/editor/contrib/referenceSearch/browser/referenceSearchWidget.ts b/src/vs/editor/contrib/referenceSearch/browser/referenceSearchWidget.ts index 87c229d74fa..80b266ad15f 100644 --- a/src/vs/editor/contrib/referenceSearch/browser/referenceSearchWidget.ts +++ b/src/vs/editor/contrib/referenceSearch/browser/referenceSearchWidget.ts @@ -6,65 +6,65 @@ import 'vs/css!./referenceSearchWidget'; import * as nls from 'vs/nls'; +import * as collections from 'vs/base/common/collections'; +import {onUnexpectedError} from 'vs/base/common/errors'; +import {getPathLabel} from 'vs/base/common/labels'; +import {IDisposable, cAll, disposeAll} from 'vs/base/common/lifecycle'; +import {Schemas} from 'vs/base/common/network'; +import * as strings from 'vs/base/common/strings'; import URI from 'vs/base/common/uri'; -import collections = require('vs/base/common/collections'); -import lifecycle = require('vs/base/common/lifecycle'); -import dom = require('vs/base/browser/dom'); import {TPromise} from 'vs/base/common/winjs.base'; -import strings = require('vs/base/common/strings'); -import network = require('vs/base/common/network'); -import fileLabel = require('vs/base/browser/ui/filelabel/fileLabel'); -import errors = require('vs/base/common/errors'); -import keyboard = require('vs/base/browser/keyboardEvent'); -import mouse = require('vs/base/browser/mouseEvent'); -import builder = require('vs/base/browser/builder'); -import labels = require('vs/base/common/labels'); -import tree = require('vs/base/parts/tree/browser/tree'); -import treeWidget = require('vs/base/parts/tree/browser/treeImpl'); -import treeDefaults = require('vs/base/parts/tree/browser/treeDefaults'); -import leftRightWidget = require('vs/base/browser/ui/leftRightWidget/leftRightWidget'); -import countBadge = require('vs/base/browser/ui/countBadge/countBadge'); -import * as EditorCommon from 'vs/editor/common/editorCommon'; -import * as EditorBrowser from 'vs/editor/browser/editorBrowser'; -import {DefaultConfig} from 'vs/editor/common/config/defaultConfig'; -import embeddedCodeEditorWidget = require('vs/editor/browser/widget/embeddedCodeEditorWidget'); -import codeEditorModel = require('vs/editor/common/model/model'); -import peekViewWidget = require('vs/editor/contrib/zoneWidget/browser/peekViewWidget'); -import referenceSearchModel = require('./referenceSearchModel'); -import {Range} from 'vs/editor/common/core/range'; +import {$, Builder} from 'vs/base/browser/builder'; +import * as dom from 'vs/base/browser/dom'; +import {IKeyboardEvent} from 'vs/base/browser/keyboardEvent'; +import {IMouseEvent} from 'vs/base/browser/mouseEvent'; +import {CountBadge} from 'vs/base/browser/ui/countBadge/countBadge'; +import {FileLabel} from 'vs/base/browser/ui/filelabel/fileLabel'; +import {LeftRightWidget} from 'vs/base/browser/ui/leftRightWidget/leftRightWidget'; +import * as tree from 'vs/base/parts/tree/browser/tree'; +import {DefaultController, LegacyRenderer} from 'vs/base/parts/tree/browser/treeDefaults'; +import {Tree} from 'vs/base/parts/tree/browser/treeImpl'; import {IEditorService} from 'vs/platform/editor/common/editor'; import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation'; -import {IWorkspaceContextService} from 'vs/platform/workspace/common/workspace'; import {IKeybindingService} from 'vs/platform/keybinding/common/keybindingService'; +import {IWorkspaceContextService} from 'vs/platform/workspace/common/workspace'; +import {DefaultConfig} from 'vs/editor/common/config/defaultConfig'; +import {Range} from 'vs/editor/common/core/range'; +import * as editorCommon from 'vs/editor/common/editorCommon'; +import {Model} from 'vs/editor/common/model/model'; +import {ICodeEditor, IMouseTarget} from 'vs/editor/browser/editorBrowser'; +import {EmbeddedCodeEditorWidget} from 'vs/editor/browser/widget/embeddedCodeEditorWidget'; +import {PeekViewWidget} from 'vs/editor/contrib/zoneWidget/browser/peekViewWidget'; +import {EventType, FileReferences, OneReference, ReferencesModel} from './referenceSearchModel'; -class DecorationsManager implements lifecycle.IDisposable { +class DecorationsManager implements IDisposable { - private static DecorationOptions:EditorCommon.IModelDecorationOptions = { - stickiness: EditorCommon.TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, + private static DecorationOptions:editorCommon.IModelDecorationOptions = { + stickiness: editorCommon.TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges, className: 'reference-decoration' }; - private _decorationSet = collections.createStringDictionary(); - private _decorationIgnoreSet = collections.createStringDictionary(); + private _decorationSet = collections.createStringDictionary(); + private _decorationIgnoreSet = collections.createStringDictionary(); private callOnDispose:Function[] = []; private callOnModelChange:Function[] = []; - constructor(private editor:EditorBrowser.ICodeEditor, private model:referenceSearchModel.Model) { - this.callOnDispose.push(this.editor.addListener(EditorCommon.EventType.ModelChanged, () => this.onModelChanged())); + constructor(private editor:ICodeEditor, private model:ReferencesModel) { + this.callOnDispose.push(this.editor.addListener(editorCommon.EventType.ModelChanged, () => this.onModelChanged())); this.onModelChanged(); } public dispose(): void { - this.callOnModelChange = lifecycle.cAll(this.callOnModelChange); - this.callOnDispose = lifecycle.cAll(this.callOnDispose); + this.callOnModelChange = cAll(this.callOnModelChange); + this.callOnDispose = cAll(this.callOnDispose); this.removeDecorations(); } private onModelChanged():void { this.removeDecorations(); - this.callOnModelChange = lifecycle.cAll(this.callOnModelChange); + this.callOnModelChange = cAll(this.callOnModelChange); var model = this.editor.getModel(); if(!model) { @@ -79,11 +79,11 @@ class DecorationsManager implements lifecycle.IDisposable { } } - private addDecorations(reference:referenceSearchModel.FileReferences):void { - this.callOnModelChange.push(this.editor.getModel().addListener(EditorCommon.EventType.ModelDecorationsChanged, (event) => this.onDecorationChanged(event))); + private addDecorations(reference:FileReferences):void { + this.callOnModelChange.push(this.editor.getModel().addListener(editorCommon.EventType.ModelDecorationsChanged, (event) => this.onDecorationChanged(event))); this.editor.getModel().changeDecorations((accessor) => { - var newDecorations: EditorCommon.IModelDeltaDecoration[] = []; + var newDecorations: editorCommon.IModelDeltaDecoration[] = []; var newDecorationsActualIndex: number[] = []; for(let i = 0, len = reference.children.length; i < len; i++) { @@ -116,7 +116,7 @@ class DecorationsManager implements lifecycle.IDisposable { continue; } - var newRange = addedOrChangedDecorations[i].range, + var newRange = addedOrChangedDecorations[i].range, ignore = false; if(Range.equalsRange(newRange, reference.range)) { @@ -164,24 +164,24 @@ class DecorationsManager implements lifecycle.IDisposable { class DataSource implements tree.IDataSource { public getId(tree:tree.ITree, element:any):string { - if(element instanceof referenceSearchModel.Model) { + if(element instanceof ReferencesModel) { return 'root'; - } else if(element instanceof referenceSearchModel.FileReferences) { - return ( element).id; - } else if(element instanceof referenceSearchModel.OneReference) { - return ( element).id; + } else if(element instanceof FileReferences) { + return ( element).id; + } else if(element instanceof OneReference) { + return ( element).id; } } public hasChildren(tree:tree.ITree, element:any):boolean { - return element instanceof referenceSearchModel.FileReferences || element instanceof referenceSearchModel.Model; + return element instanceof FileReferences || element instanceof ReferencesModel; } public getChildren(tree:tree.ITree, element:any):TPromise { - if(element instanceof referenceSearchModel.Model) { - return TPromise.as(( element).children); - } else if(element instanceof referenceSearchModel.FileReferences) { - return ( element).resolve().then(val => val.children); + if(element instanceof ReferencesModel) { + return TPromise.as(( element).children); + } else if(element instanceof FileReferences) { + return ( element).resolve().then(val => val.children); } else { return TPromise.as([]); } @@ -189,16 +189,16 @@ class DataSource implements tree.IDataSource { public getParent(tree:tree.ITree, element:any):TPromise { var result:any = null; - if(element instanceof referenceSearchModel.FileReferences) { - result = ( element).parent; - } else if (element instanceof referenceSearchModel.OneReference) { - result = ( element).parent; + if(element instanceof FileReferences) { + result = ( element).parent; + } else if (element instanceof OneReference) { + result = ( element).parent; } return TPromise.as(result); } } -class Controller extends treeDefaults.DefaultController { +class Controller extends DefaultController { static Events = { FOCUSED: 'events/custom/focused', @@ -206,9 +206,9 @@ class Controller extends treeDefaults.DefaultController { OPEN_TO_SIDE: 'events/custom/opentoside' }; - public onMouseDown(tree:tree.ITree, element:any, event:mouse.IMouseEvent):boolean { + public onMouseDown(tree:tree.ITree, element:any, event:IMouseEvent):boolean { if (event.leftButton) { - if (element instanceof referenceSearchModel.FileReferences) { + if (element instanceof FileReferences) { event.preventDefault(); event.stopPropagation(); return this.expandCollapse(tree, element); @@ -228,7 +228,7 @@ class Controller extends treeDefaults.DefaultController { return false; } - public onClick(tree:tree.ITree, element:any, event:mouse.IMouseEvent):boolean { + public onClick(tree:tree.ITree, element:any, event:IMouseEvent):boolean { if (event.leftButton) { return false; // Already handled by onMouseDown } @@ -239,20 +239,20 @@ class Controller extends treeDefaults.DefaultController { private expandCollapse(tree:tree.ITree, element:any):boolean { if (tree.isExpanded(element)) { - tree.collapse(element).done(null, errors.onUnexpectedError); + tree.collapse(element).done(null, onUnexpectedError); } else { - tree.expand(element).done(null, errors.onUnexpectedError); + tree.expand(element).done(null, onUnexpectedError); } return true; } - public onEscape(tree:tree.ITree, event:keyboard.IKeyboardEvent):boolean { + public onEscape(tree:tree.ITree, event:IKeyboardEvent):boolean { return false; } - public onEnter(tree:tree.ITree, event:keyboard.IKeyboardEvent):boolean { + public onEnter(tree:tree.ITree, event:IKeyboardEvent):boolean { var element = tree.getFocus(); - if (element instanceof referenceSearchModel.FileReferences) { + if (element instanceof FileReferences) { return this.expandCollapse(tree, element); } @@ -265,43 +265,43 @@ class Controller extends treeDefaults.DefaultController { return result; } - public onUp(tree:tree.ITree, event:keyboard.IKeyboardEvent):boolean { + public onUp(tree:tree.ITree, event:IKeyboardEvent):boolean { super.onUp(tree, event); this.fakeFocus(tree, event); return true; } - public onPageUp(tree:tree.ITree, event:keyboard.IKeyboardEvent):boolean { + public onPageUp(tree:tree.ITree, event:IKeyboardEvent):boolean { super.onPageUp(tree, event); this.fakeFocus(tree, event); return true; } - public onLeft(tree:tree.ITree, event:keyboard.IKeyboardEvent):boolean { + public onLeft(tree:tree.ITree, event:IKeyboardEvent):boolean { super.onLeft(tree, event); this.fakeFocus(tree, event); return true; } - public onDown(tree:tree.ITree, event:keyboard.IKeyboardEvent):boolean { + public onDown(tree:tree.ITree, event:IKeyboardEvent):boolean { super.onDown(tree, event); this.fakeFocus(tree, event); return true; } - public onPageDown(tree:tree.ITree, event:keyboard.IKeyboardEvent):boolean { + public onPageDown(tree:tree.ITree, event:IKeyboardEvent):boolean { super.onPageDown(tree, event); this.fakeFocus(tree, event); return true; } - public onRight(tree:tree.ITree, event:keyboard.IKeyboardEvent):boolean { + public onRight(tree:tree.ITree, event:IKeyboardEvent):boolean { super.onRight(tree, event); this.fakeFocus(tree, event); return true; } - private fakeFocus(tree:tree.ITree, event:keyboard.IKeyboardEvent):void { + private fakeFocus(tree:tree.ITree, event:IKeyboardEvent):void { // focus next item var focus = tree.getFocus(); tree.setSelection([focus]); @@ -310,10 +310,10 @@ class Controller extends treeDefaults.DefaultController { } } -class Renderer extends treeDefaults.LegacyRenderer { +class Renderer extends LegacyRenderer { private _contextService:IWorkspaceContextService; - constructor(private editor: EditorBrowser.ICodeEditor, @IWorkspaceContextService contextService:IWorkspaceContextService) { + constructor(private editor: ICodeEditor, @IWorkspaceContextService contextService:IWorkspaceContextService) { super(); this._contextService = contextService; } @@ -326,29 +326,29 @@ class Renderer extends treeDefaults.LegacyRenderer { dom.clearNode(container); - if(element instanceof referenceSearchModel.FileReferences) { - var fileReferences = element, - fileReferencesContainer = builder.$('.reference-file'); + if(element instanceof FileReferences) { + var fileReferences = element, + fileReferencesContainer = $('.reference-file'); /* tslint:disable:no-unused-expression */ - new leftRightWidget.LeftRightWidget(fileReferencesContainer, (left: HTMLElement) => { + new LeftRightWidget(fileReferencesContainer, (left: HTMLElement) => { var resource = fileReferences.resource; - new fileLabel.FileLabel(left, resource, this._contextService); + new FileLabel(left, resource, this._contextService); - return null; + return null; }, (right: HTMLElement) => { var len = fileReferences.children.length; - return new countBadge.CountBadge(right, len, len > 1 ? nls.localize('referencesCount', "{0} references", len) : nls.localize('referenceCount', "{0} reference", len)); + return new CountBadge(right, len, len > 1 ? nls.localize('referencesCount', "{0} references", len) : nls.localize('referenceCount', "{0} reference", len)); }); /* tslint:enable:no-unused-expression */ fileReferencesContainer.appendTo(container); - } else if(element instanceof referenceSearchModel.OneReference) { + } else if(element instanceof OneReference) { - var oneReference = element, - oneReferenceContainer = builder.$('.reference'), + var oneReference = element, + oneReferenceContainer = $('.reference'), preview = oneReference.parent.preview.preview(oneReference.range); oneReferenceContainer.innerHtml( @@ -367,7 +367,7 @@ class Renderer extends treeDefaults.LegacyRenderer { /** * ZoneWidget that is shown inside the editor */ -export class ReferenceWidget extends peekViewWidget.PeekViewWidget { +export class ReferenceWidget extends PeekViewWidget { public static INNER_EDITOR_CONTEXT_KEY = 'inReferenceSearchEditor'; @@ -380,21 +380,21 @@ export class ReferenceWidget extends peekViewWidget.PeekViewWidget { private instantiationService:IInstantiationService; private decorationsManager:DecorationsManager; - private model:referenceSearchModel.Model; - private callOnModel:lifecycle.IDisposable[]; + private model:ReferencesModel; + private callOnModel:IDisposable[]; - private tree:treeWidget.Tree; - private treeContainer:builder.Builder; + private tree:Tree; + private treeContainer:Builder; - private preview:EditorBrowser.ICodeEditor; - private previewNotAvailableMessage:codeEditorModel.Model; - private previewContainer: builder.Builder; + private preview:ICodeEditor; + private previewNotAvailableMessage:Model; + private previewContainer: Builder; private previewDecorations:string[]; - private messageContainer: builder.Builder; + private messageContainer: Builder; private lastHeight:string; - constructor(editorService:IEditorService, keybindingService: IKeybindingService, contextService:IWorkspaceContextService, instantiationService:IInstantiationService, editor:EditorBrowser.ICodeEditor) { + constructor(editorService:IEditorService, keybindingService: IKeybindingService, contextService:IWorkspaceContextService, instantiationService:IInstantiationService, editor:ICodeEditor) { super(editor, keybindingService, ReferenceWidget.INNER_EDITOR_CONTEXT_KEY, { frameColor: '#007ACC', showFrame: false, showArrow: true }); this.editorService = editorService; this.contextService = contextService; @@ -426,7 +426,7 @@ export class ReferenceWidget extends peekViewWidget.PeekViewWidget { } _fillBody(containerElement:HTMLElement):void { - var container = builder.$(containerElement); + var container = $(containerElement); container.addClass('reference-zone-widget'); @@ -436,21 +436,21 @@ export class ReferenceWidget extends peekViewWidget.PeekViewWidget { }); // editor - container.div({ 'class': 'preview inline' }, (div:builder.Builder) => { + container.div({ 'class': 'preview inline' }, (div:Builder) => { - var options:EditorCommon.IEditorOptions = { + var options:editorCommon.IEditorOptions = { scrollBeyondLastLine: false, scrollbar: DefaultConfig.editor.scrollbar, overviewRulerLanes: 2 }; - this.preview = this.instantiationService.createInstance(embeddedCodeEditorWidget.EmbeddedCodeEditorWidget, div.getHTMLElement(), options, this.editor); + this.preview = this.instantiationService.createInstance(EmbeddedCodeEditorWidget, div.getHTMLElement(), options, this.editor); this.previewContainer = div.hide(); - this.previewNotAvailableMessage = new codeEditorModel.Model(nls.localize('missingPreviewMessage', "no preview available"), null); + this.previewNotAvailableMessage = new Model(nls.localize('missingPreviewMessage', "no preview available"), null); }); // tree - container.div({ 'class': 'tree inline' }, (div:builder.Builder) => { + container.div({ 'class': 'tree inline' }, (div:Builder) => { var config = { dataSource: this.instantiationService.createInstance(DataSource), renderer: this.instantiationService.createInstance(Renderer, this.editor), @@ -463,7 +463,7 @@ export class ReferenceWidget extends peekViewWidget.PeekViewWidget { twistiePixels: 20, ariaLabel: nls.localize('treeAriaLabel', "References") }; - this.tree = new treeWidget.Tree(div.getHTMLElement(), config, options); + this.tree = new Tree(div.getHTMLElement(), config, options); this.treeContainer = div.hide(); }); @@ -492,9 +492,9 @@ export class ReferenceWidget extends peekViewWidget.PeekViewWidget { this.preview.layout(); } - public setModel(newModel: referenceSearchModel.Model): void { + public setModel(newModel: ReferencesModel): void { // clean up - this.callOnModel = lifecycle.disposeAll(this.callOnModel); + this.callOnModel = disposeAll(this.callOnModel); this.model = newModel; if (this.model) { this._onNewModel(); @@ -514,26 +514,26 @@ export class ReferenceWidget extends peekViewWidget.PeekViewWidget { this.callOnModel.push(this.decorationsManager); // listen on model changes - this.callOnModel.push(this.model.addListener2(referenceSearchModel.EventType.OnReferenceRangeChanged, (reference:referenceSearchModel.OneReference) => { + this.callOnModel.push(this.model.addListener2(EventType.OnReferenceRangeChanged, (reference:OneReference) => { this.tree.refresh(reference); })); // listen on selection and focus this.callOnModel.push(this.tree.addListener2(Controller.Events.FOCUSED, (element) => { - if (element instanceof referenceSearchModel.OneReference) { + if (element instanceof OneReference) { this.showReferencePreview(element); } })); this.callOnModel.push(this.tree.addListener2(Controller.Events.SELECTED, (element:any) => { - if (element instanceof referenceSearchModel.OneReference) { + if (element instanceof OneReference) { this.showReferencePreview(element); this.model.currentReference = element; } })); this.callOnModel.push(this.tree.addListener2(Controller.Events.OPEN_TO_SIDE, (element:any) => { - if (element instanceof referenceSearchModel.OneReference) { + if (element instanceof OneReference) { this.editorService.openEditor({ - resource: ( element).resource, + resource: ( element).resource, options: { selection: element.range } @@ -545,10 +545,10 @@ export class ReferenceWidget extends peekViewWidget.PeekViewWidget { this.tree.setInput(input).then(() => { this.tree.setSelection([this.model.currentReference]); - }).done(null, errors.onUnexpectedError); + }).done(null, onUnexpectedError); // listen on editor - this.callOnModel.push(this.preview.addListener2(EditorCommon.EventType.MouseDown, (e:{ event:MouseEvent; target:EditorBrowser.IMouseTarget; }) => { + this.callOnModel.push(this.preview.addListener2(editorCommon.EventType.MouseDown, (e:{ event:MouseEvent; target:IMouseTarget; }) => { if(e.event.detail === 2) { this.emit(ReferenceWidget.Events.EditorDoubleClick, { reference: this.getFocusedReference(), range: e.target.range, originalEvent: e.event }); } @@ -568,10 +568,10 @@ export class ReferenceWidget extends peekViewWidget.PeekViewWidget { private getFocusedReference(): URI { var element = this.tree.getFocus(); - if(element instanceof referenceSearchModel.OneReference) { - return ( element).resource; - } else if(element instanceof referenceSearchModel.FileReferences) { - var referenceFile = ( element); + if(element instanceof OneReference) { + return ( element).resource; + } else if(element instanceof FileReferences) { + var referenceFile = ( element); if(referenceFile.children.length > 0) { return referenceFile.children[0].resource; } @@ -583,7 +583,7 @@ export class ReferenceWidget extends peekViewWidget.PeekViewWidget { this.tree.DOMFocus(); } - private showReferencePreview(reference:referenceSearchModel.OneReference):void { + private showReferencePreview(reference:OneReference):void { // show in editor this.editorService.resolveEditorModel({ resource: reference.resource }).done((model) => { @@ -598,13 +598,13 @@ export class ReferenceWidget extends peekViewWidget.PeekViewWidget { } // Update widget header - if(reference.resource.scheme !== network.Schemas.inMemory) { - this.setTitle(reference.name, labels.getPathLabel(reference.directory, this.contextService)); + if(reference.resource.scheme !== Schemas.inMemory) { + this.setTitle(reference.name, getPathLabel(reference.directory, this.contextService)); } else { this.setTitle(nls.localize('peekView.alternateTitle', "References")); } - }, errors.onUnexpectedError); + }, onUnexpectedError); // show in tree this.tree.reveal(reference) @@ -612,12 +612,12 @@ export class ReferenceWidget extends peekViewWidget.PeekViewWidget { this.tree.setSelection([reference]); this.tree.setFocus(reference); }) - .done(null, errors.onUnexpectedError); + .done(null, onUnexpectedError); } public dispose(): void { this.setModel(null); - lifecycle.disposeAll([this.preview, this.previewNotAvailableMessage, this.tree]); + disposeAll([this.preview, this.previewNotAvailableMessage, this.tree]); super.dispose(); } } \ No newline at end of file diff --git a/src/vs/editor/contrib/smartSelect/common/smartSelect.ts b/src/vs/editor/contrib/smartSelect/common/smartSelect.ts index 631a51a50d6..026ea26c82d 100644 --- a/src/vs/editor/contrib/smartSelect/common/smartSelect.ts +++ b/src/vs/editor/contrib/smartSelect/common/smartSelect.ts @@ -5,28 +5,28 @@ 'use strict'; import * as nls from 'vs/nls'; -import Arrays = require('vs/base/common/arrays'); +import * as arrays from 'vs/base/common/arrays'; +import {KeyCode, KeyMod} from 'vs/base/common/keyCodes'; import {TPromise} from 'vs/base/common/winjs.base'; -import * as EditorCommon from 'vs/editor/common/editorCommon'; -import * as Modes from 'vs/editor/common/modes'; -import {CommonEditorRegistry, ContextKey, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions'; +import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation'; +import {Range} from 'vs/editor/common/core/range'; import {EditorAction} from 'vs/editor/common/editorAction'; import {Behaviour} from 'vs/editor/common/editorActionEnablement'; -import TokenSelectionSupport = require('./tokenSelectionSupport'); -import {Range} from 'vs/editor/common/core/range'; -import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation'; -import {KeyMod, KeyCode} from 'vs/base/common/keyCodes'; +import {EventType, ICommonCodeEditor, ICursorPositionChangedEvent, IEditorActionDescriptorData, IEditorRange} from 'vs/editor/common/editorCommon'; +import {CommonEditorRegistry, ContextKey, EditorActionDescriptor} from 'vs/editor/common/editorCommonExtensions'; +import {ILogicalSelectionEntry} from 'vs/editor/common/modes'; +import {TokenSelectionSupport} from './tokenSelectionSupport'; // --- selection state machine class State { - public editor:EditorCommon.ICommonCodeEditor; + public editor:ICommonCodeEditor; public next:State; public previous:State; - public selection:EditorCommon.IEditorRange; + public selection:IEditorRange; - constructor(editor:EditorCommon.ICommonCodeEditor) { + constructor(editor:ICommonCodeEditor) { this.editor = editor; this.next = null; this.previous = null; @@ -45,7 +45,7 @@ class SmartSelect extends EditorAction { private _forward: boolean; private _tokenSelectionSupport: TokenSelectionSupport; - constructor(descriptor:EditorCommon.IEditorActionDescriptorData, editor:EditorCommon.ICommonCodeEditor, forward: boolean, instantiationService: IInstantiationService) { + constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor, forward: boolean, instantiationService: IInstantiationService) { super(descriptor, editor, Behaviour.TextFocus | Behaviour.UpdateOnModelChange); this._tokenSelectionSupport = instantiationService.createInstance(TokenSelectionSupport); this._forward = forward; @@ -67,9 +67,9 @@ class SmartSelect extends EditorAction { var promise:TPromise = TPromise.as(null); if (!state) { - promise = selectionSupport.getRangesToPosition(model.getAssociatedResource(), selection.getStartPosition()).then((elements: Modes.ILogicalSelectionEntry[]) => { + promise = selectionSupport.getRangesToPosition(model.getAssociatedResource(), selection.getStartPosition()).then((elements: ILogicalSelectionEntry[]) => { - if (Arrays.isFalsyOrEmpty(elements)) { + if (arrays.isFalsyOrEmpty(elements)) { return; } @@ -101,7 +101,7 @@ class SmartSelect extends EditorAction { state = editorState; // listen to caret move and forget about state - var unhook: () => void = this.editor.addListener(EditorCommon.EventType.CursorPositionChanged,(e: EditorCommon.ICursorPositionChangedEvent) => { + var unhook: () => void = this.editor.addListener(EventType.CursorPositionChanged,(e: ICursorPositionChangedEvent) => { if (ignoreSelection) { return; } @@ -138,7 +138,7 @@ class GrowSelectionAction extends SmartSelect { public static ID = 'editor.action.smartSelect.grow'; - constructor(descriptor:EditorCommon.IEditorActionDescriptorData, editor:EditorCommon.ICommonCodeEditor, @IInstantiationService instantiationService: IInstantiationService) { + constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor, @IInstantiationService instantiationService: IInstantiationService) { super(descriptor, editor, true, instantiationService); } } @@ -147,7 +147,7 @@ class ShrinkSelectionAction extends SmartSelect { public static ID = 'editor.action.smartSelect.shrink'; - constructor(descriptor:EditorCommon.IEditorActionDescriptorData, editor:EditorCommon.ICommonCodeEditor, @IInstantiationService instantiationService: IInstantiationService) { + constructor(descriptor:IEditorActionDescriptorData, editor:ICommonCodeEditor, @IInstantiationService instantiationService: IInstantiationService) { super(descriptor, editor, false, instantiationService); } } diff --git a/src/vs/editor/contrib/smartSelect/common/tokenSelectionSupport.ts b/src/vs/editor/contrib/smartSelect/common/tokenSelectionSupport.ts index 83cf7a05bfc..2935372261a 100644 --- a/src/vs/editor/contrib/smartSelect/common/tokenSelectionSupport.ts +++ b/src/vs/editor/contrib/smartSelect/common/tokenSelectionSupport.ts @@ -6,13 +6,13 @@ import URI from 'vs/base/common/uri'; import {TPromise} from 'vs/base/common/winjs.base'; -import tokenTree = require('./tokenTree'); -import * as EditorCommon from 'vs/editor/common/editorCommon'; -import * as Modes from 'vs/editor/common/modes'; -import {IModelService} from 'vs/editor/common/services/modelService'; import {Range} from 'vs/editor/common/core/range'; +import {IModel, IPosition, IRange} from 'vs/editor/common/editorCommon'; +import {ILogicalSelectionEntry, ILogicalSelectionSupport} from 'vs/editor/common/modes'; +import {IModelService} from 'vs/editor/common/services/modelService'; +import {Node, build, find} from './tokenTree'; -class TokenSelectionSupport implements Modes.ILogicalSelectionSupport { +export class TokenSelectionSupport implements ILogicalSelectionSupport { private _modelService: IModelService; @@ -20,13 +20,13 @@ class TokenSelectionSupport implements Modes.ILogicalSelectionSupport { this._modelService = modelService; } - public getRangesToPosition(resource: URI, position: EditorCommon.IPosition): TPromise { + public getRangesToPosition(resource: URI, position: IPosition): TPromise { return TPromise.as(this.getRangesToPositionSync(resource, position)); } - public getRangesToPositionSync(resource: URI, position: EditorCommon.IPosition): Modes.ILogicalSelectionEntry[] { + public getRangesToPositionSync(resource: URI, position: IPosition): ILogicalSelectionEntry[] { var model = this._modelService.getModel(resource), - entries: Modes.ILogicalSelectionEntry[] = []; + entries: ILogicalSelectionEntry[] = []; if (model) { this._doGetRangesToPosition(model, position).forEach(range => { @@ -40,14 +40,14 @@ class TokenSelectionSupport implements Modes.ILogicalSelectionSupport { return entries; } - private _doGetRangesToPosition(model: EditorCommon.IModel, position: EditorCommon.IPosition): EditorCommon.IRange[] { + private _doGetRangesToPosition(model: IModel, position: IPosition): IRange[] { - var tree = tokenTree.build(model), - node: tokenTree.Node, - lastRange: EditorCommon.IRange; + var tree = build(model), + node: Node, + lastRange: IRange; - node = tokenTree.find(tree, position); - var ranges: EditorCommon.IRange[] = []; + node = find(tree, position); + var ranges: IRange[] = []; while (node) { if (!lastRange || !Range.equalsRange(lastRange, node.range)) { ranges.push(node.range); @@ -60,5 +60,3 @@ class TokenSelectionSupport implements Modes.ILogicalSelectionSupport { } } - -export = TokenSelectionSupport; \ No newline at end of file diff --git a/src/vs/editor/contrib/smartSelect/test/common/tokenSelectionSupport.test.ts b/src/vs/editor/contrib/smartSelect/test/common/tokenSelectionSupport.test.ts index 0f3a152d82a..a17e005a644 100644 --- a/src/vs/editor/contrib/smartSelect/test/common/tokenSelectionSupport.test.ts +++ b/src/vs/editor/contrib/smartSelect/test/common/tokenSelectionSupport.test.ts @@ -5,22 +5,22 @@ 'use strict'; import 'vs/languages/javascript/common/javascript.contribution'; -import assert = require('assert'); -import * as Modes from 'vs/editor/common/modes'; -import modesUtil = require('vs/editor/test/common/modesUtil'); -import {createMockModelService} from 'vs/editor/test/common/servicesTestUtils'; +import * as assert from 'assert'; import URI from 'vs/base/common/uri'; -import TokenSelectionSupport = require('vs/editor/contrib/smartSelect/common/tokenSelectionSupport'); import {Range} from 'vs/editor/common/core/range'; +import {IMode} from 'vs/editor/common/modes'; +import {TokenSelectionSupport} from 'vs/editor/contrib/smartSelect/common/tokenSelectionSupport'; +import {load} from 'vs/editor/test/common/modesUtil'; +import {createMockModelService} from 'vs/editor/test/common/servicesTestUtils'; suite('TokenSelectionSupport', () => { let modelService = createMockModelService(); let tokenSelectionSupport = new TokenSelectionSupport(modelService); - let _mode: Modes.IMode; + let _mode: IMode; suiteSetup((done) => { - modesUtil.load('javascript').then(mode => { + load('javascript').then(mode => { _mode = mode; done(); }); diff --git a/src/vs/editor/node/textMate/TMSnippets.ts b/src/vs/editor/node/textMate/TMSnippets.ts index 053b87e9569..e084cfc017a 100644 --- a/src/vs/editor/node/textMate/TMSnippets.ts +++ b/src/vs/editor/node/textMate/TMSnippets.ts @@ -5,17 +5,16 @@ 'use strict'; import * as nls from 'vs/nls'; +import {parse} from 'vs/base/common/json'; +import * as paths from 'vs/base/common/paths'; import {TPromise} from 'vs/base/common/winjs.base'; -import * as Modes from 'vs/editor/common/modes'; -import snippets = require('vs/editor/contrib/snippet/common/snippet'); -import json = require('vs/base/common/json'); -import paths = require('vs/base/common/paths'); -import {IModelService} from 'vs/editor/common/services/modelService'; -import {IModeService} from 'vs/editor/common/services/modeService'; -import {PluginsRegistry, IMessageCollector} from 'vs/platform/plugins/common/pluginsRegistry'; +import {readFile} from 'vs/base/node/pfs'; +import {IMessageCollector, PluginsRegistry} from 'vs/platform/plugins/common/pluginsRegistry'; +import {ISuggestion} from 'vs/editor/common/modes'; import {SnippetsRegistry} from 'vs/editor/common/modes/supports'; - -import pfs = require('vs/base/node/pfs'); +import {IModeService} from 'vs/editor/common/services/modeService'; +import {IModelService} from 'vs/editor/common/services/modelService'; +import {CodeSnippet, ExternalSnippetType} from 'vs/editor/contrib/snippet/common/snippet'; export interface ITMSnippetsExtensionPoint { language: string; @@ -23,10 +22,10 @@ export interface ITMSnippetsExtensionPoint { } export function snippetUpdated(modeId: string, filePath: string): TPromise { - return pfs.readFile(filePath).then((fileContents) => { + return readFile(filePath).then((fileContents) => { var errors: string[] = []; - var snippets = json.parse(fileContents.toString(), errors); - var adaptedSnippets = TMSnippetsAdaptor.adapt(snippets); + var snippetsObj = parse(fileContents.toString(), errors); + var adaptedSnippets = TMSnippetsAdaptor.adapt(snippetsObj); SnippetsRegistry.registerSnippets(modeId, filePath, adaptedSnippets); }); } @@ -40,11 +39,11 @@ let snippetsExtensionPoint = PluginsRegistry.registerExtensionPoint { + readFile(filePath).then((fileContents) => { var errors: string[] = []; - var snippets = json.parse(fileContents.toString(), errors); - var adaptedSnippets = TMSnippetsAdaptor.adapt(snippets); + var snippetsObj = parse(fileContents.toString(), errors); + var adaptedSnippets = TMSnippetsAdaptor.adapt(snippetsObj); SnippetsRegistry.registerDefaultSnippets(modeId, adaptedSnippets); }); } @@ -106,9 +105,9 @@ export class MainProcessTextMateSnippet { class TMSnippetsAdaptor { - public static adapt(snippets: any): Modes.ISuggestion[]{ - var topLevelProperties = Object.keys(snippets), - result: Modes.ISuggestion[] = []; + public static adapt(snippetsObj: any): ISuggestion[]{ + var topLevelProperties = Object.keys(snippetsObj), + result: ISuggestion[] = []; var processSnippet = (snippet: any, description: string) => { var prefix = snippet['prefix']; @@ -133,7 +132,7 @@ class TMSnippetsAdaptor { }; topLevelProperties.forEach(topLevelProperty => { - var scopeOrTemplate = snippets[topLevelProperty]; + var scopeOrTemplate = snippetsObj[topLevelProperty]; if (scopeOrTemplate['body'] && scopeOrTemplate['prefix']) { processSnippet(scopeOrTemplate, topLevelProperty); } else { @@ -147,6 +146,6 @@ class TMSnippetsAdaptor { } private static convertSnippet(textMateSnippet: string): string { - return snippets.CodeSnippet.convertExternalSnippet(textMateSnippet, snippets.ExternalSnippetType.TextMateSnippet); + return CodeSnippet.convertExternalSnippet(textMateSnippet, ExternalSnippetType.TextMateSnippet); } } diff --git a/src/vs/platform/keybinding/browser/keybindingServiceImpl.ts b/src/vs/platform/keybinding/browser/keybindingServiceImpl.ts index e2442c2f9c2..0a5b0f1b15a 100644 --- a/src/vs/platform/keybinding/browser/keybindingServiceImpl.ts +++ b/src/vs/platform/keybinding/browser/keybindingServiceImpl.ts @@ -5,20 +5,19 @@ 'use strict'; import 'vs/css!./keybindings'; - import * as nls from 'vs/nls'; +import {IHTMLContentElement} from 'vs/base/common/htmlContent'; +import {KeyCode, Keybinding} from 'vs/base/common/keyCodes'; +import {IDisposable} from 'vs/base/common/lifecycle'; import Severity from 'vs/base/common/severity'; import {TPromise} from 'vs/base/common/winjs.base'; -import {IDisposable} from 'vs/base/common/lifecycle'; -import * as DOM from 'vs/base/browser/dom'; -import {KeybindingsRegistry} from 'vs/platform/keybinding/common/keybindingsRegistry'; -import {IKeybindingService, IKeybindingScopeLocation, ICommandHandler, IKeybindingItem, IKeybindingContextKey} from 'vs/platform/keybinding/common/keybindingService'; +import * as dom from 'vs/base/browser/dom'; +import {IKeyboardEvent, StandardKeyboardEvent} from 'vs/base/browser/keyboardEvent'; import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation'; -import {IMessageService} from 'vs/platform/message/common/message'; import {KeybindingResolver} from 'vs/platform/keybinding/common/keybindingResolver'; -import {Keybinding, KeyCode} from 'vs/base/common/keyCodes'; -import {IHTMLContentElement} from 'vs/base/common/htmlContent'; -import {StandardKeyboardEvent, IKeyboardEvent} from 'vs/base/browser/keyboardEvent'; +import {ICommandHandler, IKeybindingContextKey, IKeybindingItem, IKeybindingScopeLocation, IKeybindingService} from 'vs/platform/keybinding/common/keybindingService'; +import {KeybindingsRegistry} from 'vs/platform/keybinding/common/keybindingsRegistry'; +import {IMessageService} from 'vs/platform/message/common/message'; let KEYBINDING_CONTEXT_ATTR = 'data-keybinding-context'; @@ -149,7 +148,7 @@ export class KeybindingService extends AbstractKeybindingService implements IKey this._domNode = domNode; this._contexts = Object.create(null); this._contexts[String(this._myContextId)] = new KeybindingContext(this._myContextId, null); - this._toDispose = DOM.addDisposableListener(this._domNode, DOM.EventType.KEY_DOWN, (e: KeyboardEvent) => { + this._toDispose = dom.addDisposableListener(this._domNode, dom.EventType.KEY_DOWN, (e: KeyboardEvent) => { let keyEvent = new StandardKeyboardEvent(e); this._dispatch(keyEvent); }); diff --git a/src/vs/platform/keybinding/common/keybindingResolver.ts b/src/vs/platform/keybinding/common/keybindingResolver.ts index dfd876d4a68..dc2b6783dcf 100644 --- a/src/vs/platform/keybinding/common/keybindingResolver.ts +++ b/src/vs/platform/keybinding/common/keybindingResolver.ts @@ -4,9 +4,9 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import * as defaultPlatform from 'vs/base/common/platform'; -import {IKeybindingItem, KbExpr, IUserFriendlyKeybinding} from 'vs/platform/keybinding/common/keybindingService'; -import {BinaryKeybindings, Keybinding, ISimplifiedPlatform} from 'vs/base/common/keyCodes'; +import {BinaryKeybindings, ISimplifiedPlatform, Keybinding} from 'vs/base/common/keyCodes'; +import * as platform from 'vs/base/common/platform'; +import {IKeybindingItem, IUserFriendlyKeybinding, KbExpr} from 'vs/platform/keybinding/common/keybindingService'; export interface IResolveResult { enterChord: number; @@ -354,11 +354,11 @@ export class IOSupport { }; } - public static writeKeybinding(input: number, Platform: ISimplifiedPlatform = defaultPlatform): string { + public static writeKeybinding(input: number, Platform: ISimplifiedPlatform = platform): string { return Keybinding.toUserSettingsLabel(input, Platform); } - public static readKeybinding(input: string, Platform: ISimplifiedPlatform = defaultPlatform): number { + public static readKeybinding(input: string, Platform: ISimplifiedPlatform = platform): number { return Keybinding.fromUserSettingsLabel(input, Platform); } diff --git a/src/vs/platform/keybinding/common/keybindingService.ts b/src/vs/platform/keybinding/common/keybindingService.ts index c5b4592d5f6..e530b97c734 100644 --- a/src/vs/platform/keybinding/common/keybindingService.ts +++ b/src/vs/platform/keybinding/common/keybindingService.ts @@ -4,11 +4,11 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import {TPromise} from 'vs/base/common/winjs.base'; -import {TypeConstraint} from 'vs/base/common/types'; -import {createDecorator, ServiceIdentifier, ServicesAccessor} from 'vs/platform/instantiation/common/instantiation'; -import {Keybinding} from 'vs/base/common/keyCodes'; import {IHTMLContentElement} from 'vs/base/common/htmlContent'; +import {Keybinding} from 'vs/base/common/keyCodes'; +import {TypeConstraint} from 'vs/base/common/types'; +import {TPromise} from 'vs/base/common/winjs.base'; +import {ServiceIdentifier, ServicesAccessor, createDecorator} from 'vs/platform/instantiation/common/instantiation'; export interface IUserFriendlyKeybinding { key: string; diff --git a/src/vs/platform/keybinding/common/keybindingsRegistry.ts b/src/vs/platform/keybinding/common/keybindingsRegistry.ts index 837cbbc96d6..eac25c75c77 100644 --- a/src/vs/platform/keybinding/common/keybindingsRegistry.ts +++ b/src/vs/platform/keybinding/common/keybindingsRegistry.ts @@ -4,11 +4,11 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import {Registry} from 'vs/platform/platform'; +import {BinaryKeybindings, KeyCode} from 'vs/base/common/keyCodes'; +import * as platform from 'vs/base/common/platform'; import {TypeConstraint, validateConstraints} from 'vs/base/common/types'; import {ICommandHandler, ICommandHandlerDescription, ICommandsMap, IKeybindingItem, IKeybindings, KbExpr} from 'vs/platform/keybinding/common/keybindingService'; -import {KeyCode, BinaryKeybindings} from 'vs/base/common/keyCodes'; -import Platform = require('vs/base/common/platform'); +import {Registry} from 'vs/platform/platform'; export interface ICommandRule extends IKeybindings { id: string; @@ -68,11 +68,11 @@ class KeybindingsRegistryImpl implements IKeybindingsRegistry { * Take current platform into account and reduce to primary & secondary. */ private static bindToCurrentPlatform(kb: IKeybindings): { primary?: number; secondary?: number[]; } { - if (Platform.isWindows) { + if (platform.isWindows) { if (kb && kb.win) { return kb.win; } - } else if (Platform.isMacintosh) { + } else if (platform.isMacintosh) { if (kb && kb.mac) { return kb.mac; } @@ -132,7 +132,7 @@ class KeybindingsRegistryImpl implements IKeybindingsRegistry { } private registerDefaultKeybinding(keybinding: number, commandId: string, weight1: number, weight2: number, context: KbExpr): void { - if (Platform.isWindows) { + if (platform.isWindows) { if (BinaryKeybindings.hasCtrlCmd(keybinding) && !BinaryKeybindings.hasShift(keybinding) && BinaryKeybindings.hasAlt(keybinding) && !BinaryKeybindings.hasWinCtrl(keybinding)) { if (/^[A-Z0-9\[\]\|\;\'\,\.\/\`]$/.test(KeyCode.toString(BinaryKeybindings.extractKeyCode(keybinding)))) { console.warn('Ctrl+Alt+ keybindings should not be used by default under Windows. Offender: ', keybinding, ' for ', commandId); diff --git a/src/vs/platform/keybinding/test/common/keybindingIO.test.ts b/src/vs/platform/keybinding/test/common/keybindingIO.test.ts index 79619ff3ee1..1962a7a997e 100644 --- a/src/vs/platform/keybinding/test/common/keybindingIO.test.ts +++ b/src/vs/platform/keybinding/test/common/keybindingIO.test.ts @@ -5,8 +5,8 @@ 'use strict'; import * as assert from 'assert'; +import {ISimplifiedPlatform, KeyCode, KeyMod} from 'vs/base/common/keyCodes'; import {IOSupport} from 'vs/platform/keybinding/common/keybindingResolver'; -import {KeyMod, KeyCode, ISimplifiedPlatform} from 'vs/base/common/keyCodes'; suite('Keybinding IO', () => { diff --git a/src/vs/platform/keybinding/test/common/keybindingService.test.ts b/src/vs/platform/keybinding/test/common/keybindingService.test.ts index 2bb8c422d88..62c4b745adf 100644 --- a/src/vs/platform/keybinding/test/common/keybindingService.test.ts +++ b/src/vs/platform/keybinding/test/common/keybindingService.test.ts @@ -5,9 +5,9 @@ 'use strict'; import * as assert from 'assert'; -import {KeybindingResolver, IOSupport} from 'vs/platform/keybinding/common/keybindingResolver'; -import {KbExpr, KbAndExpression, IKeybindingItem} from 'vs/platform/keybinding/common/keybindingService'; -import {KeyMod, KeyCode, BinaryKeybindings} from 'vs/base/common/keyCodes'; +import {BinaryKeybindings, KeyCode, KeyMod} from 'vs/base/common/keyCodes'; +import {IOSupport, KeybindingResolver} from 'vs/platform/keybinding/common/keybindingResolver'; +import {IKeybindingItem, KbAndExpression, KbExpr} from 'vs/platform/keybinding/common/keybindingService'; suite('Keybinding Service', () => { diff --git a/src/vs/platform/keybinding/test/common/mockKeybindingService.ts b/src/vs/platform/keybinding/test/common/mockKeybindingService.ts index 2e0bbc6bffe..6f19797b11e 100644 --- a/src/vs/platform/keybinding/test/common/mockKeybindingService.ts +++ b/src/vs/platform/keybinding/test/common/mockKeybindingService.ts @@ -4,10 +4,10 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import {IKeybindingService, IKeybindingContextKey} from 'vs/platform/keybinding/common/keybindingService'; -import {Keybinding} from 'vs/base/common/keyCodes'; import {IHTMLContentElement} from 'vs/base/common/htmlContent'; +import {Keybinding} from 'vs/base/common/keyCodes'; import {TPromise} from 'vs/base/common/winjs.base'; +import {IKeybindingContextKey, IKeybindingService} from 'vs/platform/keybinding/common/keybindingService'; class MockKeybindingContextKey implements IKeybindingContextKey { private _key: string; diff --git a/src/vs/platform/plugins/common/abstractPluginService.ts b/src/vs/platform/plugins/common/abstractPluginService.ts index d3780b4f3bb..f2a7346db72 100644 --- a/src/vs/platform/plugins/common/abstractPluginService.ts +++ b/src/vs/platform/plugins/common/abstractPluginService.ts @@ -4,12 +4,12 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import nls = require('vs/nls'); -import {IPluginDescription, IPluginService, IMessage, IActivationEventListener, IPluginStatus } from 'vs/platform/plugins/common/plugins'; -import WinJS = require('vs/base/common/winjs.base'); +import * as nls from 'vs/nls'; import {IDisposable} from 'vs/base/common/lifecycle'; -import {PluginsRegistry} from 'vs/platform/plugins/common/pluginsRegistry'; import Severity from 'vs/base/common/severity'; +import {TPromise} from 'vs/base/common/winjs.base'; +import {IActivationEventListener, IMessage, IPluginDescription, IPluginService, IPluginStatus} from 'vs/platform/plugins/common/plugins'; +import {PluginsRegistry} from 'vs/platform/plugins/common/pluginsRegistry'; const hasOwnProperty = Object.hasOwnProperty; @@ -39,7 +39,7 @@ export interface IActivatedPluginMap { } interface IActivatingPluginMap { - [pluginId: string]: WinJS.TPromise; + [pluginId: string]: TPromise; } export abstract class AbstractPluginService implements IPluginService { @@ -47,15 +47,15 @@ export abstract class AbstractPluginService implement private activatingPlugins: IActivatingPluginMap; protected activatedPlugins: IActivatedPluginMap; - private _onReady: WinJS.TPromise; + private _onReady: TPromise; private _onReadyC: (v: boolean) => void; constructor(isReadyByDefault: boolean) { if (isReadyByDefault) { - this._onReady = WinJS.TPromise.as(true); + this._onReady = TPromise.as(true); this._onReadyC = (v: boolean) => { /*No-op*/ }; } else { - this._onReady = new WinJS.TPromise((c, e, p) => { + this._onReady = new TPromise((c, e, p) => { this._onReadyC = c; }, () => { console.warn('You should really not try to cancel this ready promise!'); @@ -83,7 +83,7 @@ export abstract class AbstractPluginService implement PluginsRegistry.registerOneTimeActivationEventListener(activationEvent, listener); } - public onReady(): WinJS.TPromise { + public onReady(): TPromise { return this._onReady; } @@ -96,7 +96,7 @@ export abstract class AbstractPluginService implement return hasOwnProperty.call(this.activatedPlugins, pluginId); } - public activateByEvent(activationEvent: string): WinJS.TPromise { + public activateByEvent(activationEvent: string): TPromise { return this._onReady.then(() => { PluginsRegistry.triggerActivationEventListeners(activationEvent); let activatePlugins = PluginsRegistry.getPluginDescriptionsForActivationEvent(activationEvent); @@ -104,7 +104,7 @@ export abstract class AbstractPluginService implement }); } - public activateAndGet(pluginId: string): WinJS.TPromise { + public activateAndGet(pluginId: string): TPromise { return this._onReady.then(() => { let desc = PluginsRegistry.getPluginDescription(pluginId); if (!desc) { @@ -156,15 +156,15 @@ export abstract class AbstractPluginService implement } } - private _activatePlugins(pluginDescriptions: IPluginDescription[], recursionLevel: number): WinJS.TPromise { + private _activatePlugins(pluginDescriptions: IPluginDescription[], recursionLevel: number): TPromise { // console.log(recursionLevel, '_activatePlugins: ', pluginDescriptions.map(p => p.id)); if (pluginDescriptions.length === 0) { - return WinJS.TPromise.as(void 0); + return TPromise.as(void 0); } pluginDescriptions = pluginDescriptions.filter((p) => !hasOwnProperty.call(this.activatedPlugins, p.id)); if (pluginDescriptions.length === 0) { - return WinJS.TPromise.as(void 0); + return TPromise.as(void 0); } if (recursionLevel > 10) { @@ -174,7 +174,7 @@ export abstract class AbstractPluginService implement this._showMessage(Severity.Error, nls.localize('failedDep2', "Extension `{0}` failed to activate. Reason: more than 10 levels of dependencies (most likely a dependency loop).", pluginDescriptions[i].id)); this.activatedPlugins[pluginDescriptions[i].id] = this._createFailedPlugin(); } - return WinJS.TPromise.as(void 0); + return TPromise.as(void 0); } let greenMap: { [id: string]: IPluginDescription; } = Object.create(null), @@ -198,7 +198,7 @@ export abstract class AbstractPluginService implement if (red.length === 0) { // Finally reached only leafs! - return WinJS.TPromise.join(green.map((p) => this._activatePlugin(p))).then(_ => void 0); + return TPromise.join(green.map((p) => this._activatePlugin(p))).then(_ => void 0); } return this._activatePlugins(green, recursionLevel + 1).then(_ => { @@ -206,9 +206,9 @@ export abstract class AbstractPluginService implement }); } - protected _activatePlugin(pluginDescription: IPluginDescription): WinJS.TPromise { + protected _activatePlugin(pluginDescription: IPluginDescription): TPromise { if (hasOwnProperty.call(this.activatedPlugins, pluginDescription.id)) { - return WinJS.TPromise.as(void 0); + return TPromise.as(void 0); } if (hasOwnProperty.call(this.activatingPlugins, pluginDescription.id)) { @@ -231,11 +231,11 @@ export abstract class AbstractPluginService implement protected abstract _createFailedPlugin(): T; - protected abstract _actualActivatePlugin(pluginDescription: IPluginDescription): WinJS.TPromise; + protected abstract _actualActivatePlugin(pluginDescription: IPluginDescription): TPromise; } -export function loadAMDModule(moduleId: string): WinJS.TPromise { - return new WinJS.TPromise((c, e, p) => { +export function loadAMDModule(moduleId: string): TPromise { + return new TPromise((c, e, p) => { require([moduleId], (r: T) => { c(r); }, e); diff --git a/src/vs/platform/plugins/common/nativePluginService.ts b/src/vs/platform/plugins/common/nativePluginService.ts index f8cc27f72e2..b66c238f7e5 100644 --- a/src/vs/platform/plugins/common/nativePluginService.ts +++ b/src/vs/platform/plugins/common/nativePluginService.ts @@ -4,19 +4,19 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import {IPluginDescription, IMessage, IPluginStatus} from 'vs/platform/plugins/common/plugins'; -import {PluginsRegistry} from 'vs/platform/plugins/common/pluginsRegistry'; -import WinJS = require('vs/base/common/winjs.base'); -import {IDisposable} from 'vs/base/common/lifecycle'; -import {Remotable, IThreadService} from 'vs/platform/thread/common/thread'; -import {ActivatedPlugin, AbstractPluginService, IPluginContext, IPluginMemento, loadAMDModule} from 'vs/platform/plugins/common/abstractPluginService'; -import Severity from 'vs/base/common/severity'; -import {IMessageService} from 'vs/platform/message/common/message'; -import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry'; -import {PluginHostStorage} from 'vs/platform/storage/common/remotable.storage'; -import * as paths from 'vs/base/common/paths'; -import {IWorkspaceContextService} from 'vs/platform/workspace/common/workspace'; import {disposeAll} from 'vs/base/common/lifecycle'; +import {IDisposable} from 'vs/base/common/lifecycle'; +import * as paths from 'vs/base/common/paths'; +import Severity from 'vs/base/common/severity'; +import {TPromise} from 'vs/base/common/winjs.base'; +import {IMessageService} from 'vs/platform/message/common/message'; +import {AbstractPluginService, ActivatedPlugin, IPluginContext, IPluginMemento, loadAMDModule} from 'vs/platform/plugins/common/abstractPluginService'; +import {IMessage, IPluginDescription, IPluginStatus} from 'vs/platform/plugins/common/plugins'; +import {PluginsRegistry} from 'vs/platform/plugins/common/pluginsRegistry'; +import {PluginHostStorage} from 'vs/platform/storage/common/remotable.storage'; +import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry'; +import {IThreadService, Remotable} from 'vs/platform/thread/common/thread'; +import {IWorkspaceContextService} from 'vs/platform/workspace/common/workspace'; const hasOwnProperty = Object.hasOwnProperty; @@ -26,7 +26,7 @@ class PluginMemento implements IPluginMemento { private _shared: boolean; private _storage: PluginHostStorage; - private _init: WinJS.TPromise; + private _init: TPromise; private _value: { [n: string]: any; }; constructor(id: string, global: boolean, storage: PluginHostStorage) { @@ -40,7 +40,7 @@ class PluginMemento implements IPluginMemento { }); } - get whenReady(): WinJS.TPromise { + get whenReady(): TPromise { return this._init; } @@ -206,7 +206,7 @@ export class MainProcessPluginService extends AbstractPluginService { + protected _actualActivatePlugin(pluginDescription: IPluginDescription): TPromise { let event = this.getTelemetryActivationEvent(pluginDescription); this._telemetryService.publicLog('activatePlugin', event); // redirect plugin activation to the plugin host @@ -233,7 +233,7 @@ export class MainProcessPluginService extends AbstractPluginService; + activate(ctx: IPluginContext): TPromise; deactivate(): void; } @@ -338,7 +338,7 @@ export class PluginHostPluginService extends AbstractPluginService { + protected _loadPluginModule(pluginDescription: IPluginDescription): TPromise { if (pluginDescription.isAMD) { return loadAMDModule(uriFromPath(pluginDescription.main)); } @@ -346,12 +346,12 @@ export class PluginHostPluginService extends AbstractPluginService { + protected _loadPluginContext(pluginDescription: IPluginDescription): TPromise { let globalState = new PluginMemento(pluginDescription.id, true, this._storage); let workspaceState = new PluginMemento(pluginDescription.id, false, this._storage); - return WinJS.TPromise.join([globalState.whenReady, workspaceState.whenReady]).then(() => { + return TPromise.join([globalState.whenReady, workspaceState.whenReady]).then(() => { return Object.freeze({ globalState, workspaceState, @@ -362,7 +362,7 @@ export class PluginHostPluginService extends AbstractPluginService { + protected _actualActivatePlugin(pluginDescription: IPluginDescription): TPromise { return this._superActualActivatePlugin(pluginDescription).then((activatedPlugin) => { this._proxy.$onPluginActivatedInPluginHost(pluginDescription.id); @@ -373,11 +373,11 @@ export class PluginHostPluginService extends AbstractPluginService { + private _superActualActivatePlugin(pluginDescription: IPluginDescription): TPromise { if (!pluginDescription.main) { // Treat the plugin as being empty => NOT AN ERROR CASE - return WinJS.TPromise.as(new EmptyPlugin()); + return TPromise.as(new EmptyPlugin()); } return this._loadPluginModule(pluginDescription).then((pluginModule) => { return this._loadPluginContext(pluginDescription).then(context => { @@ -386,7 +386,7 @@ export class PluginHostPluginService extends AbstractPluginService { + private static _callActivate(pluginModule: IPluginModule, context: IPluginContext): TPromise { // Make sure the plugin's surface is not undefined pluginModule = pluginModule || { activate: undefined, @@ -399,35 +399,35 @@ export class PluginHostPluginService extends AbstractPluginService { + private static _callActivateOptional(pluginModule: IPluginModule, context: IPluginContext): TPromise { if (typeof pluginModule.activate === 'function') { try { - return WinJS.TPromise.as(pluginModule.activate.apply(global, [context])); + return TPromise.as(pluginModule.activate.apply(global, [context])); } catch (err) { - return WinJS.TPromise.wrapError(err); + return TPromise.wrapError(err); } } else { // No activate found => the module is the plugin's exports - return WinJS.TPromise.as(pluginModule); + return TPromise.as(pluginModule); } } // -- called by main thread - public $activatePluginInPluginHost(pluginDescription: IPluginDescription): WinJS.TPromise { + public $activatePluginInPluginHost(pluginDescription: IPluginDescription): TPromise { return this._activatePlugin(pluginDescription); } } -function loadCommonJSModule(modulePath: string): WinJS.TPromise { +function loadCommonJSModule(modulePath: string): TPromise { let r: T = null; try { r = require.__$__nodeRequire(modulePath); } catch (e) { - return WinJS.TPromise.wrapError(e); + return TPromise.wrapError(e); } - return WinJS.TPromise.as(r); + return TPromise.as(r); } diff --git a/src/vs/platform/plugins/common/plugins.ts b/src/vs/platform/plugins/common/plugins.ts index 32ea486049b..f32ae33e7fa 100644 --- a/src/vs/platform/plugins/common/plugins.ts +++ b/src/vs/platform/plugins/common/plugins.ts @@ -4,9 +4,9 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import {createDecorator, ServiceIdentifier} from 'vs/platform/instantiation/common/instantiation'; -import {TPromise} from 'vs/base/common/winjs.base'; import Severity from 'vs/base/common/severity'; +import {TPromise} from 'vs/base/common/winjs.base'; +import {ServiceIdentifier, createDecorator} from 'vs/platform/instantiation/common/instantiation'; export interface IPluginDescription { id: string; diff --git a/src/vs/platform/plugins/common/pluginsRegistry.ts b/src/vs/platform/plugins/common/pluginsRegistry.ts index 9868a46fe7b..1538b1ae017 100644 --- a/src/vs/platform/plugins/common/pluginsRegistry.ts +++ b/src/vs/platform/plugins/common/pluginsRegistry.ts @@ -4,14 +4,14 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import {IPluginDescription, IPointListener, IActivationEventListener, IMessage} from 'vs/platform/plugins/common/plugins'; -import {Registry} from 'vs/platform/platform'; -import Errors = require('vs/base/common/errors'); -import * as JSONContributionRegistry from 'vs/platform/jsonschemas/common/jsonContributionRegistry'; +import * as nls from 'vs/nls'; +import {onUnexpectedError} from 'vs/base/common/errors'; import {IJSONSchema} from 'vs/base/common/jsonSchema'; -import nls = require('vs/nls'); -import paths = require('vs/base/common/paths'); +import * as paths from 'vs/base/common/paths'; import Severity from 'vs/base/common/severity'; +import {Extensions, IJSONContributionRegistry} from 'vs/platform/jsonschemas/common/jsonContributionRegistry'; +import {Registry} from 'vs/platform/platform'; +import {IActivationEventListener, IMessage, IPluginDescription, IPointListener} from 'vs/platform/plugins/common/plugins'; export interface IMessageCollector { error(message: any): void; @@ -201,7 +201,7 @@ interface IPluginDescriptionMap { [pluginId: string]: IPluginDescription; } const hasOwnProperty = Object.hasOwnProperty; -let schemaRegistry = Registry.as(JSONContributionRegistry.Extensions.JSONContribution); +let schemaRegistry = Registry.as(Extensions.JSONContribution); export interface IExtensionPointUser { description: IPluginDescription; @@ -429,7 +429,7 @@ class PluginsRegistryImpl implements IPluginsRegistry { try { handler.listener(desc); } catch (e) { - Errors.onUnexpectedError(e); + onUnexpectedError(e); } } @@ -503,7 +503,7 @@ class PluginsRegistryImpl implements IPluginsRegistry { try { listener(); } catch (e) { - Errors.onUnexpectedError(e); + onUnexpectedError(e); } } } @@ -523,11 +523,11 @@ function _isStringArray(arr: string[]): boolean { return true; } -const Extensions = { +const PRExtensions = { PluginsRegistry: 'PluginsRegistry' }; -Registry.add(Extensions.PluginsRegistry, new PluginsRegistryImpl()); -export const PluginsRegistry: IPluginsRegistry = Registry.as(Extensions.PluginsRegistry); +Registry.add(PRExtensions.PluginsRegistry, new PluginsRegistryImpl()); +export const PluginsRegistry: IPluginsRegistry = Registry.as(PRExtensions.PluginsRegistry); schemaRegistry.registerSchema(schemaId, schema); schemaRegistry.addSchemaFileAssociation('/package.json', schemaId); \ No newline at end of file diff --git a/src/vs/platform/plugins/node/pluginVersionValidator.ts b/src/vs/platform/plugins/node/pluginVersionValidator.ts index 766868705ab..2597db5e27d 100644 --- a/src/vs/platform/plugins/node/pluginVersionValidator.ts +++ b/src/vs/platform/plugins/node/pluginVersionValidator.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import nls = require('vs/nls'); +import * as nls from 'vs/nls'; import {IPluginDescription} from 'vs/platform/plugins/common/plugins'; import {isValidPluginDescription as baseIsValidPluginDescription} from 'vs/platform/plugins/common/pluginsRegistry'; import * as semver from 'semver'; diff --git a/src/vs/platform/plugins/test/node/pluginVersionValidator.test.ts b/src/vs/platform/plugins/test/node/pluginVersionValidator.test.ts index e0a9b15543a..56bb4b860a4 100644 --- a/src/vs/platform/plugins/test/node/pluginVersionValidator.test.ts +++ b/src/vs/platform/plugins/test/node/pluginVersionValidator.test.ts @@ -4,13 +4,8 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import assert = require('assert'); -import { -isValidVersionStr, isValidVersion, -parseVersion, IParsedVersion, -normalizeVersion, INormalizedVersion, -IReducedExtensionDescription, isValidExtensionVersion -} from 'vs/platform/plugins/node/pluginVersionValidator'; +import * as assert from 'assert'; +import {INormalizedVersion, IParsedVersion, IReducedExtensionDescription, isValidExtensionVersion, isValidVersion, isValidVersionStr, normalizeVersion, parseVersion} from 'vs/platform/plugins/node/pluginVersionValidator'; suite('Plugin Version Validator', () => {