maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

debt - move things from browser to common that are easy to move

Browse source
This commit is contained in:
Johannes Rieken 2015-12-07 13:04:07 +01:00
parent 3dd0a89aba
commit ba2988de9d
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/vs/editor/common/services/bulkEdit.ts
View file

@ -12,7 +12,7 @@ import {TPromise} from 'vs/base/common/winjs.base';
import {IEventService} from 'vs/platform/event/common/event';
import {IEditorService} from 'vs/platform/editor/common/editor';
import {IRange, ISelection, IEditorSelection, IModel, IIdentifiedSingleEditOperation} from 'vs/editor/common/editorCommon';
import {ICodeEditor} from 'vs/editor/browser/editorBrowser';
import {ICommonCodeEditor} from 'vs/editor/common/editorCommon';
import {Range} from 'vs/editor/common/core/range';
import {Selection} from 'vs/editor/common/core/selection';
import {IFileChange, EventType as FileEventType, FileChangesEvent} from 'vs/platform/files/common/files';
@ -243,13 +243,13 @@ export interface BulkEdit {
finish(): TPromise<ISelection>;
}
export function bulkEdit(eventService:IEventService, editorService:IEditorService, editor:ICodeEditor, edits:IResourceEdit[]):TPromise<any> {
export function bulkEdit(eventService:IEventService, editorService:IEditorService, editor:ICommonCodeEditor, edits:IResourceEdit[]):TPromise<any> {
let bulk = createBulkEdit(eventService, editorService, editor);
bulk.add(edits);
return bulk.finish();
}
export function createBulkEdit(eventService: IEventService, editorService: IEditorService, editor: ICodeEditor): BulkEdit {
export function createBulkEdit(eventService: IEventService, editorService: IEditorService, editor: ICommonCodeEditor): BulkEdit {
let all: IResourceEdit[] = [];
let recording = new ChangeRecorder(eventService).start();

4
src/vs/workbench/api/browser/pluginHost.api.impl.ts
View file

@ -12,11 +12,11 @@ import {PluginHostFileSystemEventService} from 'vs/workbench/api/common/pluginHo
import {PluginHostModelService, setWordDefinitionFor} from 'vs/workbench/api/common/pluginHostDocuments';
import {PluginHostConfiguration} from 'vs/workbench/api/common/pluginHostConfiguration';
import {PluginHostDiagnostics} from 'vs/workbench/api/common/pluginHostDiagnostics';
import {PluginHostWorkspace} from 'vs/workbench/api/browser/pluginHostWorkspace';
import {PluginHostWorkspace} from 'vs/workbench/api/common/pluginHostWorkspace';
import {PluginHostQuickOpen} from 'vs/workbench/api/browser/pluginHostQuickOpen';
import {PluginHostStatusBar} from 'vs/workbench/api/browser/pluginHostStatusBar';
import {PluginHostCommands} from 'vs/workbench/api/common/pluginHostCommands';
import {ExtHostOutputService} from 'vs/workbench/api/browser/extHostOutputService';
import {ExtHostOutputService} from 'vs/workbench/api/common/extHostOutputService';
import {PluginHostMessageService} from 'vs/workbench/api/common/pluginHostMessageService';
import {PluginHostTelemetryService} from 'vs/workbench/api/common/pluginHostTelemetry';
import {PluginHostEditors} from 'vs/workbench/api/common/pluginHostEditors';

0
src/vs/workbench/api/browser/extHostOutputService.ts → src/vs/workbench/api/common/extHostOutputService.ts
View file

6
src/vs/workbench/api/browser/pluginHostWorkspace.ts → src/vs/workbench/api/common/pluginHostWorkspace.ts
View file

@ -13,7 +13,7 @@ import {IEventService} from 'vs/platform/event/common/event';
import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService';
import {ITextFileService, ITextFileOperationResult} from 'vs/workbench/parts/files/common/files';
import {Uri, FileSystemWatcher} from 'vscode';
import {ICodeEditor} from 'vs/editor/browser/editorBrowser';
import {ICommonCodeEditor} from 'vs/editor/common/editorCommon';
import {bulkEdit, IResourceEdit} from 'vs/editor/common/services/bulkEdit';
import {TPromise} from 'vs/base/common/winjs.base';
import {fromRange} from 'vs/workbench/api/common/pluginHostTypeConverters';
@ -126,10 +126,10 @@ export class MainThreadWorkspace {
applyWorkspaceEdit(edits: IResourceEdit[]): TPromise<boolean> {
let codeEditor: ICodeEditor;
let codeEditor: ICommonCodeEditor;
let editor = this._editorService.getActiveEditor();
if (editor) {
let candidate = <ICodeEditor> editor.getControl();
let candidate = <ICommonCodeEditor> editor.getControl();
if (typeof candidate.getEditorType === 'function') {
// enough proof
codeEditor = candidate;

4
src/vs/workbench/electron-browser/shell.ts
View file

@ -62,11 +62,11 @@ import {MainThreadStatusBar} from 'vs/workbench/api/browser/pluginHostStatusBar'
import {MainThreadCommands} from 'vs/workbench/api/common/pluginHostCommands';
import {RemoteTelemetryServiceHelper} from 'vs/platform/telemetry/common/abstractRemoteTelemetryService';
import {MainThreadDiagnostics} from 'vs/workbench/api/common/pluginHostDiagnostics';
import {MainThreadOutputService} from 'vs/workbench/api/browser/extHostOutputService';
import {MainThreadOutputService} from 'vs/workbench/api/common/extHostOutputService';
import {MainThreadMessageService} from 'vs/workbench/api/common/pluginHostMessageService';
import {MainThreadLanguages} from 'vs/workbench/api/common/extHostLanguages';
import {MainThreadEditors} from 'vs/workbench/api/common/pluginHostEditors';
import {MainThreadWorkspace} from 'vs/workbench/api/browser/pluginHostWorkspace';
import {MainThreadWorkspace} from 'vs/workbench/api/common/pluginHostWorkspace';
import {MainThreadConfiguration} from 'vs/workbench/api/common/pluginHostConfiguration';
import {MainThreadLanguageFeatures} from 'vs/workbench/api/common/extHostLanguageFeatures';
import {EventService} from 'vs/platform/event/common/eventService';