Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-24 02:28:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

debt - use Map instead of object

Browse Source
This commit is contained in:
Johannes Rieken
2016-12-30 15:37:12 +01:00
parent 8385b8c8bc
commit 118b3e0d5a
9 changed files with 110 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/vs/workbench/api/node/extHostDocuments.ts
View File

@@ -20,16 +20,14 @@ import { asWinJsPromise } from 'vs/base/common/async';
import { getWordAtText, ensureValidWordDefinition } from 'vs/editor/common/model/wordHelper';
import { MainContext, MainThreadDocumentsShape, ExtHostDocumentsShape, IModelAddedData } from './extHost.protocol';
const _modeId2WordDefinition: {
[modeId: string]: RegExp;
} = Object.create(null);
const _modeId2WordDefinition = new Map<string, RegExp>();
function setWordDefinitionFor(modeId: string, wordDefinition: RegExp): void {
_modeId2WordDefinition[modeId] = wordDefinition;
_modeId2WordDefinition.set(modeId, wordDefinition);
}
function getWordDefinitionFor(modeId: string): RegExp {
return _modeId2WordDefinition[modeId];
return _modeId2WordDefinition.get(modeId);
}
export class ExtHostDocuments extends ExtHostDocumentsShape {
@@ -48,9 +46,9 @@ export class ExtHostDocuments extends ExtHostDocumentsShape {
private _onDidSaveDocumentEventEmitter: Emitter<vscode.TextDocument>;
public onDidSaveDocument: Event<vscode.TextDocument>;
private _documentData: { [modelUri: string]: ExtHostDocumentData; };
private _documentLoader: { [modelUri: string]: TPromise<ExtHostDocumentData> };
private _documentContentProviders: { [handle: number]: vscode.TextDocumentContentProvider; };
private _documentData = new Map<string, ExtHostDocumentData>();
private _documentLoader = new Map<string, TPromise<ExtHostDocumentData>>();
private _documentContentProviders = new Map<number, vscode.TextDocumentContentProvider>();
private _proxy: MainThreadDocumentsShape;
@@ -69,17 +67,11 @@ export class ExtHostDocuments extends ExtHostDocumentsShape {
this._onDidSaveDocumentEventEmitter = new Emitter<vscode.TextDocument>();
this.onDidSaveDocument = this._onDidSaveDocumentEventEmitter.event;
this._documentData = Object.create(null);
this._documentLoader = Object.create(null);
this._documentContentProviders = Object.create(null);
}
public getAllDocumentData(): ExtHostDocumentData[] {
const result: ExtHostDocumentData[] = [];
for (let key in this._documentData) {
result.push(this._documentData[key]);
}
this._documentData.forEach(data => result.push(data));
return result;
}
@@ -87,7 +79,7 @@ export class ExtHostDocuments extends ExtHostDocumentsShape {
if (!resource) {
return;
}
const data = this._documentData[resource.toString()];
const data = this._documentData.get(resource.toString());
if (data) {
return data;
}
@@ -95,21 +87,21 @@ export class ExtHostDocuments extends ExtHostDocumentsShape {
public ensureDocumentData(uri: URI): TPromise<ExtHostDocumentData> {
let cached = this._documentData[uri.toString()];
let cached = this._documentData.get(uri.toString());
if (cached) {
return TPromise.as(cached);
}
let promise = this._documentLoader[uri.toString()];
let promise = this._documentLoader.get(uri.toString());
if (!promise) {
promise = this._proxy.$tryOpenDocument(uri).then(() => {
delete this._documentLoader[uri.toString()];
return this._documentData[uri.toString()];
this._documentLoader.delete(uri.toString());
return this._documentData.get(uri.toString());
}, err => {
delete this._documentLoader[uri.toString()];
this._documentLoader.delete(uri.toString());
return TPromise.wrapError(err);
});
this._documentLoader[uri.toString()] = promise;
this._documentLoader.set(uri.toString(), promise);
}
return promise;
@@ -122,13 +114,13 @@ export class ExtHostDocuments extends ExtHostDocumentsShape {
const handle = ExtHostDocuments._handlePool++;
this._documentContentProviders[handle] = provider;
this._documentContentProviders.set(handle, provider);
this._proxy.$registerTextContentProvider(handle, scheme);
let subscription: IDisposable;
if (typeof provider.onDidChange === 'function') {
subscription = provider.onDidChange(uri => {
if (this._documentData[uri.toString()]) {
if (this._documentData.has(uri.toString())) {
this.$provideTextDocumentContent(handle, <URI>uri).then(value => {
return this._proxy.$onVirtualDocumentChange(<URI>uri, value);
}, onUnexpectedError);
@@ -136,7 +128,7 @@ export class ExtHostDocuments extends ExtHostDocumentsShape {
});
}
return new Disposable(() => {
if (delete this._documentContentProviders[handle]) {
if (this._documentContentProviders.delete(handle)) {
this._proxy.$unregisterTextContentProvider(handle);
}
if (subscription) {
@@ -147,7 +139,7 @@ export class ExtHostDocuments extends ExtHostDocumentsShape {
}
$provideTextDocumentContent(handle: number, uri: URI): TPromise<string> {
const provider = this._documentContentProviders[handle];
const provider = this._documentContentProviders.get(handle);
if (!provider) {
return TPromise.wrapError<string>(`unsupported uri-scheme: ${uri.scheme}`);
}
@@ -157,15 +149,15 @@ export class ExtHostDocuments extends ExtHostDocumentsShape {
public $acceptModelAdd(initData: IModelAddedData): void {
let data = new ExtHostDocumentData(this._proxy, initData.url, initData.value.lines, initData.value.EOL, initData.modeId, initData.versionId, initData.isDirty);
let key = data.document.uri.toString();
if (this._documentData[key]) {
if (this._documentData.has(key)) {
throw new Error('Document `' + key + '` already exists.');
}
this._documentData[key] = data;
this._documentData.set(key, data);
this._onDidAddDocumentEventEmitter.fire(data.document);
}
public $acceptModelModeChanged(strURL: string, oldModeId: string, newModeId: string): void {
let data = this._documentData[strURL];
let data = this._documentData.get(strURL);
// Treat a mode change as a remove + add
@@ -175,33 +167,33 @@ export class ExtHostDocuments extends ExtHostDocumentsShape {
}
public $acceptModelSaved(strURL: string): void {
let data = this._documentData[strURL];
let data = this._documentData.get(strURL);
data._acceptIsDirty(false);
this._onDidSaveDocumentEventEmitter.fire(data.document);
}
public $acceptModelDirty(strURL: string): void {
let document = this._documentData[strURL];
let document = this._documentData.get(strURL);
document._acceptIsDirty(true);
}
public $acceptModelReverted(strURL: string): void {
let document = this._documentData[strURL];
let document = this._documentData.get(strURL);
document._acceptIsDirty(false);
}
public $acceptModelRemoved(strURL: string): void {
if (!this._documentData[strURL]) {
if (!this._documentData.has(strURL)) {
throw new Error('Document `' + strURL + '` does not exist.');
}
let data = this._documentData[strURL];
delete this._documentData[strURL];
let data = this._documentData.get(strURL);
this._documentData.delete(strURL);
this._onDidRemoveDocumentEventEmitter.fire(data.document);
data.dispose();
}
public $acceptModelChanged(strURL: string, events: editorCommon.IModelContentChangedEvent2[], isDirty: boolean): void {
let data = this._documentData[strURL];
let data = this._documentData.get(strURL);
data._acceptIsDirty(isDirty);
data.onEvents(events);
this._onDidChangeDocumentEventEmitter.fire({