diff --git a/src/vs/base/browser/browser.ts b/src/vs/base/browser/browser.ts index 5a0e5f7994288829430ebddbbf49ed09d197aea4..7a816a78631aa18b2d6669886d9a260c11d216ce 100644 --- a/src/vs/base/browser/browser.ts +++ b/src/vs/base/browser/browser.ts @@ -75,7 +75,7 @@ let _disablePushState = false; */ export function canPushState() { return (!_disablePushState && globals.history && globals.history.pushState); -}; +} /** * Helpful when we detect that pushing state does not work for some reason (e.g. FF prevents pushState for security reasons in some cases) diff --git a/src/vs/base/browser/ui/highlightedlabel/highlightedLabel.ts b/src/vs/base/browser/ui/highlightedlabel/highlightedLabel.ts index 6576fc22b4b19b079a94712d965fe669716fea29..7c75f496b31cbcaeb77eb9e160c529a5a3887ccd 100644 --- a/src/vs/base/browser/ui/highlightedlabel/highlightedLabel.ts +++ b/src/vs/base/browser/ui/highlightedlabel/highlightedLabel.ts @@ -63,21 +63,21 @@ export class HighlightedLabel implements IDisposable { continue; } if (pos < highlight.start) { - htmlContent.push('') + htmlContent.push(''); htmlContent.push(expandOcticons(escape(this.text.substring(pos, highlight.start)))); - htmlContent.push('') + htmlContent.push(''); pos = highlight.end; } - htmlContent.push('') + htmlContent.push(''); htmlContent.push(expandOcticons(escape(this.text.substring(highlight.start, highlight.end)))); - htmlContent.push('') + htmlContent.push(''); pos = highlight.end; } if (pos < this.text.length) { - htmlContent.push('') + htmlContent.push(''); htmlContent.push(expandOcticons(escape(this.text.substring(pos)))); - htmlContent.push('') + htmlContent.push(''); } this.domNode.innerHTML = htmlContent.join(''); diff --git a/src/vs/base/browser/ui/scrollbar/domNodeScrollable.ts b/src/vs/base/browser/ui/scrollbar/domNodeScrollable.ts index 65da4d71f3587577725ef152742bead5d14b9c15..0c9434725d74385b25bc9cbb2af3789e0965ad64 100644 --- a/src/vs/base/browser/ui/scrollbar/domNodeScrollable.ts +++ b/src/vs/base/browser/ui/scrollbar/domNodeScrollable.ts @@ -8,7 +8,7 @@ import * as DomUtils from 'vs/base/browser/dom'; import {Gesture} from 'vs/base/browser/touch'; import {Disposable, IDisposable} from 'vs/base/common/lifecycle'; import {IScrollable} from 'vs/base/common/scrollable'; -import Event, {Emitter} from 'vs/base/common/event'; +import {Emitter} from 'vs/base/common/event'; export class DomNodeScrollable extends Disposable implements IScrollable { diff --git a/src/vs/base/browser/ui/scrollbar/scrollableElement.ts b/src/vs/base/browser/ui/scrollbar/scrollableElement.ts index 04a397382dcdd0e98dc91bdd196203ed3f50a92b..f3890974f449a730ebb4d890edc8c2cbd1f19baa 100644 --- a/src/vs/base/browser/ui/scrollbar/scrollableElement.ts +++ b/src/vs/base/browser/ui/scrollbar/scrollableElement.ts @@ -208,7 +208,7 @@ export enum Visibility { Auto, Hidden, Visible -}; +} export function visibilityFromString(visibility: string): Visibility { switch (visibility) { diff --git a/src/vs/base/browser/ui/scrollbar/scrollableElementImpl.ts b/src/vs/base/browser/ui/scrollbar/scrollableElementImpl.ts index 9230daea18e68f6ada426852115fde47a5bdd480..df69f8ec96431a62de2c172ca294c984a641007c 100644 --- a/src/vs/base/browser/ui/scrollbar/scrollableElementImpl.ts +++ b/src/vs/base/browser/ui/scrollbar/scrollableElementImpl.ts @@ -130,10 +130,6 @@ export class ScrollableElement extends Widget implements IScrollableElement { }; } - private _getVerticalSliderDomNode(): HTMLElement { - return this._verticalScrollbar.slider; - } - public delegateVerticalScrollbarMouseDown(browserEvent: MouseEvent): void { this._verticalScrollbar.delegateMouseDown(browserEvent); } diff --git a/src/vs/base/browser/ui/timer/timer.ts b/src/vs/base/browser/ui/timer/timer.ts index 54d0485cd8a51d82d0a753c7bf44fff4243c90d7..5232d2e9edd0070a563f1a18bce4c9582e14cc03 100644 --- a/src/vs/base/browser/ui/timer/timer.ts +++ b/src/vs/base/browser/ui/timer/timer.ts @@ -251,7 +251,7 @@ export class TimeKeeperRenderer { } private _render(): void { - let allEvents = this.timeKeeper.getCollectedEvents(), didSomething = false;; + let allEvents = this.timeKeeper.getCollectedEvents(), didSomething = false; for (let i = this.lastEventIndex; i < allEvents.length; i++) { let ev = allEvents[i]; diff --git a/src/vs/editor/common/modes/monarch/monarchCommon.ts b/src/vs/editor/common/modes/monarch/monarchCommon.ts index edfac5a5c5d92eff11c9e056323d992f3160c7f3..4646198004ac28f7c07bbfb241fd690afc299450 100644 --- a/src/vs/editor/common/modes/monarch/monarchCommon.ts +++ b/src/vs/editor/common/modes/monarch/monarchCommon.ts @@ -157,15 +157,25 @@ export function substituteMatches(lexer: ILexerMin, str: string, id: string, mat var re = /\$((\$)|(#)|(\d\d?)|[sS](\d\d?)|@(\w+))/g; var stateMatches: string[] = null; return str.replace(re, function(full, sub?, dollar?, hash?, n?, s?, attr?, ofs?, total?) { - if (!empty(dollar)) return '$'; // $$ - if (!empty(hash)) return fixCase(lexer, id); // default $# - if (!empty(n) && n < matches.length) return fixCase(lexer, matches[n]); // $n - if (!empty(attr) && lexer && typeof (lexer[attr]) === 'string') return lexer[attr]; //@attribute + if (!empty(dollar)) { + return '$'; // $$ + } + if (!empty(hash)) { + return fixCase(lexer, id); // default $# + } + if (!empty(n) && n < matches.length) { + return fixCase(lexer, matches[n]); // $n + } + if (!empty(attr) && lexer && typeof (lexer[attr]) === 'string') { + return lexer[attr]; //@attribute + } if (stateMatches === null) { // split state on demand stateMatches = state.split('.'); stateMatches.unshift(state); } - if (!empty(s) && s < stateMatches.length) return fixCase(lexer, stateMatches[s]); //$Sn + if (!empty(s) && s < stateMatches.length) { + return fixCase(lexer, stateMatches[s]); //$Sn + } return ''; }); } @@ -176,11 +186,16 @@ export function substituteMatches(lexer: ILexerMin, str: string, id: string, mat export function findRules(lexer: ILexer, state: string): IRule[] { while (state && state.length > 0) { var rules = lexer.tokenizer[state]; - if (rules) return rules; + if (rules) { + return rules; + } var idx = state.lastIndexOf('.'); - if (idx < 0) state = null; // no further parent - else state = state.substr(0, idx); + if (idx < 0) { + state = null; // no further parent + } else { + state = state.substr(0, idx); + } } return null; } @@ -193,11 +208,16 @@ export function findRules(lexer: ILexer, state: string): IRule[] { export function stateExists(lexer: ILexerMin, state: string): boolean { while (state && state.length > 0) { var exist = lexer.stateNames[state]; - if (exist) return true; + if (exist) { + return true; + } var idx = state.lastIndexOf('.'); - if (idx < 0) state = null; // no further parent - else state = state.substr(0, idx); + if (idx < 0) { + state = null; // no further parent + } else { + state = state.substr(0, idx); + } } return false; } diff --git a/src/vs/editor/common/modes/monarch/monarchCompile.ts b/src/vs/editor/common/modes/monarch/monarchCompile.ts index 10fda3662ceb41a3c2a1f61eeb74f2cb711fdcbd..5493d414dbc0cf55ebc21fff73934e377e244bef 100644 --- a/src/vs/editor/common/modes/monarch/monarchCompile.ts +++ b/src/vs/editor/common/modes/monarch/monarchCompile.ts @@ -24,49 +24,44 @@ import Objects = require('vs/base/common/objects'); */ function isArrayOf(elemType: (x: any) => boolean, obj: any): boolean { - if (!obj) return false; - if (!(Array.isArray(obj))) return false; + if (!obj) { + return false; + } + if (!(Array.isArray(obj))) { + return false; + } var idx: any; for (idx in obj) { if (obj.hasOwnProperty(idx)) { - if (!(elemType(obj[idx]))) return false; + if (!(elemType(obj[idx]))) { + return false; + } } } return true; } function bool(prop: any, def?: boolean, onerr?: () => void ): boolean { - if (typeof (prop) === 'boolean') return prop; - if (onerr && (prop || def === undefined)) onerr(); // type is wrong, or there is no default + if (typeof (prop) === 'boolean') { + return prop; + } + if (onerr && (prop || def === undefined)) { + onerr(); // type is wrong, or there is no default + } return (def === undefined ? null : def); } function string(prop: any, def?: string, onerr?: () => void ): string { - if (typeof (prop) === 'string') return prop; - if (onerr && (prop || def === undefined)) onerr(); // type is wrong, or there is no default - return (def === undefined ? null : def); - -} - -function regExString(prop: any, def?: string, onerr?: () => void ): string { - // for now just a string - return string(prop, def, onerr); -} - -function number(prop: any, def?: number, onerr?: () => void ): number { - if (typeof (prop) === 'number') return prop; - if (onerr && (prop || def === undefined)) onerr(); // type is wrong, or there is no default + if (typeof (prop) === 'string') { + return prop; + } + if (onerr && (prop || def === undefined)) { + onerr(); // type is wrong, or there is no default + } return (def === undefined ? null : def); -} -function stringArray(prop: any, def?: string[], onerr?: () => void ): string[] { - if (isArrayOf(function(elem) { return (typeof (elem) === 'string'); }, prop)) return prop.slice(0); - if (typeof (prop) === 'string') return [prop]; - if (onerr && (prop || def === undefined)) onerr(); // type is wrong, or there is no default - return (def === undefined ? null : def); } - // Lexer helpers /** @@ -74,7 +69,9 @@ function stringArray(prop: any, def?: string[], onerr?: () => void ): string[] { * Also replaces @\w+ or sequences with the content of the specified attribute */ function compileRegExp(lexer: MonarchCommonTypes.ILexerMin, str: string): RegExp { - if (typeof (str) !== 'string') return null; + if (typeof (str) !== 'string') { + return null; + } var n = 0; while (str.indexOf('@') >= 0 && n < 5) { // at most 5 expansions @@ -83,13 +80,14 @@ function compileRegExp(lexer: MonarchCommonTypes.ILexerMin, str: string): RegExp var sub = ''; if (typeof (lexer[attr]) === 'string') { sub = lexer[attr]; - } - else if (lexer[attr] && lexer[attr] instanceof RegExp) { + } else if (lexer[attr] && lexer[attr] instanceof RegExp) { sub = lexer[attr].source; - } - else { - if (lexer[attr] === undefined) MonarchCommonTypes.throwError(lexer, 'language definition does not contain attribute \'' + attr + '\', used at: ' + str); - else MonarchCommonTypes.throwError(lexer, 'attribute reference \'' + attr + '\' must be a string, used at: ' + str); + } else { + if (lexer[attr] === undefined) { + MonarchCommonTypes.throwError(lexer, 'language definition does not contain attribute \'' + attr + '\', used at: ' + str); + } else { + MonarchCommonTypes.throwError(lexer, 'attribute reference \'' + attr + '\' must be a string, used at: ' + str); + } } return (MonarchCommonTypes.empty(sub) ? '' : '(?:' + sub + ')'); }); @@ -104,13 +102,19 @@ function compileRegExp(lexer: MonarchCommonTypes.ILexerMin, str: string): RegExp * */ function selectScrutinee(id: string, matches: string[], state: string, num: number): string { - if (num < 0) return id; - if (num < matches.length) return matches[num]; + if (num < 0) { + return id; + } + if (num < matches.length) { + return matches[num]; + } if (num >= 100) { num = num - 100; var parts = state.split('.'); parts.unshift(state); - if (num < parts.length) return parts[num]; + if (num < parts.length) { + return parts[num]; + } } return null; } @@ -123,7 +127,9 @@ function createGuard(lexer: MonarchCommonTypes.ILexerMin, ruleName: string, tkey if (matches) { if (matches[3]) { // if digits scrut = parseInt(matches[3]); - if (matches[2]) scrut = scrut + 100; // if [sS] present + if (matches[2]) { + scrut = scrut + 100; // if [sS] present + } } oppat = matches[4]; } @@ -236,9 +242,11 @@ function compileAction(lexer: MonarchCommonTypes.ILexerMin, ruleName: string, ac newAction.tokenSubst = true; } if (typeof (action.bracket) === 'string') { - if (action.bracket === '@open') newAction.bracket = Modes.Bracket.Open; - else if (action.bracket === '@close') newAction.bracket = Modes.Bracket.Close; - else { + if (action.bracket === '@open') { + newAction.bracket = Modes.Bracket.Open; + } else if (action.bracket === '@close') { + newAction.bracket = Modes.Bracket.Close; + } else { MonarchCommonTypes.throwError(lexer, 'a \'bracket\' attribute must be either \'@open\' or \'@close\', in rule: ' + ruleName); } } @@ -249,7 +257,9 @@ function compileAction(lexer: MonarchCommonTypes.ILexerMin, ruleName: string, ac else { var next: string = action.next; if (!/^(@pop|@push|@popall)$/.test(next)) { - if (next[0] === '@') next = next.substr(1); // peel off starting @ sign + if (next[0] === '@') { + next = next.substr(1); // peel off starting @ sign + } if (next.indexOf('$') < 0) { // no dollar substitution, we can check if the state exists if (!MonarchCommonTypes.stateExists(lexer, MonarchCommonTypes.substituteMatches(lexer, next, '', [], ''))) { MonarchCommonTypes.throwError(lexer, 'the next state \'' + action.next + '\' is not defined in rule: ' + ruleName); @@ -259,9 +269,15 @@ function compileAction(lexer: MonarchCommonTypes.ILexerMin, ruleName: string, ac newAction.next = next; } } - if (typeof (action.goBack) === 'number') newAction.goBack = action.goBack; - if (typeof (action.switchTo) === 'string') newAction.switchTo = action.switchTo; - if (typeof (action.log) === 'string') newAction.log = action.log; + if (typeof (action.goBack) === 'number') { + newAction.goBack = action.goBack; + } + if (typeof (action.switchTo) === 'string') { + newAction.switchTo = action.switchTo; + } + if (typeof (action.log) === 'string') { + newAction.log = action.log; + } if (typeof (action.nextEmbedded) === 'string') { newAction.nextEmbedded = action.nextEmbedded; lexer.usesEmbedded = true; @@ -349,7 +365,7 @@ class Rule implements MonarchCommonTypes.IRule { sregex = (re).source; } else { - MonarchCommonTypes.throwError(lexer, 'rules must start with a match string or regular expression: ' + this.name) + MonarchCommonTypes.throwError(lexer, 'rules must start with a match string or regular expression: ' + this.name); } this.matchOnlyAtLineStart = (sregex.length > 0 && sregex[0] === '^'); @@ -470,7 +486,9 @@ export function compile(json: MonarchTypes.ILanguage): MonarchCommonTypes.ILexer if (typeof (include) !== 'string') { MonarchCommonTypes.throwError(lexer, 'an \'include\' attribute must be a string at: ' + state); } - if (include[0] === '@') include = include.substr(1); // peel off starting @ + if (include[0] === '@') { + include = include.substr(1); // peel off starting @ + } if (!json.tokenizer[include]) { MonarchCommonTypes.throwError(lexer, 'include target \'' + include + '\' is not defined at: ' + state); } @@ -504,8 +522,12 @@ export function compile(json: MonarchTypes.ILanguage): MonarchCommonTypes.ILexer if (!rule.regex) { MonarchCommonTypes.throwError(lexer, 'a rule must either be an array, or an object with a \'regex\' or \'include\' field at: ' + state); } - if (rule.name) newrule.name = string(rule.name); - if (rule.matchOnlyAtStart) newrule.matchOnlyAtLineStart = bool(rule.matchOnlyAtLineStart); + if (rule.name) { + newrule.name = string(rule.name); + } + if (rule.matchOnlyAtStart) { + newrule.matchOnlyAtLineStart = bool(rule.matchOnlyAtLineStart); + } newrule.setRegex(lexerMin, rule.regex); newrule.setAction(lexerMin, rule.action); } @@ -525,7 +547,9 @@ export function compile(json: MonarchTypes.ILanguage): MonarchCommonTypes.ILexer var key: string; for (key in json.tokenizer) { if (json.tokenizer.hasOwnProperty(key)) { - if (!lexer.start) lexer.start = key; + if (!lexer.start) { + lexer.start = key; + } var rules = json.tokenizer[key]; lexer.tokenizer[key] = new Array(); diff --git a/src/vs/editor/common/modes/monarch/monarchLexer.ts b/src/vs/editor/common/modes/monarch/monarchLexer.ts index 326b0263989368d7677d0ea6792204ac020220a2..11d44ed68dbfee31ddfb170959a7afb30d4b23fe 100644 --- a/src/vs/editor/common/modes/monarch/monarchLexer.ts +++ b/src/vs/editor/common/modes/monarch/monarchLexer.ts @@ -69,7 +69,9 @@ export class MonarchLexer extends AbstractState { if (!super.equals(other)) { return false; } - if (!(other instanceof MonarchLexer)) return false; + if (!(other instanceof MonarchLexer)) { + return false; + } var otherm: MonarchLexer = other; if ((this.stack.length !== otherm.stack.length) || (this.lexer.name !== otherm.lexer.name) || (this.embeddedMode !== otherm.embeddedMode)) { @@ -78,7 +80,9 @@ export class MonarchLexer extends AbstractState { var idx: string; for (idx in this.stack) { if (this.stack.hasOwnProperty(idx)) { - if (this.stack[idx] !== otherm.stack[idx]) return false; + if (this.stack[idx] !== otherm.stack[idx]) { + return false; + } } } return true; @@ -132,7 +136,9 @@ export class MonarchLexer extends AbstractState { // get the rules for this state var rules = this.lexer.tokenizer[state]; - if (!rules) rules = MonarchCommonTypes.findRules(this.lexer, state); // do parent matching + if (!rules) { + rules = MonarchCommonTypes.findRules(this.lexer, state); // do parent matching + } if (!rules) { MonarchCommonTypes.throwError(this.lexer, 'tokenizer state is not defined: ' + state); @@ -228,7 +234,9 @@ export class MonarchLexer extends AbstractState { } if (action.switchTo && typeof action.switchTo === 'string') { var nextState = MonarchCommonTypes.substituteMatches(this.lexer, action.switchTo, matched, matches, state); // switch state without a push... - if (nextState[0] === '@') nextState = nextState.substr(1); // peel off starting '@' + if (nextState[0] === '@') { + nextState = nextState.substr(1); // peel off starting '@' + } if (!MonarchCommonTypes.findRules(this.lexer, nextState)) { MonarchCommonTypes.throwError(this.lexer, 'trying to switch to a state \'' + nextState + '\' that is undefined in rule: ' + rule.name); } @@ -261,11 +269,15 @@ export class MonarchLexer extends AbstractState { } } else if (action.next === '@popall') { - if (this.stack.length > 1) this.stack = [this.stack[this.stack.length - 1]]; + if (this.stack.length > 1) { + this.stack = [this.stack[this.stack.length - 1]]; + } } else { var nextState = MonarchCommonTypes.substituteMatches(this.lexer, action.next, matched, matches, state); - if (nextState[0] === '@') nextState = nextState.substr(1); // peel off starting '@' + if (nextState[0] === '@') { + nextState = nextState.substr(1); // peel off starting '@' + } if (!MonarchCommonTypes.findRules(this.lexer, nextState)) { MonarchCommonTypes.throwError(this.lexer, 'trying to set a next state \'' + nextState + '\' that is undefined in rule: ' + rule.name); @@ -357,14 +369,16 @@ export class MonarchLexer extends AbstractState { * Searches for a bracket in the 'brackets' attribute that matches the input. */ function findBracket(lexer: MonarchCommonTypes.ILexer, matched: string) { - if (!matched) return null; + if (!matched) { + return null; + } matched = MonarchCommonTypes.fixCase(lexer, matched); var brackets = lexer.brackets; for (var i = 0; i < brackets.length; i++) { var bracket = brackets[i]; if (bracket.open === matched) { - return { token: bracket.token, bracketType: Modes.Bracket.Open } + return { token: bracket.token, bracketType: Modes.Bracket.Open }; } else if (bracket.close === matched) { return { token: bracket.token, bracketType: Modes.Bracket.Close }; @@ -420,7 +434,9 @@ export function createTokenizationSupport(modeService:IModeService, mode:Modes.I while (!stream.eos() && mstate.embeddedMode) { mstate.tokenize(stream, true); // allow no consumption for @rematch } - if (mstate.embeddedMode) return null; // don't leave yet + if (mstate.embeddedMode) { + return null; // don't leave yet + } var end = stream.pos(); return { diff --git a/src/vs/editor/common/services/modelServiceImpl.ts b/src/vs/editor/common/services/modelServiceImpl.ts index 07e15ada86c38e252b69c4691d7c036a01c8e68c..d2e39fc83a686bf6b4ac84a38d1e1019ae59f8f5 100644 --- a/src/vs/editor/common/services/modelServiceImpl.ts +++ b/src/vs/editor/common/services/modelServiceImpl.ts @@ -13,7 +13,7 @@ import EditorCommon = require('vs/editor/common/editorCommon'); import Modes = require('vs/editor/common/modes'); import {IResourceService} from 'vs/editor/common/services/resourceService'; import {IModelService} from 'vs/editor/common/services/modelService'; -import {Remotable, IThreadService, ThreadAffinity, IThreadSynchronizableObject} from 'vs/platform/thread/common/thread'; +import {Remotable, IThreadService, ThreadAffinity} from 'vs/platform/thread/common/thread'; import {IHTMLContentElement} from 'vs/base/common/htmlContent'; import Event, {Emitter} from 'vs/base/common/event'; import URI from 'vs/base/common/uri'; diff --git a/src/vs/editor/contrib/comment/common/lineCommentCommand.ts b/src/vs/editor/contrib/comment/common/lineCommentCommand.ts index 04d1f00419a0ecd3f2e484642617b3fa9eff5bf9..ba4d57a657f1e80a34465c5e47bf2145cefe84c5 100644 --- a/src/vs/editor/contrib/comment/common/lineCommentCommand.ts +++ b/src/vs/editor/contrib/comment/common/lineCommentCommand.ts @@ -23,7 +23,7 @@ export interface ILinePreflightData { commentStr: string; commentStrOffset: number; commentStrLength: number; -}; +} export interface IPreflightData { supported: boolean; diff --git a/src/vs/languages/handlebars/common/handlebars.ts b/src/vs/languages/handlebars/common/handlebars.ts index 059f4545cbd87f1e141a0b84f1adb5792ccf1bc2..af7e37832ad199ae85b3518da4c959be42f571b1 100644 --- a/src/vs/languages/handlebars/common/handlebars.ts +++ b/src/vs/languages/handlebars/common/handlebars.ts @@ -4,7 +4,6 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import EditorCommon = require('vs/editor/common/editorCommon'); import Modes = require('vs/editor/common/modes'); import supports = require('vs/editor/common/modes/supports'); import htmlMode = require('vs/languages/html/common/html'); diff --git a/src/vs/languages/lib/common/wireProtocol.ts b/src/vs/languages/lib/common/wireProtocol.ts index 0b62a747a225a1b500f453742839d587c23013fe..1354ab2361c125e967e6c38fc27b9f641b31cee1 100644 --- a/src/vs/languages/lib/common/wireProtocol.ts +++ b/src/vs/languages/lib/common/wireProtocol.ts @@ -190,7 +190,7 @@ export class Writer { '\r\n\r\n', json, '\r\n' - ] + ]; this.writable.write(buffer.join(''), 'utf8'); } } \ No newline at end of file diff --git a/src/vs/languages/php/common/php.ts b/src/vs/languages/php/common/php.ts index 4978ae0e40174b72aada75b4255e4680dde88f1d..9d3825a72369fa704979ee87e4f2e51b729ebd9b 100644 --- a/src/vs/languages/php/common/php.ts +++ b/src/vs/languages/php/common/php.ts @@ -5,17 +5,11 @@ 'use strict'; import WinJS = require('vs/base/common/winjs.base'); -import Network = require('vs/base/common/network'); import objects = require('vs/base/common/objects'); import supports = require('vs/editor/common/modes/supports'); -import platform = require('vs/platform/platform'); -import Arrays = require('vs/base/common/arrays'); -import EditorCommon = require('vs/editor/common/editorCommon'); import Modes = require('vs/editor/common/modes'); import {AbstractMode, isDigit, createWordRegExp} from 'vs/editor/common/modes/abstractMode'; import {AbstractState} from 'vs/editor/common/modes/abstractState'; -import {OneWorkerAttr} from 'vs/platform/thread/common/threadService'; -import {AsyncDescriptor2, createAsyncDescriptor2} from 'vs/platform/instantiation/common/descriptors'; import {IModeService} from 'vs/editor/common/services/modeService'; import {OnEnterSupport} from 'vs/editor/common/modes/supports/onEnter'; import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation'; @@ -54,10 +48,10 @@ var brackets = (function() { return !!MAP[text]; }, tokenTypeFromString: (text:string): string => { - return MAP[text].tokenType + return MAP[text].tokenType; }, bracketTypeFromString: (text:string): Modes.Bracket => { - return MAP[text].bracketType + return MAP[text].bracketType; } }; })(); @@ -273,9 +267,13 @@ export class PHPNumber extends PHPState { } } var tokenType = 'number'; - if (base === 16) tokenType += '.hex'; - else if (base === 8) tokenType += '.octal'; - else if (base === 2) tokenType += '.binary'; + if (base === 16) { + tokenType += '.hex'; + } else if (base === 8) { + tokenType += '.octal'; + } else if (base === 2) { + tokenType += '.binary'; + } return { type: tokenType + '.php', nextState: this.parent }; } } diff --git a/src/vs/languages/plaintext/common/plaintext.ts b/src/vs/languages/plaintext/common/plaintext.ts index 7b196f49cc84330f7163dd27460cfa637e2de8a0..de230cf2c04fbbe097e669fcd500a6084d1df3a5 100644 --- a/src/vs/languages/plaintext/common/plaintext.ts +++ b/src/vs/languages/plaintext/common/plaintext.ts @@ -4,7 +4,6 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import EditorCommon = require('vs/editor/common/editorCommon'); import Modes = require('vs/editor/common/modes'); import supports = require('vs/editor/common/modes/supports'); import {AbstractMode} from 'vs/editor/common/modes/abstractMode'; diff --git a/src/vs/languages/razor/common/csharpTokenization.ts b/src/vs/languages/razor/common/csharpTokenization.ts index 937619fb236e3326494124d498ffbc25219c2e10..4b9f2d6b929dd390a4bc5d6a9fc7c16cd4f36f20 100644 --- a/src/vs/languages/razor/common/csharpTokenization.ts +++ b/src/vs/languages/razor/common/csharpTokenization.ts @@ -5,9 +5,7 @@ 'use strict'; import objects = require('vs/base/common/objects'); -import EditorCommon = require('vs/editor/common/editorCommon'); import Modes = require('vs/editor/common/modes'); -import modesExtensions = require('vs/editor/common/modes/modesRegistry'); import htmlMode = require('vs/languages/html/common/html'); import VSXML = require('vs/languages/vsxml/common/vsxml'); import {AbstractState} from 'vs/editor/common/modes/abstractState'; @@ -53,10 +51,10 @@ var brackets = (function() { return !!MAP[text]; }, tokenTypeFromString: (text:string): string => { - return MAP[text].tokenType + return MAP[text].tokenType; }, bracketTypeFromString: (text:string): Modes.Bracket => { - return MAP[text].bracketType + return MAP[text].bracketType; } }; })(); diff --git a/src/vs/languages/razor/common/razor.ts b/src/vs/languages/razor/common/razor.ts index ac1ec0ed41c14faa36e100f4ba49355c4e15bef0..5a9502d8814ea56064c46b5e7b6a91784358f2f4 100644 --- a/src/vs/languages/razor/common/razor.ts +++ b/src/vs/languages/razor/common/razor.ts @@ -4,12 +4,11 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import EditorCommon = require('vs/editor/common/editorCommon'); import Modes = require('vs/editor/common/modes'); import supports = require('vs/editor/common/modes/supports'); import htmlMode = require('vs/languages/html/common/html'); import csharpTokenization = require('vs/languages/razor/common/csharpTokenization'); -import {AbstractMode, createWordRegExp} from 'vs/editor/common/modes/abstractMode'; +import {createWordRegExp} from 'vs/editor/common/modes/abstractMode'; import {AsyncDescriptor2, createAsyncDescriptor2} from 'vs/platform/instantiation/common/descriptors'; import {OnEnterSupport} from 'vs/editor/common/modes/supports/onEnter'; import razorTokenTypes = require('vs/languages/razor/common/razorTokenTypes'); diff --git a/src/vs/languages/razor/common/razorWorker.ts b/src/vs/languages/razor/common/razorWorker.ts index 7c34865f724f0cdf46a68d21907d9932eab242f2..615a1484d333c3ae58d106caef5874cf4ca57931 100644 --- a/src/vs/languages/razor/common/razorWorker.ts +++ b/src/vs/languages/razor/common/razorWorker.ts @@ -4,8 +4,6 @@ *--------------------------------------------------------------------------------------------*/ import htmlWorker = require('vs/languages/html/common/htmlWorker'); -import EditorCommon = require('vs/editor/common/editorCommon'); -import Modes = require('vs/editor/common/modes'); import htmlTags = require('vs/languages/html/common/htmlTags'); export function getRazorTagProvider() : htmlTags.IHTMLTagProvider { diff --git a/src/vs/languages/vsxml/common/vsxml.ts b/src/vs/languages/vsxml/common/vsxml.ts index 7667f837aa0ceedd2c4ce65f13eed2aaefaad0be..e4abb7e2e624be925fa06e4028ad21b6bbab23d3 100644 --- a/src/vs/languages/vsxml/common/vsxml.ts +++ b/src/vs/languages/vsxml/common/vsxml.ts @@ -13,7 +13,6 @@ import objects = require('vs/base/common/objects'); import errors = require('vs/base/common/errors'); -import EditorCommon = require('vs/editor/common/editorCommon'); import Modes = require('vs/editor/common/modes'); import {AbstractState} from 'vs/editor/common/modes/abstractState'; import vsxmlTokenTypes = require('vs/languages/vsxml/common/vsxmlTokenTypes'); diff --git a/src/vs/platform/keybinding/common/keybindingResolver.ts b/src/vs/platform/keybinding/common/keybindingResolver.ts index 155d3639d7afa56258dfc7387f2fc9bc4557572a..1c139a50f8aba48c642d2b5aac5e906c72afb7b6 100644 --- a/src/vs/platform/keybinding/common/keybindingResolver.ts +++ b/src/vs/platform/keybinding/common/keybindingResolver.ts @@ -6,7 +6,7 @@ import * as defaultPlatform from 'vs/base/common/platform'; import {IKeybindingItem, KbExpr, IUserFriendlyKeybinding} from 'vs/platform/keybinding/common/keybindingService'; -import {KeyMod, KeyCode, BinaryKeybindings, Keybinding, ISimplifiedPlatform} from 'vs/base/common/keyCodes'; +import {BinaryKeybindings, Keybinding, ISimplifiedPlatform} from 'vs/base/common/keyCodes'; export interface IResolveResult { enterChord: number; @@ -197,7 +197,7 @@ export class KeybindingResolver { } public lookupKeybinding(commandId: string): Keybinding[] { - let rawPossibleTriggers = this._lookupMap[commandId] + let rawPossibleTriggers = this._lookupMap[commandId]; if (!rawPossibleTriggers) { return []; } diff --git a/src/vs/platform/keybinding/common/keybindingService.ts b/src/vs/platform/keybinding/common/keybindingService.ts index c2b06425bc6ca0634c9b838254c7e30cd662bcd9..b5f87c78e3c77659635bc364d9a5c0b75d65b002 100644 --- a/src/vs/platform/keybinding/common/keybindingService.ts +++ b/src/vs/platform/keybinding/common/keybindingService.ts @@ -76,6 +76,7 @@ export class KbEqualsExpression implements KbExpr { } public evaluate(context:any): boolean { + // Intentional == return (context[this.key] == this.value); } @@ -110,6 +111,7 @@ export class KbNotEqualsExpression implements KbExpr { } public evaluate(context:any): boolean { + // Intentional != return (context[this.key] != this.value); } @@ -275,7 +277,7 @@ export let KbExpr = { return serializedValue; } -} +}; export interface IKeybindingItem { keybinding: number; @@ -297,7 +299,7 @@ export interface ICommandHandlerDescription { } export interface ICommandsMap { - [id: string]: ICommandHandler + [id: string]: ICommandHandler; } export interface IKeybindingContextKey { diff --git a/src/vs/platform/keybinding/common/keybindingsRegistry.ts b/src/vs/platform/keybinding/common/keybindingsRegistry.ts index 756f6ef43c83657dba6250a81f1955d5a5308fc7..5093cc3917c15b11c77e3eef8cef50795a920796 100644 --- a/src/vs/platform/keybinding/common/keybindingsRegistry.ts +++ b/src/vs/platform/keybinding/common/keybindingsRegistry.ts @@ -7,7 +7,7 @@ import {Registry} from 'vs/platform/platform'; import {TypeConstraint, validateConstraints} from 'vs/base/common/types'; import {ICommandHandler, ICommandHandlerDescription, ICommandsMap, IKeybindingItem, IKeybindings, KbExpr} from 'vs/platform/keybinding/common/keybindingService'; -import {KeyMod, KeyCode, BinaryKeybindings} from 'vs/base/common/keyCodes'; +import {KeyCode, BinaryKeybindings} from 'vs/base/common/keyCodes'; import Platform = require('vs/base/common/platform'); export interface ICommandRule extends IKeybindings { diff --git a/src/vs/platform/keybinding/test/common/mockKeybindingService.ts b/src/vs/platform/keybinding/test/common/mockKeybindingService.ts index a454a34bbde1f6aee146952f42bed4c02c39d6b1..15e6a12cb55ee5f71c59962f8518bc16a38562df 100644 --- a/src/vs/platform/keybinding/test/common/mockKeybindingService.ts +++ b/src/vs/platform/keybinding/test/common/mockKeybindingService.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import {IKeybindingService, IKeybindingContextKey, IKeybindingItem} from 'vs/platform/keybinding/common/keybindingService'; +import {IKeybindingService, IKeybindingContextKey} from 'vs/platform/keybinding/common/keybindingService'; import {Keybinding} from 'vs/base/common/keyCodes'; import {IHTMLContentElement} from 'vs/base/common/htmlContent'; import {TPromise} from 'vs/base/common/winjs.base'; diff --git a/src/vs/platform/plugins/common/abstractPluginService.ts b/src/vs/platform/plugins/common/abstractPluginService.ts index a7f35ffb3ff81787f83854e57382ab33eea7cb7e..4a32236899605b2a691166f6d4d34c6dac2d50e2 100644 --- a/src/vs/platform/plugins/common/abstractPluginService.ts +++ b/src/vs/platform/plugins/common/abstractPluginService.ts @@ -5,16 +5,13 @@ 'use strict'; import nls = require('vs/nls'); -import {IPluginDescription, IPluginService, IMessage, IPointListener, IActivationEventListener, IPluginStatus } from 'vs/platform/plugins/common/plugins'; +import {IPluginDescription, IPluginService, IMessage, IActivationEventListener, IPluginStatus } from 'vs/platform/plugins/common/plugins'; import WinJS = require('vs/base/common/winjs.base'); import {IDisposable} from 'vs/base/common/lifecycle'; -import Errors = require('vs/base/common/errors'); -import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation'; import {PluginsRegistry} from 'vs/platform/plugins/common/pluginsRegistry'; import Severity from 'vs/base/common/severity'; var hasOwnProperty = Object.hasOwnProperty; -var global = this; export interface IPluginContext { subscriptions: IDisposable[]; @@ -33,7 +30,7 @@ export abstract class ActivatedPlugin { activationFailed: boolean; constructor(activationFailed: boolean) { - this.activationFailed = activationFailed + this.activationFailed = activationFailed; } } diff --git a/src/vs/platform/plugins/common/ipcRemoteCom.ts b/src/vs/platform/plugins/common/ipcRemoteCom.ts index 9ab7fbb40669d7f187ae49632803379f00af5149..e19a048fce83b106f2b878e46a5a0514f4950607 100644 --- a/src/vs/platform/plugins/common/ipcRemoteCom.ts +++ b/src/vs/platform/plugins/common/ipcRemoteCom.ts @@ -51,7 +51,7 @@ function createRPC(serializeAndSend:(obj:any)=>void): IRPCFunc { return r; }; -}; +} export interface IPluginsIPC extends remote.IRemoteCom { handle(msg: string): void; @@ -145,5 +145,5 @@ export function create(send: (obj: string) => void): IPluginsIPC { } return r; -}; +} diff --git a/src/vs/platform/plugins/common/nativePluginService.ts b/src/vs/platform/plugins/common/nativePluginService.ts index b916d3e14c6cb90faffb5a7a29005cf7958f1bda..87ccafb45dabed1dc29a50afad42fdb5a4916b24 100644 --- a/src/vs/platform/plugins/common/nativePluginService.ts +++ b/src/vs/platform/plugins/common/nativePluginService.ts @@ -15,7 +15,7 @@ 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, IConfiguration} from 'vs/platform/workspace/common/workspace'; +import {IWorkspaceContextService} from 'vs/platform/workspace/common/workspace'; import {disposeAll} from 'vs/base/common/lifecycle'; var hasOwnProperty = Object.hasOwnProperty; @@ -25,8 +25,8 @@ class PluginMemento implements IPluginMemento { private _shared: boolean; private _storage: PluginHostStorage; - private _init:WinJS.TPromise - private _value: { [n: string]: any;} + private _init:WinJS.TPromise; + private _value: { [n: string]: any;}; constructor(id: string, global:boolean, storage: PluginHostStorage) { this._id = id; @@ -44,7 +44,7 @@ class PluginMemento implements IPluginMemento { } get(key: string, defaultValue: T): T { - let value = this._value[key] + let value = this._value[key]; if (typeof value === 'undefined') { value = defaultValue; } @@ -320,7 +320,7 @@ export class PluginHostPluginService extends AbstractPluginService { return paths.normalize(paths.join(pluginDescription.extensionFolderPath, relativePath), true); } }); }); diff --git a/src/vs/platform/plugins/common/plugins.ts b/src/vs/platform/plugins/common/plugins.ts index 6568a2161ed85b72b1d0c7b6587d49a50c077ab6..877936ba0179fd87333461d795abd5dc0dc7f79f 100644 --- a/src/vs/platform/plugins/common/plugins.ts +++ b/src/vs/platform/plugins/common/plugins.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import {createDecorator, ServiceIdentifier, IInstantiationService} from 'vs/platform/instantiation/common/instantiation'; +import {createDecorator, ServiceIdentifier} from 'vs/platform/instantiation/common/instantiation'; import {TPromise} from 'vs/base/common/winjs.base'; import Severity from 'vs/base/common/severity'; diff --git a/src/vs/platform/plugins/common/pluginsRegistry.ts b/src/vs/platform/plugins/common/pluginsRegistry.ts index 3d1519b980b797e072017844744b643017c91c14..822f39634e20beee22c8a8597f430319fd23f48a 100644 --- a/src/vs/platform/plugins/common/pluginsRegistry.ts +++ b/src/vs/platform/plugins/common/pluginsRegistry.ts @@ -7,7 +7,6 @@ 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 env = require('vs/base/common/flags'); import * as JSONContributionRegistry from 'vs/platform/jsonschemas/common/jsonContributionRegistry'; import {IJSONSchema} from 'vs/base/common/jsonSchema'; import nls = require('vs/nls'); @@ -289,7 +288,7 @@ class PluginsRegistryImpl implements IPluginsRegistry { private _pluginsArr: IPluginDescription[]; private _activationMap: {[activationEvent:string]:IPluginDescription[];}; private _pointListeners: IPointListenerEntry[]; - private _oneTimeActivationEventListeners: { [activationEvent:string]: IActivationEventListener[]; } + private _oneTimeActivationEventListeners: { [activationEvent:string]: IActivationEventListener[]; }; private _extensionPoints: { [extPoint: string]: ExtensionPoint; }; constructor() { @@ -526,7 +525,7 @@ var schema : IJSONSchema = { type: 'boolean' } } -} +}; 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 3a5dd2b74def8ed2f73e9c273b1d06248d878129..c4e9ca57512b547d11273e35571166d81721e8b0 100644 --- a/src/vs/platform/plugins/node/pluginVersionValidator.ts +++ b/src/vs/platform/plugins/node/pluginVersionValidator.ts @@ -5,7 +5,7 @@ 'use strict'; import nls = require('vs/nls'); -import {IPluginDescription, IPointListener, IActivationEventListener, IMessage} from 'vs/platform/plugins/common/plugins'; +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/thread/common/abstractThreadService.ts b/src/vs/platform/thread/common/abstractThreadService.ts index 39230e69b10a912ad4a012dbddf61128d24a6455..058536f3c82fc6f0a0f4095755c38a392af2a7c8 100644 --- a/src/vs/platform/thread/common/abstractThreadService.ts +++ b/src/vs/platform/thread/common/abstractThreadService.ts @@ -6,11 +6,10 @@ import {TPromise} from 'vs/base/common/winjs.base'; import remote = require('vs/base/common/remote'); -import Types = require('vs/base/common/types'); -import {IThreadServiceStatusListener, ThreadAffinity, Remotable, IRemotableCtorMap, IThreadSynchronizableObject, IDynamicProxy} from 'vs/platform/thread/common/thread'; +import {ThreadAffinity, Remotable, IThreadSynchronizableObject, IDynamicProxy} from 'vs/platform/thread/common/thread'; import {THREAD_SERVICE_PROPERTY_NAME} from 'vs/platform/thread/common/threadService'; import instantiation = require('vs/platform/instantiation/common/instantiation'); -import {SyncDescriptor, SyncDescriptor0, createSyncDescriptor, AsyncDescriptor0, AsyncDescriptor1, AsyncDescriptor2, AsyncDescriptor3} from 'vs/platform/instantiation/common/descriptors'; +import {SyncDescriptor0, createSyncDescriptor, AsyncDescriptor0, AsyncDescriptor1, AsyncDescriptor2, AsyncDescriptor3} from 'vs/platform/instantiation/common/descriptors'; export interface IThreadServiceData { [id:string]:any; @@ -37,11 +36,6 @@ class DynamicProxy implements IDynamicProxy { export abstract class AbstractThreadService implements remote.IManyHandler { - private static _LAST_DYNAMIC_PROXY_ID:number = 0; - private static generateDynamicProxyId(): string { - return String(++this._LAST_DYNAMIC_PROXY_ID); - } - public isInMainThread:boolean; protected _instantiationService: instantiation.IInstantiationService; diff --git a/src/vs/platform/thread/common/mainThreadService.ts b/src/vs/platform/thread/common/mainThreadService.ts index 8fdbe3cab170f616d848fdb8892e58d0d9326904..2e5d32cd3c3e2ef96557eccbb37b08b476110320 100644 --- a/src/vs/platform/thread/common/mainThreadService.ts +++ b/src/vs/platform/thread/common/mainThreadService.ts @@ -11,7 +11,6 @@ import Env = require('vs/base/common/flags'); import Platform = require('vs/base/common/platform'); import errors = require('vs/base/common/errors'); import Timer = require('vs/base/common/timer'); -import {IPluginDescription} from 'vs/platform/plugins/common/plugins'; import remote = require('vs/base/common/remote'); import {readThreadSynchronizableObjects} from 'vs/platform/thread/common/threadService'; import {SyncDescriptor0} from 'vs/platform/instantiation/common/descriptors'; diff --git a/src/vs/platform/thread/common/pluginHostThreadService.ts b/src/vs/platform/thread/common/pluginHostThreadService.ts index b36b5baa08818d7b0284329bf8be0cc768fc17d9..64859859860dbd5bd8ca631d776bb896c474d71c 100644 --- a/src/vs/platform/thread/common/pluginHostThreadService.ts +++ b/src/vs/platform/thread/common/pluginHostThreadService.ts @@ -9,7 +9,6 @@ import remote = require('vs/base/common/remote'); import descriptors = require('vs/platform/instantiation/common/descriptors'); import abstractThreadService = require('./abstractThreadService'); -import threadService = require('./threadService'); import {readThreadSynchronizableObjects} from 'vs/platform/thread/common/threadService'; import {IThreadService, IThreadSynchronizableObject, ThreadAffinity, IThreadServiceStatusListener} from 'vs/platform/thread/common/thread'; diff --git a/src/vs/platform/thread/common/thread.ts b/src/vs/platform/thread/common/thread.ts index 24677bf7deff15cfaf5b9b5c19a30a82a4548961..5ce77c6b91766def9ada3d7be6082a9ba1bfd075 100644 --- a/src/vs/platform/thread/common/thread.ts +++ b/src/vs/platform/thread/common/thread.ts @@ -2,7 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict' +'use strict'; import {TPromise} from 'vs/base/common/winjs.base'; import descriptors = require('vs/platform/instantiation/common/descriptors'); @@ -81,7 +81,7 @@ export class Remotable { Remotable._ensureUnique(identifier); Remotable.Registry.MainContext[identifier] = target; target[Remotable.PROP_NAME] = identifier; - } + }; } public static PluginHostContext(identifier: string) { @@ -89,7 +89,7 @@ export class Remotable { Remotable._ensureUnique(identifier); Remotable.Registry.PluginHostContext[identifier] = target; target[Remotable.PROP_NAME] = identifier; - } + }; } public static WorkerContext(identifier: string, whichWorker:ThreadAffinity) { @@ -100,7 +100,7 @@ export class Remotable { affinity: whichWorker }; target[Remotable.PROP_NAME] = identifier; - } + }; } private static _ensureUnique(identifier:string): void { diff --git a/src/vs/platform/thread/common/threadService.ts b/src/vs/platform/thread/common/threadService.ts index ee52c699ed7afbee38725c5e6ef3ae58ce5860dd..d77ada07ee851a34f309e92b08ce70c7f995815c 100644 --- a/src/vs/platform/thread/common/threadService.ts +++ b/src/vs/platform/thread/common/threadService.ts @@ -2,10 +2,9 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict' +'use strict'; import Platform = require('vs/platform/platform'); -import types = require('vs/base/common/types'); import {TPromise} from 'vs/base/common/winjs.base'; import thread = require('./thread'); @@ -109,7 +108,7 @@ export var Extensions = { SynchronizableObjects: 'SynchronizableObjects' }; -Platform.Registry.add(Extensions.SynchronizableObjects, new SynchronizableObjectsRegistry()) +Platform.Registry.add(Extensions.SynchronizableObjects, new SynchronizableObjectsRegistry()); export function registerThreadSynchronizableObject(obj: thread.IThreadSynchronizableObject): void { var registry = Platform.Registry.as(Extensions.SynchronizableObjects); diff --git a/src/vs/platform/thread/common/workerThreadService.ts b/src/vs/platform/thread/common/workerThreadService.ts index 093636750e0f97be04349767777e5af5d889f439..03de1cfaf91457d75c56b29ae4969a63bbb01209 100644 --- a/src/vs/platform/thread/common/workerThreadService.ts +++ b/src/vs/platform/thread/common/workerThreadService.ts @@ -8,7 +8,6 @@ import {TPromise} from 'vs/base/common/winjs.base'; import {readThreadSynchronizableObjects} from './threadService'; import abstractThreadService = require('vs/platform/thread/common/abstractThreadService'); import remote = require('vs/base/common/remote'); -import types = require('vs/base/common/types'); import {SyncDescriptor0} from 'vs/platform/instantiation/common/descriptors'; import {IThreadService, IThreadServiceStatusListener, IThreadSynchronizableObject, ThreadAffinity} from 'vs/platform/thread/common/thread';