diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts index c51d26837cd..a647bda170c 100644 --- a/src/vs/vscode.d.ts +++ b/src/vs/vscode.d.ts @@ -1119,21 +1119,6 @@ declare module 'vscode' { */ edit(callback: (editBuilder: TextEditorEdit) => void, options?: { undoStopBefore: boolean; undoStopAfter: boolean; }): Thenable; - /** - * Change document language by Id - * - * @param languageId new language identifier - */ - setLanguageById(languageId: string): void; - - /** - * Change document language by Name - * - * @param languageName new language name - */ - setLanguageByName(languageName: string): void; - - /** * Insert a [snippet](#SnippetString) and put the editor into snippet mode. "Snippet mode" * means the editor adds placeholders and additional cursors so that the user can complete @@ -1156,7 +1141,6 @@ declare module 'vscode' { * @param decorationType A decoration type. * @param rangesOrOptions Either [ranges](#Range) or more detailed [options](#DecorationOptions). */ - setDecorations(decorationType: TextEditorDecorationType, rangesOrOptions: Range[] | DecorationOptions[]): void; /** @@ -7391,7 +7375,7 @@ declare module 'vscode' { */ export namespace languages { - export function setLanguageById(documentUri: Uri, languageId: string): Thenable; + export function changeLanguage(documentUri: Uri, languageId: string): Thenable; /** * Return the identifiers of all known languages. diff --git a/src/vs/workbench/api/electron-browser/mainThreadDocumentsAndEditors.ts b/src/vs/workbench/api/electron-browser/mainThreadDocumentsAndEditors.ts index fda3bec2f7c..503b0a3254e 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadDocumentsAndEditors.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadDocumentsAndEditors.ts @@ -315,7 +315,7 @@ export class MainThreadDocumentsAndEditors { const mainThreadDocuments = new MainThreadDocuments(this, extHostContext, this._modelService, modeService, this._textFileService, fileService, textModelResolverService, untitledEditorService); extHostContext.set(MainContext.MainThreadDocuments, mainThreadDocuments); - const mainThreadTextEditors = new MainThreadTextEditors(this, extHostContext, this._modelService, modeService, codeEditorService, bulkEditService, this._editorService, this._editorGroupService); + const mainThreadTextEditors = new MainThreadTextEditors(this, extHostContext, codeEditorService, bulkEditService, this._editorService, this._editorGroupService); extHostContext.set(MainContext.MainThreadTextEditors, mainThreadTextEditors); // It is expected that the ctor of the state computer calls our `_onDelta`. diff --git a/src/vs/workbench/api/electron-browser/mainThreadEditors.ts b/src/vs/workbench/api/electron-browser/mainThreadEditors.ts index cbf524d4d21..8636585f8c2 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadEditors.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadEditors.ts @@ -27,8 +27,6 @@ import { ExtHostContext, ExtHostEditorsShape, IExtHostContext, ITextDocumentShow import { MainThreadDocumentsAndEditors } from './mainThreadDocumentsAndEditors'; import { MainThreadTextEditor } from './mainThreadEditor'; import { IOpenerService } from 'vs/platform/opener/common/opener'; -import { IModeService } from 'vs/editor/common/services/modeService'; -import { IModelService } from 'vs/editor/common/services/modelService'; export class MainThreadTextEditors implements MainThreadTextEditorsShape { @@ -45,8 +43,6 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape { constructor( documentsAndEditors: MainThreadDocumentsAndEditors, extHostContext: IExtHostContext, - @IModelService private readonly _modelService: IModelService, - @IModeService private readonly _modeService: IModeService, @ICodeEditorService private readonly _codeEditorService: ICodeEditorService, @IBulkEditService private readonly _bulkEditService: IBulkEditService, @IEditorService private readonly _editorService: IEditorService, @@ -174,26 +170,6 @@ export class MainThreadTextEditors implements MainThreadTextEditorsShape { return TPromise.as(null); } - $trySetLanguageById(id: string, languageId: string): TPromise { - let mainThreadEditor = this._documentsAndEditors.getEditor(id); - if (!mainThreadEditor) { - return TPromise.wrapError(disposed(`TextEditor(${id})`)); - } - let mode = this._modeService.getOrCreateModeByLanguageId(languageId); - this._modelService.setMode(mainThreadEditor.getModel(), mode); - return TPromise.as(null); - } - - $trySetLanguageByName(id: string, languageName: string): TPromise { - let mainThreadEditor = this._documentsAndEditors.getEditor(id); - if (!mainThreadEditor) { - return TPromise.wrapError(disposed(`TextEditor(${id})`)); - } - let mode = this._modeService.getOrCreateModeByLanguageName(languageName); - this._modelService.setMode(mainThreadEditor.getModel(), mode); - return TPromise.as(null); - } - $trySetDecorations(id: string, key: string, ranges: IDecorationOptions[]): TPromise { key = `${this._instanceId}-${key}`; if (!this._documentsAndEditors.getEditor(id)) { diff --git a/src/vs/workbench/api/electron-browser/mainThreadLanguages.ts b/src/vs/workbench/api/electron-browser/mainThreadLanguages.ts index a2120b921bd..e23ae89db8f 100644 --- a/src/vs/workbench/api/electron-browser/mainThreadLanguages.ts +++ b/src/vs/workbench/api/electron-browser/mainThreadLanguages.ts @@ -33,7 +33,7 @@ export class MainThreadLanguages implements MainThreadLanguagesShape { return TPromise.as(this._modeService.getRegisteredModes()); } - $setLanguageById(resource: UriComponents, languageId: string): TPromise { + $changeLanguage(resource: UriComponents, languageId: string): TPromise { const uri = URI.revive(resource); let model = this._modelService.getModel(uri); if (!model) { diff --git a/src/vs/workbench/api/node/extHost.api.impl.ts b/src/vs/workbench/api/node/extHost.api.impl.ts index de5b0662355..05932119437 100644 --- a/src/vs/workbench/api/node/extHost.api.impl.ts +++ b/src/vs/workbench/api/node/extHost.api.impl.ts @@ -258,8 +258,8 @@ export function createApiFactory( getLanguages(): TPromise { return extHostLanguages.getLanguages(); }, - setLanguageById(documentUri: vscode.Uri, languageId: string): TPromise { - return extHostLanguages.setLanguageById(documentUri, languageId); + changeLanguage(documentUri: vscode.Uri, languageId: string): TPromise { + return extHostLanguages.changeLanguage(documentUri, languageId); }, match(selector: vscode.DocumentSelector, document: vscode.TextDocument): number { return score(typeConverters.LanguageSelector.from(selector), document.uri, document.languageId, true); diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts index 88f268faceb..d77f0ed0e8b 100644 --- a/src/vs/workbench/api/node/extHost.protocol.ts +++ b/src/vs/workbench/api/node/extHost.protocol.ts @@ -193,8 +193,6 @@ export interface MainThreadTextEditorsShape extends IDisposable { $tryShowEditor(id: string, position: EditorViewColumn): TPromise; $tryHideEditor(id: string): TPromise; $trySetOptions(id: string, options: ITextEditorConfigurationUpdate): TPromise; - $trySetLanguageById(id: string, languageId: string): TPromise; - $trySetLanguageByName(id: string, languageName: string): TPromise; $trySetDecorations(id: string, key: string, ranges: editorCommon.IDecorationOptions[]): TPromise; $trySetDecorationsFast(id: string, key: string, ranges: number[]): TPromise; $tryRevealRange(id: string, range: IRange, revealType: TextEditorRevealType): TPromise; @@ -289,7 +287,7 @@ export interface MainThreadLanguageFeaturesShape extends IDisposable { export interface MainThreadLanguagesShape extends IDisposable { $getLanguages(): TPromise; - $setLanguageById(resource: UriComponents, languageId: string): TPromise; + $changeLanguage(resource: UriComponents, languageId: string): TPromise; } export interface MainThreadMessageOptions { diff --git a/src/vs/workbench/api/node/extHostLanguages.ts b/src/vs/workbench/api/node/extHostLanguages.ts index af8648c67c7..9ad497bbd92 100644 --- a/src/vs/workbench/api/node/extHostLanguages.ts +++ b/src/vs/workbench/api/node/extHostLanguages.ts @@ -21,7 +21,7 @@ export class ExtHostLanguages { getLanguages(): TPromise { return this._proxy.$getLanguages(); } - setLanguageById(documentUri: vscode.Uri, languageId: string): TPromise { - return this._proxy.$setLanguageById(documentUri, languageId); + changeLanguage(documentUri: vscode.Uri, languageId: string): TPromise { + return this._proxy.$changeLanguage(documentUri, languageId); } } diff --git a/src/vs/workbench/api/node/extHostTextEditor.ts b/src/vs/workbench/api/node/extHostTextEditor.ts index 0e07698583f..0d9d7c2d9a7 100644 --- a/src/vs/workbench/api/node/extHostTextEditor.ts +++ b/src/vs/workbench/api/node/extHostTextEditor.ts @@ -435,14 +435,6 @@ export class ExtHostTextEditor implements vscode.TextEditor { this._trySetSelection(); } - setLanguageById(languageId: string): void { - this._runOnProxy(() => this._proxy.$trySetLanguageById(this._id, languageId)); - } - - setLanguageByName(languageName: string): void { - this._runOnProxy(() => this._proxy.$trySetLanguageByName(this._id, languageName)); - } - setDecorations(decorationType: vscode.TextEditorDecorationType, ranges: Range[] | vscode.DecorationOptions[]): void { this._runOnProxy( () => { diff --git a/src/vs/workbench/test/electron-browser/api/extHostTextEditor.test.ts b/src/vs/workbench/test/electron-browser/api/extHostTextEditor.test.ts index 1206dce8b84..ff187f60156 100644 --- a/src/vs/workbench/test/electron-browser/api/extHostTextEditor.test.ts +++ b/src/vs/workbench/test/electron-browser/api/extHostTextEditor.test.ts @@ -60,8 +60,6 @@ suite('ExtHostTextEditorOptions', () => { $removeTextEditorDecorationType: undefined, $tryShowEditor: undefined, $tryHideEditor: undefined, - $trySetLanguageById: undefined, - $trySetLanguageByName: undefined, $trySetDecorations: undefined, $trySetDecorationsFast: undefined, $tryRevealRange: undefined, diff --git a/src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts b/src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts index 5bc1131da84..fdb4b5575c3 100644 --- a/src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts +++ b/src/vs/workbench/test/electron-browser/api/mainThreadEditors.test.ts @@ -94,15 +94,13 @@ suite('MainThreadEditors', () => { } }); - const emptyModeService = null; - const documentAndEditor = new MainThreadDocumentsAndEditors( rpcProtocol, modelService, textFileService, workbenchEditorService, codeEditorService, - emptyModeService, + null, fileService, null, null, @@ -113,8 +111,6 @@ suite('MainThreadEditors', () => { editors = new MainThreadTextEditors( documentAndEditor, SingleProxyRPCProtocol(null), - modelService, - emptyModeService, codeEditorService, bulkEditService, workbenchEditorService,