diff --git a/src/vs/base/browser/globalMouseMoveMonitor.ts b/src/vs/base/browser/globalMouseMoveMonitor.ts index bf6f02d77e4f468cc8965242ab419188995ba8b3..de03d86bc423ee3b99080d6958444371e45cfd60 100644 --- a/src/vs/base/browser/globalMouseMoveMonitor.ts +++ b/src/vs/base/browser/globalMouseMoveMonitor.ts @@ -38,45 +38,45 @@ export function standardMouseMoveMerger(lastEvent:IStandardMouseMoveEventData, c } export class GlobalMouseMoveMonitor implements Lifecycle.IDisposable { - + private hooks:Lifecycle.IDisposable[]; private mouseMoveEventMerger:IEventMerger; private mouseMoveCallback:IMouseMoveCallback; private onStopCallback:IOnStopCallback; - + constructor() { this.hooks = []; this.mouseMoveEventMerger = null; this.mouseMoveCallback = null; this.onStopCallback = null; } - + public dispose(): void { this.stopMonitoring(false); } - + public stopMonitoring(invokeStopCallback:boolean): void { if (!this.isMonitoring()) { // Not monitoring return; } - + // Unhook this.hooks = Lifecycle.disposeAll(this.hooks); this.mouseMoveEventMerger = null; this.mouseMoveCallback = null; var onStopCallback = this.onStopCallback; this.onStopCallback = null; - + if (invokeStopCallback) { onStopCallback(); } } - + public isMonitoring() { return this.hooks.length > 0; } - + public startMonitoring( mouseMoveEventMerger:IEventMerger, mouseMoveCallback:IMouseMoveCallback, @@ -89,7 +89,7 @@ export class GlobalMouseMoveMonitor implements Lifecycle.IDisposable { this.mouseMoveEventMerger = mouseMoveEventMerger; this.mouseMoveCallback = mouseMoveCallback; this.onStopCallback = onStopCallback; - + var windowChain = IframeUtils.getSameOriginWindowChain(); for (var i = 0; i < windowChain.length; i++) { this.hooks.push(DomUtils.addDisposableThrottledListener(windowChain[i].window.document, 'mousemove', @@ -98,7 +98,7 @@ export class GlobalMouseMoveMonitor implements Lifecycle.IDisposable { )); this.hooks.push(DomUtils.addDisposableListener(windowChain[i].window.document, 'mouseup', (e:MouseEvent) => this.stopMonitoring(true))); } - + if (IframeUtils.hasDifferentOriginAncestor()) { var lastSameOriginAncestor = windowChain[windowChain.length - 1]; // We might miss a mouse up if it happens outside the iframe diff --git a/src/vs/base/browser/idleMonitor.ts b/src/vs/base/browser/idleMonitor.ts index 5524eae01f7f23142a7b3e585d1dcef4708442cf..f5637be62a8ceb8c3f865e9dca24e4741a58d083 100644 --- a/src/vs/base/browser/idleMonitor.ts +++ b/src/vs/base/browser/idleMonitor.ts @@ -17,7 +17,7 @@ export enum UserStatus { export var DEFAULT_IDLE_TIME = 60 * 60 * 1000; // 60 minutes export class IdleMonitor { - + private toDispose:Lifecycle.IDisposable[]; private lastActiveTime:number; private idleCheckTimeout:number; @@ -25,41 +25,41 @@ export class IdleMonitor { private eventEmitter:EventEmitter.EventEmitter; private instance:ReferenceCountedIdleMonitor; private idleTime:number; - + constructor(idleTime:number = DEFAULT_IDLE_TIME) { this.instance = ReferenceCountedIdleMonitor.INSTANCE; this.instance.increment(); - + this.status = null; this.idleCheckTimeout = -1; this.lastActiveTime = -1; this.idleTime = idleTime; - + this.toDispose = []; this.eventEmitter = new EventEmitter.EventEmitter(); this.toDispose.push(this.eventEmitter); this.toDispose.push({dispose: this.instance.addListener(() => this.onUserActive())}); this.onUserActive(); } - + public addOneTimeActiveListener(callback:()=>void): Lifecycle.IDisposable { return this.eventEmitter.addOneTimeDisposableListener('onActive', callback); } - + public addOneTimeIdleListener(callback:()=>void): Lifecycle.IDisposable { return this.eventEmitter.addOneTimeDisposableListener('onIdle', callback); } - + public getStatus(): UserStatus { return this.status; } - + public dispose(): void { this.cancelIdleCheck(); this.toDispose = Lifecycle.disposeAll(this.toDispose); this.instance.decrement(); } - + private onUserActive(): void { this.lastActiveTime = (new Date()).getTime(); if (this.status !== UserStatus.Active) { @@ -68,14 +68,14 @@ export class IdleMonitor { this.eventEmitter.emit('onActive'); } } - + private onUserIdle(): void { if (this.status !== UserStatus.Idle) { this.status = UserStatus.Idle; this.eventEmitter.emit('onIdle'); } } - + private scheduleIdleCheck(): void { if (this.idleCheckTimeout === -1) { var minimumTimeWhenUserCanBecomeIdle = this.lastActiveTime + this.idleTime; @@ -85,14 +85,14 @@ export class IdleMonitor { }, minimumTimeWhenUserCanBecomeIdle - (new Date()).getTime()); } } - + private cancelIdleCheck(): void { if (this.idleCheckTimeout !== -1) { clearTimeout(this.idleCheckTimeout); this.idleCheckTimeout = -1; } } - + private checkIfUserIsIdle(): void { var actualIdleTime = (new Date()).getTime() - this.lastActiveTime; if (actualIdleTime >= this.idleTime) { @@ -104,20 +104,20 @@ export class IdleMonitor { } class ReferenceCountedObject { - + private referenceCount:number; - + constructor() { this.referenceCount = 0; } - + public increment(): void { if (this.referenceCount === 0) { this.construct(); } this.referenceCount++; } - + public decrement(): void { if (this.referenceCount > 0) { this.referenceCount--; @@ -126,23 +126,23 @@ class ReferenceCountedObject { } } } - + public construct(): void { throw new Error('Implement me'); } - + public dispose(): void { throw new Error('Implement me'); } } class ReferenceCountedIdleMonitor extends ReferenceCountedObject { - + public static INSTANCE:ReferenceCountedIdleMonitor = new ReferenceCountedIdleMonitor(); - + private toDispose:Lifecycle.IDisposable[]; private eventEmitter:EventEmitter.EventEmitter; - + public construct(): void { this.toDispose = []; this.eventEmitter = new EventEmitter.EventEmitter(); @@ -151,15 +151,15 @@ class ReferenceCountedIdleMonitor extends ReferenceCountedObject { this.toDispose.push(DomUtils.addDisposableListener(BrowserService.getService().document, 'keydown', () => this.onUserActive())); this.onUserActive(); } - + public dispose(): void { this.toDispose = Lifecycle.disposeAll(this.toDispose); } - + private onUserActive(): void { this.eventEmitter.emit('onActive'); } - + public addListener(callback:()=>void):EventEmitter.ListenerUnbind { return this.eventEmitter.addListener('onActive', callback); } diff --git a/src/vs/base/browser/iframe.ts b/src/vs/base/browser/iframe.ts index 91a075e8861b45119e4230c78c4e3935a86971e3..d080ea4aeeb927915c1ca6c48991ebc3a76ea397 100644 --- a/src/vs/base/browser/iframe.ts +++ b/src/vs/base/browser/iframe.ts @@ -25,7 +25,7 @@ function getParentWindowIfSameOrigin(w:Window): Window { if (!w.parent || w.parent === w) { return null; } - + // Cannot really tell if we have access to the parent window unless we try to access something in it try { var location = w.location; @@ -38,7 +38,7 @@ function getParentWindowIfSameOrigin(w:Window): Window { hasDifferentOriginAncestorFlag = true; return null; } - + return w.parent; } @@ -97,34 +97,34 @@ export function hasDifferentOriginAncestor(): boolean { * Returns the position of `childWindow` relative to `ancestorWindow` */ export function getPositionOfChildWindowRelativeToAncestorWindow(childWindow:Window, ancestorWindow:any) { - + if (!ancestorWindow || childWindow === ancestorWindow) { return { top: 0, left: 0 }; } - + var top = 0, left = 0; - + var windowChain = getSameOriginWindowChain(); - + for (var i = 0; i < windowChain.length; i++) { var windowChainEl = windowChain[i]; - + if (windowChainEl.window === ancestorWindow) { break; } - + if (!windowChainEl.iframeElement) { break; } - + var boundingRect = windowChainEl.iframeElement.getBoundingClientRect(); top += boundingRect.top; left += boundingRect.left; } - + return { top: top, left: left diff --git a/src/vs/base/common/collections.ts b/src/vs/base/common/collections.ts index dba6af369767e86f21a733c8ffd164466938aff4..0fd34ece7f59aae1efedddeaa5f9e58f9ae65996 100644 --- a/src/vs/base/common/collections.ts +++ b/src/vs/base/common/collections.ts @@ -94,7 +94,7 @@ export function contains(from:any, what:any):boolean { export function keys(from:IStringDictionary):IIterable; export function keys(from:INumberDictionary):IIterable; export function keys(from:any):IIterable { - + return { every: function(callback:(element:any)=>boolean):boolean { for (var key in from) { @@ -174,7 +174,7 @@ export function groupBy(data: T[], groupFn: (element: T) => string): IStringD * compatible with the JavaScript array. */ export interface IIterable { - + /** * Iterates over every element in the array * as long as the callback does not return some @@ -273,33 +273,33 @@ interface ICacheRow { * removes the older elements as new ones are inserted. */ export class LimitedSizeCache { - + private cache: { [id: string]: ICacheRow }; private order: string[]; - + constructor(private size: number) { this.cache = Object.create(null); this.order = []; } - + public get(id: string): T { var result = this.cache[id]; return result && result.element; } - + public put(id: string, element: T, onRemove: ()=>void): void { var existing = this.cache[id]; var row: ICacheRow = { element: element, onRemove: onRemove }; - + this.cache[id] = row; - + if (!existing) { this.order.push(id); } - + this.swipe(); } - + private swipe(): void { while (this.order.length > this.size) { var id = this.order.shift(); diff --git a/src/vs/base/common/graph.ts b/src/vs/base/common/graph.ts index 2272ff58a62ac51cba2ab5bdc7f9b7c6c617a18a..d091ce92dca3d682605c8eb4c3bf5eb3b3abfb47 100644 --- a/src/vs/base/common/graph.ts +++ b/src/vs/base/common/graph.ts @@ -22,13 +22,13 @@ export function newNode(data:T):Node { } export class Graph { - + private _nodes:{[key:string]:Node} = Object.create(null); - + constructor(private _hashFn:(element:T)=>string) { // empty } - + public roots():Node[] { var ret:Node[] = []; collections.forEach(this._nodes, entry => { @@ -38,7 +38,7 @@ export class Graph { }); return ret; } - + public traverse(start:T, inwards:boolean, callback:(data:T)=>void):void { var startNode = this.lookup(start); if(!startNode) { @@ -46,7 +46,7 @@ export class Graph { } this._traverse(startNode, inwards, {}, callback); } - + private _traverse(node:Node, inwards:boolean, seen:{[key:string]:boolean}, callback:(data:T)=>void):void { var key = this._hashFn(node.data); if(collections.contains(seen, key)) { @@ -57,15 +57,15 @@ export class Graph { var nodes = inwards ? node.outgoing : node.incoming; collections.forEach(nodes, (entry) => this._traverse(entry.value, inwards, seen, callback)); } - + public insertEdge(from:T, to:T):void { var fromNode = this.lookupOrInsertNode(from), toNode = this.lookupOrInsertNode(to); - + fromNode.outgoing[this._hashFn(to)] = toNode; toNode.incoming[this._hashFn(from)] = fromNode; } - + public removeNode(data:T):void { var key = this._hashFn(data); delete this._nodes[key]; @@ -74,23 +74,23 @@ export class Graph { delete entry.value.incoming[key]; }); } - + public lookupOrInsertNode(data:T):Node { var key = this._hashFn(data), node = collections.lookup(this._nodes, key); - + if(!node) { node = newNode(data); this._nodes[key] = node; } - + return node; } - + public lookup(data:T):Node { return collections.lookup(this._nodes, this._hashFn(data)); } - + public get length():number { return Object.keys(this._nodes).length; } diff --git a/src/vs/base/common/injector.ts b/src/vs/base/common/injector.ts index fb5f113ae95139e153ea243b3bee57f7c556232e..0a180e9f97f35b2372324f8a5305f9cc008b41c1 100644 --- a/src/vs/base/common/injector.ts +++ b/src/vs/base/common/injector.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ 'use strict'; - + import Assert = require('vs/base/common/assert'); import Types = require('vs/base/common/types'); @@ -11,32 +11,32 @@ var inject = 'inject'; var injectLen = inject.length; export class Container { - + private map:{[name:string]:any;}; private parent:Container; - + constructor() { this.map = {}; this.parent = null; } - + public setParent(parent:Container):void { this.parent = parent; } - + public registerService(target:string, service:any):any { Assert.ok(!Types.isUndefinedOrNull(target)); Assert.ok(!Types.isUndefinedOrNull(service)); - + this.map[target.toLowerCase()] = service; - + return service; } - + // injects the denoted services to the target public injectTo(target:any):boolean { Assert.ok(!Types.isUndefinedOrNull(target)); - + // Support arrays var didInjectAtLeastOnce = false; if (Types.isArray(target)) { @@ -45,48 +45,48 @@ export class Container { }); return didInjectAtLeastOnce; } - + // inject services one by one for (var key in target) { if(key.indexOf(inject) !== 0) { continue; } - + var element = target[key]; if(!Types.isFunction(element)) { continue; } - + key = key.substring(injectLen).toLowerCase(); var service = this.findService(key, target); if(Types.isUndefinedOrNull(service)) { continue; } - + // call inject function element.apply(target, [service]); didInjectAtLeastOnce = true; } - + return didInjectAtLeastOnce; } - + public createChild():Container { var childContainer = new Container(); childContainer.setParent(this); - + return childContainer; } - + public findService(key:string, target:any=null):any { var result = this.map[key]; if((Types.isUndefinedOrNull(result) || target === result) && this.parent !== null) { result = this.parent.findService(key, target); } - + return result; } - + public dispose():void { this.map = null; this.parent = null; diff --git a/src/vs/base/common/remote.ts b/src/vs/base/common/remote.ts index 5e90967b1fd5d67dc233c573385f067b2b53d524..75e06166e2294a380d494179c29d9f9924d7fd79 100644 --- a/src/vs/base/common/remote.ts +++ b/src/vs/base/common/remote.ts @@ -51,63 +51,63 @@ export interface ISerializedProxy { } export class ProxiesMarshallingContribution implements marshalling.IMarshallingContribution { - + private _remoteCom:IProxyHelper; - + constructor(remoteCom:IProxyHelper) { this._remoteCom = remoteCom; } - + public canSerialize(obj:any): boolean { return (typeof obj.$__CREATE__PROXY__REQUEST === 'string'); } - + public serialize(obj:any, serialize:(obj:any)=>any): ISerializedProxy { var desc: IObjDescriptor = { methods: [], props: {} }; - + var keys = Object.keys(obj); for (var i = 0; i < keys.length; i++) { var key = keys[i]; - + if (typeof obj[key] === 'function') { desc.methods.push(key); } else { desc.props[key] = serialize(obj[key]); } } - + return { $isProxyDescriptor: true, proxyId: obj.$__CREATE__PROXY__REQUEST, desc: desc }; } - + public canDeserialize(obj:ISerializedProxy): boolean { return obj.$isProxyDescriptor === true; } - + public deserialize(obj:ISerializedProxy, deserialize:(obj:any)=>any): any { // this is an object var result: any = { $__IS_REMOTE_OBJ: true }; - + var methods = obj.desc.methods; for (var i = 0; i < methods.length; i++) { result[methods[i]] = createMethodProxy(this._remoteCom, obj.proxyId, methods[i]); } - + var props = obj.desc.props; for (var prop in props) { if (hasOwnProperty.call(props, prop)) { result[prop] = deserialize(props[prop]); } } - + return result; } } \ No newline at end of file diff --git a/src/vs/base/common/worker/workerProtocol.ts b/src/vs/base/common/worker/workerProtocol.ts index 07e2a846b497ea456bf7e7a8f8365b537b34339c..dafaf7d0578cbd33d26fe1762fd0ca71f04f2a4f 100644 --- a/src/vs/base/common/worker/workerProtocol.ts +++ b/src/vs/base/common/worker/workerProtocol.ts @@ -77,15 +77,15 @@ export interface IRequester { } export class RemoteCom implements remote.IRemoteCom { - + private _requester: IRequester; private _bigHandler: remote.IManyHandler; - + constructor(requester:IRequester) { this._requester = requester; this._bigHandler = null; } - + public callOnRemote(proxyId: string, path: string, args:any[]): winjs.Promise { return this._requester.request('_proxyObj', { proxyId: proxyId, @@ -93,18 +93,18 @@ export class RemoteCom implements remote.IRemoteCom { args: args }); } - + public registerBigHandler(handler:remote.IManyHandler): void { this._bigHandler = handler; } - + public handleMessage(msg: { proxyId: string; path: string; args: any[]; }): winjs.Promise { if (!this._bigHandler) { throw new Error('got message before big handler attached!'); } return this._invokeHandler(msg.proxyId, msg.path, msg.args); } - + private _invokeHandler(rpcId:string, method:string, args:any[]): winjs.Promise { try { return winjs.TPromise.as(this._bigHandler.handle(rpcId, method, args)); diff --git a/src/vs/editor/common/services/modeServiceImpl.ts b/src/vs/editor/common/services/modeServiceImpl.ts index afbd2763e6dedfd9cacf022e1cfce46635717c34..6de4ab3cb1dad4ef2058598a2648a07db0ebfbdc 100644 --- a/src/vs/editor/common/services/modeServiceImpl.ts +++ b/src/vs/editor/common/services/modeServiceImpl.ts @@ -190,7 +190,7 @@ export class ModeServiceImpl implements IModeService { var c, e; var promise = new TPromise((cc,ee,pp) => { c = cc; e = ee; }); this._activationPromises[modeId] = promise; - + this._createMode(modeId).then((mode) => { this._instantiatedModes[modeId] = mode; delete this._activationPromises[modeId]; diff --git a/src/vs/editor/common/viewModel/prefixSumComputer.ts b/src/vs/editor/common/viewModel/prefixSumComputer.ts index 986e35fcd9d08aac5d20c8237ce88f3f9d3aafff..a43856fae4855c5b1c61d5ced025238b92b02275 100644 --- a/src/vs/editor/common/viewModel/prefixSumComputer.ts +++ b/src/vs/editor/common/viewModel/prefixSumComputer.ts @@ -10,22 +10,22 @@ export interface IPrefixSumIndexOfResult { } export class PrefixSumComputer { - + /** * values[i] is the value at index i */ private values:number[]; - + /** * prefixSum[i] = SUM(heights[j]), 0 <= j <= i */ private prefixSum:number[]; - + /** * prefixSum[i], 0 <= i <= prefixSumValidIndex can be trusted */ private prefixSumValidIndex:number; - + constructor(values:number[]) { this.values = values; this.prefixSum = []; @@ -34,11 +34,11 @@ export class PrefixSumComputer { } this.prefixSumValidIndex = -1; } - + public getCount(): number { return this.values.length; } - + public insertValue(insertIndex:number, value:number): void { this.values.splice(insertIndex, 0, value); this.prefixSum.splice(insertIndex, 0, 0); @@ -46,20 +46,20 @@ export class PrefixSumComputer { this.prefixSumValidIndex = insertIndex - 1; } } - + public insertValues(insertIndex: number, values: number[]): void { if (values.length === 0) { return; } - + this.values = this.values.slice(0, insertIndex).concat(values).concat(this.values.slice(insertIndex)); this.prefixSum = this.prefixSum.slice(0, insertIndex).concat(PrefixSumComputer._zeroArray(values.length)).concat(this.prefixSum.slice(insertIndex)); - + if (insertIndex - 1 < this.prefixSumValidIndex) { this.prefixSumValidIndex = insertIndex - 1; } } - + private static _zeroArray(count: number): number[] { var r: number[] = new Array(count); for (var i = 0; i < count; i++) { @@ -67,7 +67,7 @@ export class PrefixSumComputer { } return r; } - + public changeValue(index:number, value:number): void { if (this.values[index] === value) { return; @@ -77,7 +77,7 @@ export class PrefixSumComputer { this.prefixSumValidIndex = index - 1; } } - + public removeValues(startIndex:number, cnt:number): void { this.values.splice(startIndex, cnt); this.prefixSum.splice(startIndex, cnt); @@ -85,14 +85,14 @@ export class PrefixSumComputer { this.prefixSumValidIndex = startIndex - 1; } } - + public getTotalValue(): number { if (this.values.length === 0) { return 0; } return this.getAccumulatedValue(this.values.length - 1); } - + public getAccumulatedValue(index:number): number { if (index < 0) { return 0; @@ -100,37 +100,37 @@ export class PrefixSumComputer { if (index <= this.prefixSumValidIndex) { return this.prefixSum[index]; } - + var startIndex = this.prefixSumValidIndex + 1; if (startIndex === 0) { this.prefixSum[0] = this.values[0]; startIndex++; } - + if (index >= this.values.length) { index = this.values.length - 1; } - + for (var i = startIndex; i <= index; i++) { this.prefixSum[i] = this.prefixSum[i - 1] + this.values[i]; } this.prefixSumValidIndex = Math.max(this.prefixSumValidIndex, index); return this.prefixSum[index]; } - + public getIndexOf(accumulatedValue:number, result:IPrefixSumIndexOfResult): void { var low = 0, high = this.values.length - 1, mid:number, midStart:number, midStop:number; - + while (low <= high) { mid = low + ( (high-low)/2 ) | 0; - + midStop = this.getAccumulatedValue(mid); midStart = midStop - this.values[mid]; - + if (accumulatedValue < midStart) { high = mid - 1; } else if (accumulatedValue >= midStop) { diff --git a/src/vs/editor/contrib/hover/browser/hover.css b/src/vs/editor/contrib/hover/browser/hover.css index a0091b4a6d4260b906b2fbb9feac2f8333a48c15..abab1994f413380066f9746ee4b82014bde85d92 100644 --- a/src/vs/editor/contrib/hover/browser/hover.css +++ b/src/vs/editor/contrib/hover/browser/hover.css @@ -18,14 +18,14 @@ -ms-animation-name: fadeIn; animation-duration: 0.15s; animation-name: fadeIn; - + -webkit-user-select: text; -ms-user-select: text; -khtml-user-select: text; -moz-user-select: text; -o-user-select: text; user-select: text; - + overflow: hidden; } diff --git a/src/vs/languages/css/common/parser/cssErrors.ts b/src/vs/languages/css/common/parser/cssErrors.ts index 111f1bc809ef67e6fc69fc5394e6cd57a01b64f4..c185d6ee86931a4ab1dc64e3b65288b1b2ea6813 100644 --- a/src/vs/languages/css/common/parser/cssErrors.ts +++ b/src/vs/languages/css/common/parser/cssErrors.ts @@ -10,7 +10,7 @@ import nodes = require('./cssNodes'); export class CSSIssueType implements nodes.IRule { id: string; message: string; - + public constructor(id:string, message: string) { this.id = id; this.message = message; diff --git a/src/vs/languages/css/common/parser/cssSymbols.ts b/src/vs/languages/css/common/parser/cssSymbols.ts index 391a9f4428a3cdf385f226c03c466c7f923729a1..61af2712a4521d1b5f3fb38a3a44603535683e09 100644 --- a/src/vs/languages/css/common/parser/cssSymbols.ts +++ b/src/vs/languages/css/common/parser/cssSymbols.ts @@ -8,40 +8,40 @@ import nodes = require('./cssNodes'); import arrays = require('vs/base/common/arrays'); export class Scope { - + public parent:Scope; public children:Scope[]; - + public offset:number; public length:number; - + private symbols:Symbol[]; - + constructor(offset:number, length:number) { this.offset = offset; this.length = length; this.symbols = []; - + this.parent = null; this.children = []; } - + public addChild(scope:Scope):void { this.children.push(scope); scope.setParent(this); } - + public setParent(scope:Scope):void { this.parent = scope; } - + public findScope(offset:number, length:number=0):Scope { if (this.offset <= offset && this.offset + this.length > offset + length || this.offset === offset && this.length === length) { return this.findInScope(offset, length); } return null; } - + private findInScope(offset: number, length: number = 0): Scope { // find the first scope child that has an offset larger than offset + length var end = offset + length; @@ -50,18 +50,18 @@ export class Scope { // all scopes have offsets larger than our end return this; } - + var res = this.children[idx-1]; if (res.offset <= offset && res.offset + res.length >= offset + length) { return res.findInScope(offset, length); } return this; } - + public addSymbol(symbol:Symbol):void { this.symbols.push(symbol); } - + public getSymbol(name:string, type: nodes.ReferenceType):Symbol { for (var index = 0; index < this.symbols.length; index++) { var symbol = this.symbols[index]; @@ -71,14 +71,14 @@ export class Scope { } return null; } - + public getSymbols():Symbol[] { return this.symbols; } } export class GlobalScope extends Scope { - + constructor() { super(0, Number.MAX_VALUE); } @@ -87,11 +87,11 @@ export class GlobalScope extends Scope { export class Symbol { - + public name:string; public type:nodes.ReferenceType; public node:nodes.Node; - + constructor(name:string, node:nodes.Node, type: nodes.ReferenceType) { this.name = name; this.node = node; @@ -102,18 +102,18 @@ export class Symbol { export class ScopeBuilder implements nodes.IVisitor { public scope:Scope; - + constructor(scope:Scope) { this.scope = scope; } - + private addSymbol(node:nodes.Node, name:string, type: nodes.ReferenceType) : void { if (node.offset !== -1) { var current = this.scope.findScope(node.offset, node.length); current.addSymbol(new Symbol(name, node, type)); } } - + private addScope(node:nodes.Node) : Scope { if (node.offset !== -1) { var current = this.scope.findScope(node.offset, node.length); @@ -126,14 +126,14 @@ export class ScopeBuilder implements nodes.IVisitor { } return null; } - + private addSymbolToChildScope(scopeNode:nodes.Node, node:nodes.Node, name:string, type: nodes.ReferenceType): void { if (scopeNode && scopeNode.offset !== -1 ) { var current = this.addScope(scopeNode); // create the scope or gets the existing one current.addSymbol(new Symbol(name, node, type)); } } - + public visitNode(node:nodes.Node):boolean { switch (node.type) { case nodes.NodeType.Keyframe: @@ -171,7 +171,7 @@ export class ScopeBuilder implements nodes.IVisitor { } return true; } - + public visitRuleSet(node:nodes.RuleSet):boolean { var current = this.scope.findScope(node.offset, node.length); node.getSelectors().getChildren().forEach((node) => { @@ -187,14 +187,14 @@ export class ScopeBuilder implements nodes.IVisitor { export class Symbols { - + private global:Scope; - + constructor(node:nodes.Node) { this.global = new GlobalScope(); node.accept(new ScopeBuilder(this.global)); } - + public findSymbolsAtOffset(offset:number, referenceType: nodes.ReferenceType) : Symbol[] { var scope = this.global.findScope(offset, 0); var result : Symbol[] = []; @@ -212,7 +212,7 @@ export class Symbols { } return result; } - + private internalFindSymbol(node:nodes.Node, referenceTypes:nodes.ReferenceType[]): Symbol { var scopeNode = node; if (node.parent instanceof nodes.FunctionParameter && node.parent.getParent() instanceof nodes.BodyDeclaration) { @@ -244,7 +244,7 @@ export class Symbols { } return null; } - + private evaluateReferenceTypes(node: nodes.Node) : nodes.ReferenceType[] { if (node instanceof nodes.Identifier) { var referenceTypes = ( node).referenceTypes; @@ -274,7 +274,7 @@ export class Symbols { } return null; } - + public findSymbolFromNode(node: nodes.Node):Symbol { if (!node) { return null; @@ -282,14 +282,14 @@ export class Symbols { while (node.type === nodes.NodeType.Interpolation) { node = node.getParent(); } - + var referenceTypes = this.evaluateReferenceTypes(node); if (referenceTypes) { return this.internalFindSymbol(node, referenceTypes); } return null; } - + public matchesSymbol(node: nodes.Node, symbol: Symbol):boolean { if (!node) { return null; @@ -300,17 +300,17 @@ export class Symbols { if (symbol.name.length !== node.length || symbol.name !== node.getText()) { return false; } - + var referenceTypes = this.evaluateReferenceTypes(node); if (!referenceTypes || referenceTypes.indexOf(symbol.type) === -1) { return false; } - + var nodeSymbol = this.internalFindSymbol(node, referenceTypes); return nodeSymbol === symbol; } - - + + public findSymbol(name:string, type: nodes.ReferenceType, offset:number):Symbol { var scope = this.global.findScope(offset); while(scope) { diff --git a/src/vs/languages/css/common/services/browsers.js b/src/vs/languages/css/common/services/browsers.js index db363c7f33e9582f4b9c94e3e586b5327138bd13..3742fce08500c8c6d344f5158d9aa4f5ffcc488e 100644 --- a/src/vs/languages/css/common/services/browsers.js +++ b/src/vs/languages/css/common/services/browsers.js @@ -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. *--------------------------------------------------------------------------------------------*/ - + // file generated from css-schema.xml using css-exclude_generate_browserjs.js define(["require", "exports"], function(require, exports) { diff --git a/src/vs/languages/typescript/common/typescript.ts b/src/vs/languages/typescript/common/typescript.ts index ee48668f23951e7d839226db9b4d024a61a03dec..a7cef06f12c2e75bb247758041d15ddad8c53599 100644 --- a/src/vs/languages/typescript/common/typescript.ts +++ b/src/vs/languages/typescript/common/typescript.ts @@ -64,7 +64,7 @@ export class DefaultProjectResolver implements IProjectResolver2 { files: [], options: undefined }; - + setConsumer(consumer: IProjectConsumer) { this._consumer = consumer; } @@ -91,7 +91,7 @@ export class DefaultProjectResolver implements IProjectResolver2 { let resource = filePath ? URI.file(filePath) : URI.create('extralib', undefined, Date.now().toString()); - + this._needsProjectUpdate = true; this._projectChange.files.push(resource); this._fileChanges.push({ kind: ChangeKind.Added, resource, content }); diff --git a/src/vs/platform/plugins/common/ipcRemoteCom.ts b/src/vs/platform/plugins/common/ipcRemoteCom.ts index 37e8069bd1a31ae7aeb84120fa0600b6f40dbf27..4f4cb636265f1398262b99c22502ce683c783889 100644 --- a/src/vs/platform/plugins/common/ipcRemoteCom.ts +++ b/src/vs/platform/plugins/common/ipcRemoteCom.ts @@ -23,7 +23,7 @@ var pendingRPCReplies: { [msgId: string]: IRPCReply; } = {}; function createRPC(serializeAndSend:(obj:any)=>void): IRPCFunc { var lastMessageId = 0; - + return function rpc(rpcId: string, method: string, args: any[]): winjs.TPromise { var req = String(++lastMessageId); var reply: IRPCReply = { @@ -61,7 +61,7 @@ export function create(send:(obj:string)=>void): IPluginsIPC { var rpc = createRPC(serializeAndSend); var bigHandler: remote.IManyHandler = null; var invokedHandlers: { [req: string]: winjs.TPromise; } = Object.create(null); - + var r: IPluginsIPC = { callOnRemote: rpc, registerBigHandler: (_bigHandler: remote.IManyHandler): void => { @@ -69,7 +69,7 @@ export function create(send:(obj:string)=>void): IPluginsIPC { }, handle: (rawmsg) => { var msg = marshalling.demarshallObject(rawmsg, proxiesMarshalling); - + if (msg.seq) { if (!pendingRPCReplies.hasOwnProperty(msg.seq)) { console.warn('Got reply to unknown seq'); @@ -93,22 +93,22 @@ export function create(send:(obj:string)=>void): IPluginsIPC { } return; } - + if (msg.err) { console.error(msg.err); return; } var rpcId = msg.rpcId; - + if (!bigHandler) { throw new Error('got message before big handler attached!'); } - + var req = msg.req; - + invokedHandlers[req] = invokeHandler(rpcId, msg.method, msg.args); - + invokedHandlers[req].then((r) => { delete invokedHandlers[req]; serializeAndSend({ @@ -124,13 +124,13 @@ export function create(send:(obj:string)=>void): IPluginsIPC { }); } }; - + var proxiesMarshalling = new remote.ProxiesMarshallingContribution(r); - + function serializeAndSend(msg:any): void { send(marshalling.marshallObject(msg, proxiesMarshalling)); } - + function invokeHandler(rpcId:string, method:string, args:any[]): winjs.TPromise { try { return winjs.TPromise.as(bigHandler.handle(rpcId, method, args)); @@ -138,7 +138,7 @@ export function create(send:(obj:string)=>void): IPluginsIPC { return winjs.TPromise.wrapError(err); } } - + return r; }; diff --git a/src/vs/workbench/parts/output/browser/outputActions.ts b/src/vs/workbench/parts/output/browser/outputActions.ts index 2e9b316845fed8e40cbb7b6e57cbb439b2229d8b..5f96cb8ef0816d9bea723819c9bf696bf8f5d892 100644 --- a/src/vs/workbench/parts/output/browser/outputActions.ts +++ b/src/vs/workbench/parts/output/browser/outputActions.ts @@ -191,7 +191,7 @@ export class SwitchOutputActionItem extends SelectActionItem { super(null, action, SwitchOutputActionItem.getChannels(outputService, input), SwitchOutputActionItem.getChannels(outputService, input).indexOf(input.getChannel())); this.input = input; - + this.outputService.onOutputChannel.add(this.onOutputChannel, this); } diff --git a/src/vs/workbench/parts/telemetry/test/node/appInsightsTelemetryAppender.test.ts b/src/vs/workbench/parts/telemetry/test/node/appInsightsTelemetryAppender.test.ts index 69d19b708420c8b245750d3d758e56d6ee002504..099bd31823d6c625e49687b516f511c370d65def 100644 --- a/src/vs/workbench/parts/telemetry/test/node/appInsightsTelemetryAppender.test.ts +++ b/src/vs/workbench/parts/telemetry/test/node/appInsightsTelemetryAppender.test.ts @@ -159,7 +159,7 @@ suite('Telemetry - AppInsightsTelemetryAppender', () => { assert.equal(appInsightsMock.events.length, 2); assert.equal(appInsightsMock.events[0].eventName, NodeAppInsightsTelemetryAppender.EVENT_NAME_PREFIX+'testEvent'); - + // test vortex assert.equal(appInsightsMock.events[1].eventName, NodeAppInsightsTelemetryAppender.EVENT_NAME_PREFIX+'testEvent'); }); diff --git a/src/vs/workbench/services/files/test/node/fileService.test.ts b/src/vs/workbench/services/files/test/node/fileService.test.ts index db96506f3275b64d35469164e700d8b6cd5078cf..e715e98c9f23b14500c803552c6d8eb74b794ebd 100644 --- a/src/vs/workbench/services/files/test/node/fileService.test.ts +++ b/src/vs/workbench/services/files/test/node/fileService.test.ts @@ -58,7 +58,7 @@ suite('FileService', () => { test('createFile', function(done: () => void) { this.timeout(10000); // test tends to need longer? - + let contents = 'Hello World'; service.createFile(uri.file(path.join(testDir, 'test.txt')), contents).done(s => { assert.equal(s.name, 'test.txt');