Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 19:18:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

adopt ITextModelResolverService for resources

Browse Source
This commit is contained in:
Benjamin Pasero
2016-11-04 12:26:00 +01:00
parent 4cc289a8a2
commit 1741f67dce
25 changed files with 161 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,7 @@ import { IFileService } from 'vs/platform/files/common/files';
import { IModeService } from 'vs/editor/common/services/modeService';
import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService';
import { ExtHostContext, MainThreadDocumentsShape, ExtHostDocumentsShape } from './extHost.protocol';
import { ITextModelResolverService } from 'vs/platform/textmodelResolver/common/textModelResolverService';
import { ITextModelResolverService } from 'vs/platform/textmodelResolver/common/resolver';
export class MainThreadDocuments extends MainThreadDocumentsShape {
private _modelService: IModelService;
@@ -187,7 +187,7 @@ export class MainThreadDocuments extends MainThreadDocumentsShape {
}
private _handleAsResourceInput(uri: URI): TPromise<boolean> {
return this._editorService.resolveEditorModel({ resource: uri }).then(model => {
return this._textModelResolverService.resolve(uri).then(model => {
return !!model;
});
}

6
src/vs/workbench/api/node/mainThreadWorkspace.ts
View File

@@ -15,6 +15,7 @@ import { bulkEdit, IResourceEdit } from 'vs/editor/common/services/bulkEdit';
import { TPromise } from 'vs/base/common/winjs.base';
import { Uri } from 'vscode';
import { MainThreadWorkspaceShape } from './extHost.protocol';
import { ITextModelResolverService } from 'vs/platform/textmodelResolver/common/resolver';
export class MainThreadWorkspace extends MainThreadWorkspaceShape {
@@ -23,6 +24,7 @@ export class MainThreadWorkspace extends MainThreadWorkspaceShape {
private _workspace: IWorkspace;
private _textFileService: ITextFileService;
private _editorService: IWorkbenchEditorService;
private _textModelResolverService: ITextModelResolverService;
private _eventService: IEventService;
constructor(
@@ -30,6 +32,7 @@ export class MainThreadWorkspace extends MainThreadWorkspaceShape {
@IWorkspaceContextService contextService: IWorkspaceContextService,
@ITextFileService textFileService,
@IWorkbenchEditorService editorService,
@ITextModelResolverService textModelResolverService,
@IEventService eventService
) {
super();
@@ -39,6 +42,7 @@ export class MainThreadWorkspace extends MainThreadWorkspaceShape {
this._textFileService = textFileService;
this._editorService = editorService;
this._eventService = eventService;
this._textModelResolverService = textModelResolverService;
}
$startSearch(include: string, exclude: string, maxResults: number, requestId: number): Thenable<Uri[]> {
@@ -95,7 +99,7 @@ export class MainThreadWorkspace extends MainThreadWorkspaceShape {
}
}
return bulkEdit(this._eventService, this._editorService, codeEditor, edits)
return bulkEdit(this._eventService, this._textModelResolverService, codeEditor, edits)
.then(() => true);
}
}