move api/common to api/browser

src/vs/workbench/api/common/extHost.api.impl.ts → src/vs/workbench/api/node/extHost.api.impl.ts

@@ -8,21 +8,21 @@ import {IBracketElectricCharacterContribution} from 'vs/editor/common/modes/supp
 import {score} from 'vs/editor/common/modes/languageSelector';
 import {Remotable, IThreadService} from 'vs/platform/thread/common/thread';
 import * as errors from 'vs/base/common/errors';
-import {ExtHostFileSystemEventService} from 'vs/workbench/api/common/extHostFileSystemEventService';
-import {ExtHostModelService, setWordDefinitionFor} from 'vs/workbench/api/common/extHostDocuments';
-import {ExtHostConfiguration} from 'vs/workbench/api/common/extHostConfiguration';
-import {ExtHostDiagnostics} from 'vs/workbench/api/common/extHostDiagnostics';
-import {ExtHostWorkspace} from 'vs/workbench/api/common/extHostWorkspace';
-import {ExtHostQuickOpen} from 'vs/workbench/api/common/extHostQuickOpen';
-import {ExtHostStatusBar} from 'vs/workbench/api/common/extHostStatusBar';
-import {ExtHostCommands} from 'vs/workbench/api/common/extHostCommands';
-import {ExtHostOutputService} from 'vs/workbench/api/common/extHostOutputService';
-import {ExtHostMessageService} from 'vs/workbench/api/common/extHostMessageService';
-import {ExtHostEditors} from 'vs/workbench/api/common/extHostEditors';
-import {ExtHostLanguages} from 'vs/workbench/api/common/extHostLanguages';
-import {ExtHostLanguageFeatures} from 'vs/workbench/api/common/extHostLanguageFeatures';
-import {registerApiCommands} from 'vs/workbench/api/common/extHostApiCommands';
-import * as extHostTypes from 'vs/workbench/api/common/extHostTypes';
+import {ExtHostFileSystemEventService} from 'vs/workbench/api/node/extHostFileSystemEventService';
+import {ExtHostModelService, setWordDefinitionFor} from 'vs/workbench/api/node/extHostDocuments';
+import {ExtHostConfiguration} from 'vs/workbench/api/node/extHostConfiguration';
+import {ExtHostDiagnostics} from 'vs/workbench/api/node/extHostDiagnostics';
+import {ExtHostWorkspace} from 'vs/workbench/api/node/extHostWorkspace';
+import {ExtHostQuickOpen} from 'vs/workbench/api/node/extHostQuickOpen';
+import {ExtHostStatusBar} from 'vs/workbench/api/node/extHostStatusBar';
+import {ExtHostCommands} from 'vs/workbench/api/node/extHostCommands';
+import {ExtHostOutputService} from 'vs/workbench/api/node/extHostOutputService';
+import {ExtHostMessageService} from 'vs/workbench/api/node/extHostMessageService';
+import {ExtHostEditors} from 'vs/workbench/api/node/extHostEditors';
+import {ExtHostLanguages} from 'vs/workbench/api/node/extHostLanguages';
+import {ExtHostLanguageFeatures} from 'vs/workbench/api/node/extHostLanguageFeatures';
+import {registerApiCommands} from 'vs/workbench/api/node/extHostApiCommands';
+import * as extHostTypes from 'vs/workbench/api/node/extHostTypes';
 import Modes = require('vs/editor/common/modes');
 import {IModeService} from 'vs/editor/common/services/modeService';
 import {ICommentsSupportContribution, ITokenTypeClassificationSupportContribution} from 'vs/editor/common/modes/supports';
@@ -37,7 +37,7 @@ import {TPromise} from 'vs/base/common/winjs.base';
 import {IWorkspaceContextService} from 'vs/platform/workspace/common/workspace';
 import {CancellationTokenSource} from 'vs/base/common/cancellation';
 import vscode = require('vscode');
-import {TextEditorRevealType} from 'vs/workbench/api/common/mainThreadEditors';
+import {TextEditorRevealType} from 'vs/workbench/api/node/mainThreadEditors';
 import * as paths from 'vs/base/common/paths';
 
 /**

src/vs/workbench/api/common/extHostApiCommands.ts → src/vs/workbench/api/node/extHostApiCommands.ts

@@ -8,12 +8,12 @@ import URI from 'vs/base/common/uri';
 import {TPromise} from 'vs/base/common/winjs.base';
 import {IDisposable} from 'vs/base/common/lifecycle';
 import * as vscode from 'vscode';
-import * as typeConverters from 'vs/workbench/api/common/extHostTypeConverters';
-import * as types from 'vs/workbench/api/common/extHostTypes';
+import * as typeConverters from 'vs/workbench/api/node/extHostTypeConverters';
+import * as types from 'vs/workbench/api/node/extHostTypes';
 import {ISingleEditOperation} from 'vs/editor/common/editorCommon';
 import * as modes from 'vs/editor/common/modes';
 import {ICommandHandlerDescription} from 'vs/platform/keybinding/common/keybindingService';
-import {ExtHostCommands} from 'vs/workbench/api/common/extHostCommands';
+import {ExtHostCommands} from 'vs/workbench/api/node/extHostCommands';
 import {IQuickFix2} from 'vs/editor/contrib/quickFix/common/quickFix';
 import {IOutline} from 'vs/editor/contrib/quickOpen/common/quickOpen';
 import {ITypeBearing} from 'vs/workbench/parts/search/common/search';

src/vs/workbench/api/common/extHostCommands.ts → src/vs/workbench/api/node/extHostCommands.ts

@@ -9,9 +9,9 @@ import {validateConstraint} from 'vs/base/common/types';
 import {KeybindingsRegistry} from 'vs/platform/keybinding/common/keybindingsRegistry';
 import {IKeybindingService, ICommandHandlerDescription} from 'vs/platform/keybinding/common/keybindingService';
 import {TPromise} from 'vs/base/common/winjs.base';
-import {ExtHostEditors} from 'vs/workbench/api/common/extHostEditors';
-import * as extHostTypes from 'vs/workbench/api/common/extHostTypes';
-import * as extHostTypeConverter from 'vs/workbench/api/common/extHostTypeConverters';
+import {ExtHostEditors} from 'vs/workbench/api/node/extHostEditors';
+import * as extHostTypes from 'vs/workbench/api/node/extHostTypes';
+import * as extHostTypeConverter from 'vs/workbench/api/node/extHostTypeConverters';
 import {cloneAndChange} from 'vs/base/common/objects';
 
 interface CommandHandler {

src/vs/workbench/api/common/extHostDocuments.ts → src/vs/workbench/api/node/extHostDocuments.ts

@@ -14,7 +14,7 @@ import {Remotable, IThreadService} from 'vs/platform/thread/common/thread';
 import Event, {Emitter} from 'vs/base/common/event';
 import URI from 'vs/base/common/uri';
 import {IDisposable, disposeAll} from 'vs/base/common/lifecycle';
-import {Range, Position, Disposable} from 'vs/workbench/api/common/extHostTypes';
+import {Range, Position, Disposable} from 'vs/workbench/api/node/extHostTypes';
 import {IEventService} from 'vs/platform/event/common/event';
 import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService';
 import {EventType as FileEventType, LocalFileChangeEvent, ITextFileService} from 'vs/workbench/parts/files/common/files';

src/vs/workbench/api/common/extHostEditors.ts → src/vs/workbench/api/node/extHostEditors.ts

@@ -9,14 +9,14 @@ import Event, {Emitter} from 'vs/base/common/event';
 import {IDisposable, disposeAll} from 'vs/base/common/lifecycle';
 import {TPromise} from 'vs/base/common/winjs.base';
 import {Remotable, IThreadService} from 'vs/platform/thread/common/thread';
-import {ExtHostModelService, ExtHostDocumentData} from 'vs/workbench/api/common/extHostDocuments';
+import {ExtHostModelService, ExtHostDocumentData} from 'vs/workbench/api/node/extHostDocuments';
 import {Selection, Range, Position, EditorOptions} from './extHostTypes';
 import {ISingleEditOperation, ISelection, IRange, IInternalIndentationOptions, IEditor, EditorType, ICommonCodeEditor, ICommonDiffEditor, IDecorationRenderOptions, IRangeWithMessage} from 'vs/editor/common/editorCommon';
 import {ICodeEditorService} from 'vs/editor/common/services/codeEditorService';
 import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService';
 import {IEditor as IPlatformEditor, Position as EditorPosition} from 'vs/platform/editor/common/editor';
 import {IModelService} from 'vs/editor/common/services/modelService';
-import {MainThreadEditorsTracker, TextEditorRevealType, MainThreadTextEditor, ITextEditorConfiguration} from 'vs/workbench/api/common/mainThreadEditors';
+import {MainThreadEditorsTracker, TextEditorRevealType, MainThreadTextEditor, ITextEditorConfiguration} from 'vs/workbench/api/node/mainThreadEditors';
 import * as TypeConverters from './extHostTypeConverters';
 import {TextDocument, TextEditorSelectionChangeEvent, TextEditorOptionsChangeEvent, TextEditorOptions, ViewColumn} from 'vscode';
 import {EventType} from 'vs/workbench/common/events';

src/vs/workbench/api/common/extHostLanguageFeatures.ts → src/vs/workbench/api/node/extHostLanguageFeatures.ts

@@ -11,14 +11,14 @@ import {IDisposable, disposeAll} from 'vs/base/common/lifecycle';
 import {Remotable, IThreadService} from 'vs/platform/thread/common/thread';
 import {Range as EditorRange} from 'vs/editor/common/core/range';
 import * as vscode from 'vscode';
-import * as TypeConverters from 'vs/workbench/api/common/extHostTypeConverters';
-import {Range, DocumentHighlightKind, Disposable, Diagnostic, SignatureHelp} from 'vs/workbench/api/common/extHostTypes';
+import * as TypeConverters from 'vs/workbench/api/node/extHostTypeConverters';
+import {Range, DocumentHighlightKind, Disposable, Diagnostic, SignatureHelp} from 'vs/workbench/api/node/extHostTypes';
 import {IPosition, IRange, ISingleEditOperation} from 'vs/editor/common/editorCommon';
 import * as modes from 'vs/editor/common/modes';
 import {CancellationTokenSource} from 'vs/base/common/cancellation';
-import {ExtHostModelService} from 'vs/workbench/api/common/extHostDocuments';
+import {ExtHostModelService} from 'vs/workbench/api/node/extHostDocuments';
 import {IMarkerService, IMarker} from 'vs/platform/markers/common/markers';
-import {ExtHostCommands} from 'vs/workbench/api/common/extHostCommands';
+import {ExtHostCommands} from 'vs/workbench/api/node/extHostCommands';
 import {DeclarationRegistry} from 'vs/editor/contrib/goToDeclaration/common/goToDeclaration';
 import {ExtraInfoRegistry} from 'vs/editor/contrib/hover/common/hover';
 import {OccurrencesRegistry} from 'vs/editor/contrib/wordHighlighter/common/wordHighlighter';

src/vs/workbench/api/common/extHostOutputService.ts → src/vs/workbench/api/node/extHostOutputService.ts

@@ -10,7 +10,7 @@ import {Remotable, IThreadService} from 'vs/platform/thread/common/thread';
 import {IOutputService, OUTPUT_EDITOR_INPUT_ID} from 'vs/workbench/parts/output/common/output';
 import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService';
 import {Position} from 'vs/platform/editor/common/editor';
-import * as TypeConverters from 'vs/workbench/api/common/extHostTypeConverters';
+import * as TypeConverters from 'vs/workbench/api/node/extHostTypeConverters';
 
 export class ExtHostOutputChannel implements vscode.OutputChannel {
 

src/vs/workbench/api/common/extHostTypeConverters.ts → src/vs/workbench/api/node/extHostTypeConverters.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import {ExtHostCommands} from 'vs/workbench/api/common/extHostCommands';
+import {ExtHostCommands} from 'vs/workbench/api/node/extHostCommands';
 import Severity from 'vs/base/common/severity';
 import {isFalsyOrEmpty} from 'vs/base/common/arrays';
 import {IDisposable} from 'vs/base/common/lifecycle';

src/vs/workbench/api/common/extHostWorkspace.ts → src/vs/workbench/api/node/extHostWorkspace.ts

@@ -15,7 +15,7 @@ import {ITextFileService} from 'vs/workbench/parts/files/common/files';
 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/extHostTypeConverters';
+import {fromRange} from 'vs/workbench/api/node/extHostTypeConverters';
 import {Uri, CancellationToken} from 'vscode';
 
 export class ExtHostWorkspace {

src/vs/workbench/electron-browser/shell.ts

@@ -49,26 +49,26 @@ import {IModelService} from 'vs/editor/common/services/modelService';
 import {ModelServiceImpl} from 'vs/editor/common/services/modelServiceImpl';
 import {CodeEditorServiceImpl} from 'vs/editor/browser/services/codeEditorServiceImpl';
 import {ICodeEditorService} from 'vs/editor/common/services/codeEditorService';
-import {MainProcessVSCodeAPIHelper} from 'vs/workbench/api/common/extHost.api.impl';
+import {MainProcessVSCodeAPIHelper} from 'vs/workbench/api/node/extHost.api.impl';
 import {MainProcessPluginService} from 'vs/platform/plugins/common/nativePluginService';
-import {MainThreadDocuments} from 'vs/workbench/api/common/extHostDocuments';
+import {MainThreadDocuments} from 'vs/workbench/api/node/extHostDocuments';
 import {MainProcessTextMateSyntax} from 'vs/editor/node/textMate/TMSyntax';
 import {MainProcessTextMateSnippet} from 'vs/editor/node/textMate/TMSnippets';
 import {JSONValidationExtensionPoint} from 'vs/platform/jsonschemas/common/jsonValidationExtensionPoint';
 import {LanguageConfigurationFileHandler} from 'vs/editor/node/languageConfiguration';
-import {MainThreadFileSystemEventService} from 'vs/workbench/api/common/extHostFileSystemEventService';
-import {MainThreadQuickOpen} from 'vs/workbench/api/common/extHostQuickOpen';
-import {MainThreadStatusBar} from 'vs/workbench/api/common/extHostStatusBar';
-import {MainThreadCommands} from 'vs/workbench/api/common/extHostCommands';
+import {MainThreadFileSystemEventService} from 'vs/workbench/api/node/extHostFileSystemEventService';
+import {MainThreadQuickOpen} from 'vs/workbench/api/node/extHostQuickOpen';
+import {MainThreadStatusBar} from 'vs/workbench/api/node/extHostStatusBar';
+import {MainThreadCommands} from 'vs/workbench/api/node/extHostCommands';
 import {RemoteTelemetryServiceHelper} from 'vs/platform/telemetry/common/abstractRemoteTelemetryService';
-import {MainThreadDiagnostics} from 'vs/workbench/api/common/extHostDiagnostics';
-import {MainThreadOutputService} from 'vs/workbench/api/common/extHostOutputService';
-import {MainThreadMessageService} from 'vs/workbench/api/common/extHostMessageService';
-import {MainThreadLanguages} from 'vs/workbench/api/common/extHostLanguages';
-import {MainThreadEditors} from 'vs/workbench/api/common/extHostEditors';
-import {MainThreadWorkspace} from 'vs/workbench/api/common/extHostWorkspace';
-import {MainThreadConfiguration} from 'vs/workbench/api/common/extHostConfiguration';
-import {MainThreadLanguageFeatures} from 'vs/workbench/api/common/extHostLanguageFeatures';
+import {MainThreadDiagnostics} from 'vs/workbench/api/node/extHostDiagnostics';
+import {MainThreadOutputService} from 'vs/workbench/api/node/extHostOutputService';
+import {MainThreadMessageService} from 'vs/workbench/api/node/extHostMessageService';
+import {MainThreadLanguages} from 'vs/workbench/api/node/extHostLanguages';
+import {MainThreadEditors} from 'vs/workbench/api/node/extHostEditors';
+import {MainThreadWorkspace} from 'vs/workbench/api/node/extHostWorkspace';
+import {MainThreadConfiguration} from 'vs/workbench/api/node/extHostConfiguration';
+import {MainThreadLanguageFeatures} from 'vs/workbench/api/node/extHostLanguageFeatures';
 import {EventService} from 'vs/platform/event/common/eventService';
 import {IOptions} from 'vs/workbench/common/options';
 import themes = require('vs/platform/theme/common/themes');

src/vs/workbench/node/pluginHostMain.ts

@@ -18,15 +18,15 @@ import {TPromise} from 'vs/base/common/winjs.base';
 import paths = require('vs/base/common/paths');
 import {IPluginService, IPluginDescription} from 'vs/platform/plugins/common/plugins';
 import {PluginsRegistry, PluginsMessageCollector, IPluginsMessageCollector} from 'vs/platform/plugins/common/pluginsRegistry';
-import {ExtHostAPIImplementation} from 'vs/workbench/api/common/extHost.api.impl';
+import {ExtHostAPIImplementation} from 'vs/workbench/api/node/extHost.api.impl';
 import { create as createIPC, IPluginsIPC } from 'vs/platform/plugins/common/ipcRemoteCom';
-import {ExtHostModelService} from 'vs/workbench/api/common/extHostDocuments';
+import {ExtHostModelService} from 'vs/workbench/api/node/extHostDocuments';
 import {IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import InstantiationService = require('vs/platform/instantiation/common/instantiationService');
 import {PluginHostPluginService} from 'vs/platform/plugins/common/nativePluginService';
 import {PluginHostThreadService} from 'vs/platform/thread/common/pluginHostThreadService';
 import marshalling = require('vs/base/common/marshalling');
-import {ExtHostTelemetryService} from 'vs/workbench/api/common/extHostTelemetry';
+import {ExtHostTelemetryService} from 'vs/workbench/api/node/extHostTelemetry';
 import {BaseRequestService} from 'vs/platform/request/common/baseRequestService';
 import {BaseWorkspaceContextService} from 'vs/platform/workspace/common/baseWorkspaceContextService';
 import {ModeServiceImpl} from 'vs/editor/common/services/modeServiceImpl';

src/vs/workbench/test/common/api/extHostApiCommands.test.ts

@@ -10,7 +10,7 @@ import {setUnexpectedErrorHandler, errorHandler} from 'vs/base/common/errors';
 import {create} from 'vs/base/common/types';
 import URI from 'vs/base/common/uri';
 import {TPromise} from 'vs/base/common/winjs.base';
-import * as types from 'vs/workbench/api/common/extHostTypes';
+import * as types from 'vs/workbench/api/node/extHostTypes';
 import {Range as CodeEditorRange} from 'vs/editor/common/core/range';
 import * as EditorCommon from 'vs/editor/common/editorCommon';
 import {Model as EditorModel} from 'vs/editor/common/model/model';
@@ -22,10 +22,10 @@ import {IThreadService} from 'vs/platform/thread/common/thread';
 import {IKeybindingService} from 'vs/platform/keybinding/common/keybindingService';
 import {KeybindingsRegistry} from 'vs/platform/keybinding/common/keybindingsRegistry';
 import {IModelService} from 'vs/editor/common/services/modelService';
-import {ExtHostLanguageFeatures, MainThreadLanguageFeatures} from 'vs/workbench/api/common/extHostLanguageFeatures';
-import {registerApiCommands} from 'vs/workbench/api/common/extHostApiCommands';
-import {ExtHostCommands, MainThreadCommands} from 'vs/workbench/api/common/extHostCommands';
-import {ExtHostModelService} from 'vs/workbench/api/common/extHostDocuments';
+import {ExtHostLanguageFeatures, MainThreadLanguageFeatures} from 'vs/workbench/api/node/extHostLanguageFeatures';
+import {registerApiCommands} from 'vs/workbench/api/node/extHostApiCommands';
+import {ExtHostCommands, MainThreadCommands} from 'vs/workbench/api/node/extHostCommands';
+import {ExtHostModelService} from 'vs/workbench/api/node/extHostDocuments';
 
 const defaultSelector = { scheme: 'far' };
 const model: EditorCommon.IModel = new EditorModel(

src/vs/workbench/test/common/api/extHostDocuments.test.ts

@@ -7,8 +7,8 @@
 
 import * as assert from 'assert';
 import URI from 'vs/base/common/uri';
-import {ExtHostDocumentData} from 'vs/workbench/api/common/extHostDocuments';
-import {Position} from 'vs/workbench/api/common/extHostTypes';
+import {ExtHostDocumentData} from 'vs/workbench/api/node/extHostDocuments';
+import {Position} from 'vs/workbench/api/node/extHostTypes';
 import {Range as CodeEditorRange} from 'vs/editor/common/core/range';
 import * as EditorCommon from 'vs/editor/common/editorCommon';
 

src/vs/workbench/test/common/api/extHostLanguageFeatures.test.ts

@@ -9,7 +9,7 @@ import * as assert from 'assert';
 import {setUnexpectedErrorHandler, errorHandler} from 'vs/base/common/errors';
 import {create} from 'vs/base/common/types';
 import URI from 'vs/base/common/uri';
-import * as types from 'vs/workbench/api/common/extHostTypes';
+import * as types from 'vs/workbench/api/node/extHostTypes';
 import {Range as CodeEditorRange} from 'vs/editor/common/core/range';
 import * as EditorCommon from 'vs/editor/common/editorCommon';
 import {Model as EditorModel} from 'vs/editor/common/model/model';
@@ -18,9 +18,9 @@ import {create as createInstantiationService} from 'vs/platform/instantiation/co
 import {MarkerService} from 'vs/platform/markers/common/markerService';
 import {IMarkerService} from 'vs/platform/markers/common/markers';
 import {IThreadService} from 'vs/platform/thread/common/thread';
-import {ExtHostLanguageFeatures, MainThreadLanguageFeatures} from 'vs/workbench/api/common/extHostLanguageFeatures';
-import {ExtHostCommands, MainThreadCommands} from 'vs/workbench/api/common/extHostCommands';
-import {ExtHostModelService} from 'vs/workbench/api/common/extHostDocuments';
+import {ExtHostLanguageFeatures, MainThreadLanguageFeatures} from 'vs/workbench/api/node/extHostLanguageFeatures';
+import {ExtHostCommands, MainThreadCommands} from 'vs/workbench/api/node/extHostCommands';
+import {ExtHostModelService} from 'vs/workbench/api/node/extHostDocuments';
 import {OutlineRegistry, getOutlineEntries} from 'vs/editor/contrib/quickOpen/common/quickOpen';
 import {getCodeLensData} from 'vs/editor/contrib/codelens/common/codelens';
 import {getDeclarationsAtPosition} from 'vs/editor/contrib/goToDeclaration/common/goToDeclaration';

src/vs/workbench/test/common/api/extHostTypes.test.ts

@@ -7,7 +7,7 @@
 
 import * as assert from 'assert';
 import URI from 'vs/base/common/uri';
-import * as types from 'vs/workbench/api/common/extHostTypes';
+import * as types from 'vs/workbench/api/node/extHostTypes';
 
 function assertToJSON(a: any, expected: any) {
 	const raw = JSON.stringify(a);