diff --git a/src/vs/workbench/api/electron-browser/mainThreadDocumentsAndEditors.ts b/src/vs/workbench/api/electron-browser/mainThreadDocumentsAndEditors.ts index 186e24fd4fa933b756fc96b6365c263cd7abb7a6..fc6880d302cc727df0ff8ee26cfab61c18f579bd 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadDocumentsAndEditors.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadDocumentsAndEditors.ts @@ -398,7 +398,7 @@ export class MainThreadDocumentsAndEditors { private _toModelAddData(model: IModel): IModelAddedData { return { - url: model.uri, + uri: model.uri, versionId: model.getVersionId(), lines: model.getLinesContent(), EOL: model.getEOL(), @@ -410,7 +410,7 @@ export class MainThreadDocumentsAndEditors { private _toTextEditorAddData(textEditor: MainThreadTextEditor): ITextEditorAddData { return { id: textEditor.getId(), - document: textEditor.getModel().uri, + documentUri: textEditor.getModel().uri, options: textEditor.getConfiguration(), selections: textEditor.getSelections(), editorPosition: this._findEditorPosition(textEditor) diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts index 9a21e4409ddc19719ea0cd7d1fe6d50270cef45d..211893aaf91d792081ec9bddd1b82b36f99c1abc 100644 --- a/src/vs/workbench/api/node/extHost.protocol.ts +++ b/src/vs/workbench/api/node/extHost.protocol.ts @@ -436,7 +436,7 @@ export interface ExtHostDocumentContentProvidersShape { } export interface IModelAddedData { - url: URI; + uri: UriComponents; versionId: number; lines: string[]; EOL: string; @@ -456,7 +456,7 @@ export interface ExtHostDocumentSaveParticipantShape { export interface ITextEditorAddData { id: string; - document: URI; + documentUri: UriComponents; options: IResolvedTextEditorConfiguration; selections: ISelection[]; editorPosition: EditorPosition; @@ -699,7 +699,7 @@ export const ExtHostContext = { ExtHostDiagnostics: createExtId('ExtHostDiagnostics'), ExtHostDebugService: createExtId('ExtHostDebugService', ProxyType.CustomMarshaller), ExtHostDecorations: createExtId('ExtHostDecorations'), - ExtHostDocumentsAndEditors: createExtId('ExtHostDocumentsAndEditors', ProxyType.CustomMarshaller), + ExtHostDocumentsAndEditors: createExtId('ExtHostDocumentsAndEditors'), ExtHostDocuments: createExtId('ExtHostDocuments'), ExtHostDocumentContentProviders: createExtId('ExtHostDocumentContentProviders'), ExtHostDocumentSaveParticipant: createExtId('ExtHostDocumentSaveParticipant'), diff --git a/src/vs/workbench/api/node/extHostDocumentsAndEditors.ts b/src/vs/workbench/api/node/extHostDocumentsAndEditors.ts index fcba0bcaa0909b1dd0bd0d259d78a9dd510abe96..b3f6f63fedc93c293b6568d610e496bd31d3de4c 100644 --- a/src/vs/workbench/api/node/extHostDocumentsAndEditors.ts +++ b/src/vs/workbench/api/node/extHostDocumentsAndEditors.ts @@ -11,6 +11,7 @@ import { ExtHostDocumentData } from './extHostDocumentData'; import { ExtHostTextEditor } from './extHostTextEditor'; import * as assert from 'assert'; import * as typeConverters from './extHostTypeConverters'; +import URI from 'vs/base/common/uri'; export class ExtHostDocumentsAndEditors implements ExtHostDocumentsAndEditorsShape { @@ -49,18 +50,19 @@ export class ExtHostDocumentsAndEditors implements ExtHostDocumentsAndEditorsSha if (delta.addedDocuments) { for (const data of delta.addedDocuments) { - assert.ok(!this._documents.has(data.url.toString()), `document '${data.url} already exists!'`); + const resource = URI.revive(data.uri); + assert.ok(!this._documents.has(resource.toString()), `document '${resource} already exists!'`); const documentData = new ExtHostDocumentData( this._mainContext.getProxy(MainContext.MainThreadDocuments), - data.url, + resource, data.lines, data.EOL, data.modeId, data.versionId, data.isDirty ); - this._documents.set(data.url.toString(), documentData); + this._documents.set(resource.toString(), documentData); addedDocuments.push(documentData); } } @@ -75,10 +77,11 @@ export class ExtHostDocumentsAndEditors implements ExtHostDocumentsAndEditorsSha if (delta.addedEditors) { for (const data of delta.addedEditors) { - assert.ok(this._documents.has(data.document.toString()), `document '${data.document}' does not exist`); + const resource = URI.revive(data.documentUri); + assert.ok(this._documents.has(resource.toString()), `document '${resource}' does not exist`); assert.ok(!this._editors.has(data.id), `editor '${data.id}' already exists!`); - const documentData = this._documents.get(data.document.toString()); + const documentData = this._documents.get(resource.toString()); const editor = new ExtHostTextEditor( this._mainContext.getProxy(MainContext.MainThreadEditors), data.id, diff --git a/src/vs/workbench/test/electron-browser/api/extHostApiCommands.test.ts b/src/vs/workbench/test/electron-browser/api/extHostApiCommands.test.ts index c23c9c69e42ebf5265b9a4618bec889d0ee5b5fe..7bad690e32a63f6b778831340c9b80800068cbae 100644 --- a/src/vs/workbench/test/electron-browser/api/extHostApiCommands.test.ts +++ b/src/vs/workbench/test/electron-browser/api/extHostApiCommands.test.ts @@ -104,7 +104,7 @@ suite('ExtHostLanguageFeatureCommands', function () { isDirty: false, versionId: model.getVersionId(), modeId: model.getLanguageIdentifier().language, - url: model.uri, + uri: model.uri, lines: model.getValue().split(model.getEOL()), EOL: model.getEOL(), }] diff --git a/src/vs/workbench/test/electron-browser/api/extHostDocumentSaveParticipant.test.ts b/src/vs/workbench/test/electron-browser/api/extHostDocumentSaveParticipant.test.ts index fd74eede73c77b92c1c7cbf96f97ccc16dbfb07a..290c662d70abe0f4c98d71621548e1f592a6b050 100644 --- a/src/vs/workbench/test/electron-browser/api/extHostDocumentSaveParticipant.test.ts +++ b/src/vs/workbench/test/electron-browser/api/extHostDocumentSaveParticipant.test.ts @@ -42,7 +42,7 @@ suite('ExtHostDocumentSaveParticipant', () => { addedDocuments: [{ isDirty: false, modeId: 'foo', - url: resource, + uri: resource, versionId: 1, lines: ['foo'], EOL: '\n', diff --git a/src/vs/workbench/test/electron-browser/api/extHostDocumentsAndEditors.test.ts b/src/vs/workbench/test/electron-browser/api/extHostDocumentsAndEditors.test.ts index cde58b49aa98ed1c0d8629f8e3cd664640eac2f0..b171ace99f9e438fabb1be9d5ba5b0d779375db4 100644 --- a/src/vs/workbench/test/electron-browser/api/extHostDocumentsAndEditors.test.ts +++ b/src/vs/workbench/test/electron-browser/api/extHostDocumentsAndEditors.test.ts @@ -28,7 +28,7 @@ suite('ExtHostDocumentsAndEditors', () => { EOL: '\n', isDirty: true, modeId: 'fooLang', - url: URI.parse('foo:bar'), + uri: URI.parse('foo:bar'), versionId: 1, lines: [ 'first', diff --git a/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts b/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts index c5959a51943ebaab34257a29b378a086aa01a25f..f5d4b48b559dfd649dd8891c797780c8538eb7da 100644 --- a/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts +++ b/src/vs/workbench/test/electron-browser/api/extHostLanguageFeatures.test.ts @@ -93,7 +93,7 @@ suite('ExtHostLanguageFeatures', function () { isDirty: false, versionId: model.getVersionId(), modeId: model.getLanguageIdentifier().language, - url: model.uri, + uri: model.uri, lines: model.getValue().split(model.getEOL()), EOL: model.getEOL(), }] diff --git a/src/vs/workbench/test/electron-browser/api/extHostTextEditors.test.ts b/src/vs/workbench/test/electron-browser/api/extHostTextEditors.test.ts index 4c012a03b62efac897f9a6bf74b854d2d8eb51a5..21a7692717cee7f63231736fc924d6ea37c5be00 100644 --- a/src/vs/workbench/test/electron-browser/api/extHostTextEditors.test.ts +++ b/src/vs/workbench/test/electron-browser/api/extHostTextEditors.test.ts @@ -35,7 +35,7 @@ suite('ExtHostTextEditors.applyWorkspaceEdit', () => { addedDocuments: [{ isDirty: false, modeId: 'foo', - url: resource, + uri: resource, versionId: 1337, lines: ['foo'], EOL: '\n',