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

Take uri as argument instead of string version of uri

Browse Source
This commit is contained in:
Matt Bierner
2019-02-27 11:47:56 -08:00
parent 09905893e6
commit c7bf51034b
4 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vs/workbench/api/node/extHostDocumentContentProviders.ts
View File

@@ -52,13 +52,13 @@ export class ExtHostDocumentContentProvider implements ExtHostDocumentContentPro
this._logService.warn(`Provider for scheme '${scheme}' is firing event for schema '${uri.scheme}' which will be IGNORED`);
return;
}
if (this._documentsAndEditors.getDocument(uri.toString())) {
if (this._documentsAndEditors.getDocument(uri)) {
this.$provideTextDocumentContent(handle, uri).then(value => {
if (!value) {
return;
}
const document = this._documentsAndEditors.getDocument(uri.toString());
const document = this._documentsAndEditors.getDocument(uri);
if (!document) {
// disposed in the meantime
return;

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

@@ -60,7 +60,7 @@ export class ExtHostDocuments implements ExtHostDocumentsShape {
if (!resource) {
return undefined;
}
const data = this._documentsAndEditors.getDocument(resource.toString());
const data = this._documentsAndEditors.getDocument(resource);
if (data) {
return data;
}
@@ -77,7 +77,7 @@ export class ExtHostDocuments implements ExtHostDocumentsShape {
public ensureDocumentData(uri: URI): Promise<ExtHostDocumentData> {
let cached = this._documentsAndEditors.getDocument(uri.toString());
let cached = this._documentsAndEditors.getDocument(uri);
if (cached) {
return Promise.resolve(cached);
}
@@ -86,7 +86,7 @@ export class ExtHostDocuments implements ExtHostDocumentsShape {
if (!promise) {
promise = this._proxy.$tryOpenDocument(uri).then(() => {
this._documentLoader.delete(uri.toString());
return this._documentsAndEditors.getDocument(uri.toString());
return this._documentsAndEditors.getDocument(uri);
}, err => {
this._documentLoader.delete(uri.toString());
return Promise.reject(err);
@@ -103,8 +103,7 @@ export class ExtHostDocuments implements ExtHostDocumentsShape {
public $acceptModelModeChanged(uriComponents: UriComponents, oldModeId: string, newModeId: string): void {
const uri = URI.revive(uriComponents);
const strURL = uri.toString();
let data = this._documentsAndEditors.getDocument(strURL);
let data = this._documentsAndEditors.getDocument(uri);
// Treat a mode change as a remove + add
@@ -115,16 +114,14 @@ export class ExtHostDocuments implements ExtHostDocumentsShape {
public $acceptModelSaved(uriComponents: UriComponents): void {
const uri = URI.revive(uriComponents);
const strURL = uri.toString();
let data = this._documentsAndEditors.getDocument(strURL);
let data = this._documentsAndEditors.getDocument(uri);
this.$acceptDirtyStateChanged(uriComponents, false);
this._onDidSaveDocument.fire(data.document);
}
public $acceptDirtyStateChanged(uriComponents: UriComponents, isDirty: boolean): void {
const uri = URI.revive(uriComponents);
const strURL = uri.toString();
let data = this._documentsAndEditors.getDocument(strURL);
let data = this._documentsAndEditors.getDocument(uri);
data._acceptIsDirty(isDirty);
this._onDidChangeDocument.fire({
document: data.document,
@@ -134,8 +131,7 @@ export class ExtHostDocuments implements ExtHostDocumentsShape {
public $acceptModelChanged(uriComponents: UriComponents, events: IModelChangedEvent, isDirty: boolean): void {
const uri = URI.revive(uriComponents);
const strURL = uri.toString();
let data = this._documentsAndEditors.getDocument(strURL);
let data = this._documentsAndEditors.getDocument(uri);
data._acceptIsDirty(isDirty);
data.onEvents(events);
this._onDidChangeDocument.fire({

4
src/vs/workbench/api/node/extHostDocumentsAndEditors.ts
View File

@@ -131,8 +131,8 @@ export class ExtHostDocumentsAndEditors implements ExtHostDocumentsAndEditorsSha
}
}
getDocument(strUrl: string): ExtHostDocumentData {
return this._documents.get(strUrl);
getDocument(uri: URI): ExtHostDocumentData {
return this._documents.get(uri.toString());
}
allDocuments(): ExtHostDocumentData[] {

2
src/vs/workbench/api/node/extHostTypeConverters.ts
View File

@@ -457,7 +457,7 @@ export namespace WorkspaceEdit {
const [uri, uriOrEdits] = entry;
if (Array.isArray(uriOrEdits)) {
// text edits
const doc = documents && uri ? documents.getDocument(uri.toString()) : undefined;
const doc = documents && uri ? documents.getDocument(uri) : undefined;
result.edits.push(<ResourceTextEditDto>{ resource: uri, modelVersionId: doc && doc.version, edits: uriOrEdits.map(TextEdit.from) });
} else {
// resource edits