move inputs/models from workbench browser => common

src/vs/workbench/browser/actions/openSettings.ts

@@ -12,7 +12,7 @@ import labels = require('vs/base/common/labels');
 import {Registry} from 'vs/platform/platform';
 import {Action} from 'vs/base/common/actions';
 import {IWorkbenchActionRegistry, Extensions} from 'vs/workbench/common/actionRegistry';
-import {StringEditorInput} from 'vs/workbench/browser/parts/editor/stringEditorInput';
+import {StringEditorInput} from 'vs/workbench/common/editor/stringEditorInput';
 import {getDefaultValuesContent} from 'vs/platform/configuration/common/model';
 import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService';
 import {IWorkspaceContextService} from 'vs/workbench/services/workspace/common/contextService';

src/vs/workbench/browser/parts/editor/binaryDiffEditor.ts

@@ -16,8 +16,8 @@ import {IScrollableElement} from 'vs/base/browser/ui/scrollbar/scrollableElement
 import {ScrollableElement} from 'vs/base/browser/ui/scrollbar/impl/scrollableElement';
 import {BaseEditor} from 'vs/workbench/browser/parts/editor/baseEditor';
 import {EditorInput, EditorOptions} from 'vs/workbench/common/editor';
-import {BinaryEditorModel} from 'vs/workbench/browser/parts/editor/binaryEditorModel';
-import {DiffEditorModel} from 'vs/workbench/browser/parts/editor/diffEditorModel';
+import {BinaryEditorModel} from 'vs/workbench/common/editor/binaryEditorModel';
+import {DiffEditorModel} from 'vs/workbench/common/editor/diffEditorModel';
 import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService';
 import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry';
 

src/vs/workbench/browser/parts/editor/binaryEditor.ts

@@ -12,7 +12,7 @@ import {Dimension, Builder, $} from 'vs/base/browser/builder';
 import {ResourceViewer} from 'vs/base/browser/ui/resourceviewer/resourceViewer';
 import {EditorModel, EditorInput, EditorOptions} from 'vs/workbench/common/editor';
 import {BaseEditor} from 'vs/workbench/browser/parts/editor/baseEditor';
-import {BinaryEditorModel} from 'vs/workbench/browser/parts/editor/binaryEditorModel';
+import {BinaryEditorModel} from 'vs/workbench/common/editor/binaryEditorModel';
 import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService';
 import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry';
 

src/vs/workbench/browser/parts/editor/editor.contribution.ts

@@ -8,15 +8,15 @@ import {Registry} from 'vs/platform/platform';
 import nls = require('vs/nls');
 import {StatusbarItemDescriptor, StatusbarAlignment, IStatusbarRegistry, Extensions as StatusExtensions} from 'vs/workbench/browser/parts/statusbar/statusbar';
 import {EditorDescriptor, IEditorRegistry, Extensions as EditorExtensions} from 'vs/workbench/browser/parts/editor/baseEditor';
-import {StringEditorInput} from 'vs/workbench/browser/parts/editor/stringEditorInput';
+import {StringEditorInput} from 'vs/workbench/common/editor/stringEditorInput';
 import {StringEditor} from 'vs/workbench/browser/parts/editor/stringEditor';
-import {DiffEditorInput} from 'vs/workbench/browser/parts/editor/diffEditorInput';
-import {UntitledEditorInput} from 'vs/workbench/browser/parts/editor/untitledEditorInput';
-import {ResourceEditorInput} from 'vs/workbench/browser/parts/editor/resourceEditorInput';
+import {DiffEditorInput} from 'vs/workbench/common/editor/diffEditorInput';
+import {UntitledEditorInput} from 'vs/workbench/common/editor/untitledEditorInput';
+import {ResourceEditorInput} from 'vs/workbench/common/editor/resourceEditorInput';
 import {TextDiffEditor} from 'vs/workbench/browser/parts/editor/textDiffEditor';
 import {BinaryResourceDiffEditor} from 'vs/workbench/browser/parts/editor/binaryDiffEditor';
 import {IFrameEditor} from 'vs/workbench/browser/parts/editor/iframeEditor';
-import {IFrameEditorInput} from 'vs/workbench/browser/parts/editor/iframeEditorInput';
+import {IFrameEditorInput} from 'vs/workbench/common/editor/iframeEditorInput';
 import {ChangeEncodingAction, ChangeEOLAction, ChangeModeAction, EditorStatus} from 'vs/workbench/browser/parts/editor/editorStatus';
 import {IWorkbenchActionRegistry, Extensions as ActionExtensions} from 'vs/workbench/common/actionRegistry';
 import {SyncActionDescriptor} from 'vs/platform/actions/common/actions';

src/vs/workbench/browser/parts/editor/editorStatus.ts

@@ -19,7 +19,7 @@ import {IStatusbarItem} from 'vs/workbench/browser/parts/statusbar/statusbar';
 import {Action} from 'vs/base/common/actions';
 import {IEditorModesRegistry, Extensions} from 'vs/editor/common/modes/modesRegistry';
 import {Registry} from 'vs/platform/platform';
-import {UntitledEditorInput} from 'vs/workbench/browser/parts/editor/untitledEditorInput';
+import {UntitledEditorInput} from 'vs/workbench/common/editor/untitledEditorInput';
 import {IFileEditorInput, EncodingMode, IEncodingSupport, asFileEditorInput, getUntitledOrFileResource} from 'vs/workbench/common/editor';
 import {IDisposable, combinedDispose} from 'vs/base/common/lifecycle';
 import {ICodeEditor, IDiffEditor} from 'vs/editor/browser/editorBrowser';

src/vs/workbench/browser/parts/editor/iframeEditor.ts

@@ -14,8 +14,8 @@ import DOM = require('vs/base/browser/dom');
 import errors = require('vs/base/common/errors');
 import {EditorOptions, EditorInput} from 'vs/workbench/common/editor';
 import {EditorInputAction, BaseEditor} from 'vs/workbench/browser/parts/editor/baseEditor';
-import {IFrameEditorInput} from 'vs/workbench/browser/parts/editor/iframeEditorInput';
-import {IFrameEditorModel} from 'vs/workbench/browser/parts/editor/iframeEditorModel';
+import {IFrameEditorInput} from 'vs/workbench/common/editor/iframeEditorInput';
+import {IFrameEditorModel} from 'vs/workbench/common/editor/iframeEditorModel';
 import {IStorageService, StorageScope} from 'vs/platform/storage/common/storage';
 import {Position} from 'vs/platform/editor/common/editor';
 import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry';

src/vs/workbench/browser/parts/editor/logEditorInput.ts

@@ -5,7 +5,7 @@
 'use strict';
 
 import {ICodeEditor} from 'vs/editor/browser/editorBrowser';
-import {StringEditorInput} from 'vs/workbench/browser/parts/editor/stringEditorInput';
+import {StringEditorInput} from 'vs/workbench/common/editor/stringEditorInput';
 import {BaseTextEditor} from 'vs/workbench/browser/parts/editor/textEditor';
 import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService';
 import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation';

src/vs/workbench/browser/parts/editor/sideBySideEditorControl.ts

@@ -21,7 +21,7 @@ import {Sash, ISashEvent, IVerticalSashLayoutProvider} from 'vs/base/browser/ui/
 import {ProgressBar} from 'vs/base/browser/ui/progressbar/progressbar';
 import {BaseEditor} from 'vs/workbench/browser/parts/editor/baseEditor';
 import {EditorInput, IInputStatus, TextEditorOptions} from 'vs/workbench/common/editor';
-import {DiffEditorInput} from 'vs/workbench/browser/parts/editor/diffEditorInput';
+import {DiffEditorInput} from 'vs/workbench/common/editor/diffEditorInput';
 import {EventType as BaseEventType} from 'vs/base/common/events';
 import {EditorInputEvent, EventType as WorkbenchEventType} from 'vs/workbench/common/events';
 import DOM = require('vs/base/browser/dom');

src/vs/workbench/browser/parts/editor/stringEditor.ts

@@ -12,9 +12,9 @@ import {IEditorOptions, IEditorViewState} from 'vs/editor/common/editorCommon';
 import {DefaultConfig} from 'vs/editor/common/config/defaultConfig';
 import {EditorConfiguration} from 'vs/editor/common/config/commonEditorConfig';
 import {TextEditorOptions, EditorModel, EditorInput, EditorOptions} from 'vs/workbench/common/editor';
-import {BaseTextEditorModel} from 'vs/workbench/browser/parts/editor/textEditorModel';
+import {BaseTextEditorModel} from 'vs/workbench/common/editor/textEditorModel';
 import {LogEditorInput} from 'vs/workbench/browser/parts/editor/logEditorInput';
-import {UntitledEditorInput} from 'vs/workbench/browser/parts/editor/untitledEditorInput';
+import {UntitledEditorInput} from 'vs/workbench/common/editor/untitledEditorInput';
 import {BaseTextEditor} from 'vs/workbench/browser/parts/editor/textEditor';
 import {UntitledEditorEvent, EventType} from 'vs/workbench/common/events';
 import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry';

src/vs/workbench/browser/parts/editor/textDiffEditor.ts

@@ -17,12 +17,12 @@ import {IDiffEditorOptions, IEditorOptions} from 'vs/editor/common/editorCommon'
 import {BaseEditor} from 'vs/workbench/browser/parts/editor/baseEditor';
 import {BaseTextEditor} from 'vs/workbench/browser/parts/editor/textEditor';
 import {TextEditorOptions, TextDiffEditorOptions, EditorModel, EditorInput, EditorOptions} from 'vs/workbench/common/editor';
-import {StringEditorInput} from 'vs/workbench/browser/parts/editor/stringEditorInput';
-import {ResourceEditorInput} from 'vs/workbench/browser/parts/editor/resourceEditorInput';
-import {DiffEditorInput} from 'vs/workbench/browser/parts/editor/diffEditorInput';
+import {StringEditorInput} from 'vs/workbench/common/editor/stringEditorInput';
+import {ResourceEditorInput} from 'vs/workbench/common/editor/resourceEditorInput';
+import {DiffEditorInput} from 'vs/workbench/common/editor/diffEditorInput';
 import {DiffNavigator} from 'vs/editor/contrib/diffNavigator/common/diffNavigator';
 import {DiffEditorWidget} from 'vs/editor/browser/widget/diffEditorWidget';
-import {TextDiffEditorModel} from 'vs/workbench/browser/parts/editor/textDiffEditorModel';
+import {TextDiffEditorModel} from 'vs/workbench/common/editor/textDiffEditorModel';
 import {DelegatingWorkbenchEditorService} from 'vs/workbench/services/editor/browser/editorService';
 import {IFileOperationResult, FileOperationResult} from 'vs/platform/files/common/files';
 import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry';

src/vs/workbench/browser/parts/editor/diffEditorInput.ts → src/vs/workbench/common/editor/diffEditorInput.ts

@@ -9,9 +9,9 @@ import types = require('vs/base/common/types');
 import {isBinaryMime} from 'vs/base/common/mime';
 import {EventType} from 'vs/base/common/events';
 import {EditorModel, IFileEditorInput, EditorInput, IInputStatus, BaseDiffEditorInput} from 'vs/workbench/common/editor';
-import {BaseTextEditorModel} from 'vs/workbench/browser/parts/editor/textEditorModel';
-import {DiffEditorModel} from 'vs/workbench/browser/parts/editor/diffEditorModel';
-import {TextDiffEditorModel} from 'vs/workbench/browser/parts/editor/textDiffEditorModel';
+import {BaseTextEditorModel} from 'vs/workbench/common/editor/textEditorModel';
+import {DiffEditorModel} from 'vs/workbench/common/editor/diffEditorModel';
+import {TextDiffEditorModel} from 'vs/workbench/common/editor/textDiffEditorModel';
 
 /**
  * The base editor input for the diff editor. It is made up of two editor inputs, the original version

src/vs/workbench/browser/parts/editor/iframeEditorInput.ts → src/vs/workbench/common/editor/iframeEditorInput.ts

@@ -7,7 +7,6 @@
 import {TPromise} from 'vs/base/common/winjs.base';
 import {EditorModel, EditorInput} from 'vs/workbench/common/editor';
 import {Registry} from 'vs/platform/platform';
-import {IEditorRegistry, Extensions} from 'vs/workbench/browser/parts/editor/baseEditor';
 
 /**
  * An editor input to use with the IFrameEditor. The resolved IFrameEditorModel can either provide
@@ -57,11 +56,6 @@ export abstract class IFrameEditorInput extends EditorInput {
 
 		// Create Model and Load
 		else {
-			let descriptor = (<IEditorRegistry>Registry.as(Extensions.Editors)).getEditor(this);
-			if (!descriptor) {
-				throw new Error('Unable to find an editor in the registry for this input.');
-			}
-
 			let model = this.createModel();
 			modelPromise = model.load();
 		}

src/vs/workbench/browser/parts/editor/resourceEditorInput.ts → src/vs/workbench/common/editor/resourceEditorInput.ts

@@ -6,7 +6,7 @@
 
 import {TPromise} from 'vs/base/common/winjs.base';
 import {EditorModel, EditorInput} from 'vs/workbench/common/editor';
-import {ResourceEditorModel} from 'vs/workbench/browser/parts/editor/resourceEditorModel';
+import {ResourceEditorModel} from 'vs/workbench/common/editor/resourceEditorModel';
 import URI from 'vs/base/common/uri';
 import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation';
 import {IModelService} from 'vs/editor/common/services/modelService';

src/vs/workbench/browser/parts/editor/resourceEditorModel.ts → src/vs/workbench/common/editor/resourceEditorModel.ts

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import {BaseTextEditorModel} from 'vs/workbench/browser/parts/editor/textEditorModel';
+import {BaseTextEditorModel} from 'vs/workbench/common/editor/textEditorModel';
 import URI from 'vs/base/common/uri';
 import {IModeService} from 'vs/editor/common/services/modeService';
 import {IModelService} from 'vs/editor/common/services/modelService';

src/vs/workbench/browser/parts/editor/stringEditorInput.ts → src/vs/workbench/common/editor/stringEditorInput.ts

@@ -7,7 +7,7 @@
 import {TPromise} from 'vs/base/common/winjs.base';
 import {MIME_TEXT} from 'vs/base/common/mime';
 import {EditorModel, EditorInput} from 'vs/workbench/common/editor';
-import {StringEditorModel} from 'vs/workbench/browser/parts/editor/stringEditorModel';
+import {StringEditorModel} from 'vs/workbench/common/editor/stringEditorModel';
 import URI from 'vs/base/common/uri';
 import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation';
 

src/vs/workbench/browser/parts/editor/stringEditorModel.ts → src/vs/workbench/common/editor/stringEditorModel.ts

@@ -5,7 +5,7 @@
 'use strict';
 
 import {TPromise} from 'vs/base/common/winjs.base';
-import {BaseTextEditorModel} from 'vs/workbench/browser/parts/editor/textEditorModel';
+import {BaseTextEditorModel} from 'vs/workbench/common/editor/textEditorModel';
 import {EditorModel} from 'vs/workbench/common/editor';
 import URI from 'vs/base/common/uri';
 import {Position} from 'vs/editor/common/core/position';

src/vs/workbench/browser/parts/editor/textDiffEditorModel.ts → src/vs/workbench/common/editor/textDiffEditorModel.ts

@@ -7,8 +7,8 @@
 import {TPromise} from 'vs/base/common/winjs.base';
 import {IDiffEditorModel} from 'vs/editor/common/editorCommon';
 import {EditorModel} from 'vs/workbench/common/editor';
-import {BaseTextEditorModel} from 'vs/workbench/browser/parts/editor/textEditorModel';
-import {DiffEditorModel} from 'vs/workbench/browser/parts/editor/diffEditorModel';
+import {BaseTextEditorModel} from 'vs/workbench/common/editor/textEditorModel';
+import {DiffEditorModel} from 'vs/workbench/common/editor/diffEditorModel';
 
 /**
  * The base text editor model for the diff editor. It is made up of two text editor models, the original version

src/vs/workbench/browser/parts/editor/untitledEditorInput.ts → src/vs/workbench/common/editor/untitledEditorInput.ts

@@ -12,7 +12,7 @@ import labels = require('vs/base/common/labels');
 import paths = require('vs/base/common/paths');
 import {UntitledEditorInput as AbstractUntitledEditorInput, EditorModel, EncodingMode, IInputStatus} from 'vs/workbench/common/editor';
 import {Registry} from 'vs/platform/platform';
-import {UntitledEditorModel} from 'vs/workbench/browser/parts/editor/untitledEditorModel';
+import {UntitledEditorModel} from 'vs/workbench/common/editor/untitledEditorModel';
 import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation';
 import {ILifecycleService} from 'vs/platform/lifecycle/common/lifecycle';
 import {IWorkspaceContextService} from 'vs/platform/workspace/common/workspace';

src/vs/workbench/browser/parts/editor/untitledEditorModel.ts → src/vs/workbench/common/editor/untitledEditorModel.ts

@@ -6,7 +6,7 @@
 
 import {TPromise} from 'vs/base/common/winjs.base';
 import {EditorModel, IEncodingSupport} from 'vs/workbench/common/editor';
-import {StringEditorModel} from 'vs/workbench/browser/parts/editor/stringEditorModel';
+import {StringEditorModel} from 'vs/workbench/common/editor/stringEditorModel';
 import URI from 'vs/base/common/uri';
 import {IModelContentChangedEvent, EventType, EndOfLinePreference} from 'vs/editor/common/editorCommon';
 import {EventType as WorkbenchEventType, UntitledEditorEvent, ResourceEvent} from 'vs/workbench/common/events';

src/vs/workbench/parts/debug/browser/debugEditorInputs.ts

@@ -6,7 +6,7 @@
 import { TPromise } from 'vs/base/common/winjs.base';
 import mime = require('vs/base/common/mime');
 import wbeditorcommon = require('vs/workbench/common/editor');
-import strinput = require('vs/workbench/browser/parts/editor/stringEditorInput');
+import strinput = require('vs/workbench/common/editor/stringEditorInput');
 import uri from 'vs/base/common/uri';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 

src/vs/workbench/parts/files/browser/editors/derivedFrameEditorInput.ts

@@ -5,7 +5,7 @@
 'use strict';
 
 import URI from 'vs/base/common/uri';
-import {IFrameEditorInput} from 'vs/workbench/browser/parts/editor/iframeEditorInput';
+import {IFrameEditorInput} from 'vs/workbench/common/editor/iframeEditorInput';
 
 /**
  * An editor input derived from IFrameEditorInput that is associated to a resource. This is an "abstract" class.

src/vs/workbench/parts/files/browser/editors/fileEditorInput.ts

@@ -16,7 +16,7 @@ import strings = require('vs/base/common/strings');
 import assert = require('vs/base/common/assert');
 import {EditorModel, IInputStatus, EncodingMode} from 'vs/workbench/common/editor';
 import {IEditorRegistry, Extensions, EditorDescriptor} from 'vs/workbench/browser/parts/editor/baseEditor';
-import {BinaryEditorModel} from 'vs/workbench/browser/parts/editor/binaryEditorModel';
+import {BinaryEditorModel} from 'vs/workbench/common/editor/binaryEditorModel';
 import {IFileOperationResult, FileOperationResult} from 'vs/platform/files/common/files';
 import {FileEditorDescriptor} from 'vs/workbench/parts/files/browser/files';
 import {ITextFileService, BINARY_FILE_EDITOR_ID, FILE_EDITOR_INPUT_ID, FileEditorInput as CommonFileEditorInput} from 'vs/workbench/parts/files/common/files';

src/vs/workbench/parts/files/browser/editors/htmlFrameEditorInput.ts

@@ -9,7 +9,7 @@ import URI from 'vs/base/common/uri';
 import paths = require('vs/base/common/paths');
 import {EditorModel} from 'vs/workbench/common/editor';
 import {DerivedFrameEditorInput} from 'vs/workbench/parts/files/browser/editors/derivedFrameEditorInput';
-import IFrameEditorModel = require('vs/workbench/browser/parts/editor/iframeEditorModel');
+import IFrameEditorModel = require('vs/workbench/common/editor/iframeEditorModel');
 import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation';
 import {IWorkspaceContextService} from 'vs/platform/workspace/common/workspace';
 

src/vs/workbench/parts/files/browser/editors/textFileEditor.ts

@@ -17,7 +17,7 @@ import {SaveErrorHandler} from 'vs/workbench/parts/files/browser/saveErrorHandle
 import {BaseTextEditor} from 'vs/workbench/browser/parts/editor/textEditor';
 import {EditorInput, EditorOptions, TextEditorOptions, EditorModel} from 'vs/workbench/common/editor';
 import {TextFileEditorModel} from 'vs/workbench/parts/files/browser/editors/textFileEditorModel';
-import {BinaryEditorModel} from 'vs/workbench/browser/parts/editor/binaryEditorModel';
+import {BinaryEditorModel} from 'vs/workbench/common/editor/binaryEditorModel';
 import {FileEditorInput} from 'vs/workbench/parts/files/browser/editors/fileEditorInput';
 import {ExplorerViewlet} from 'vs/workbench/parts/files/browser/explorerViewlet';
 import {IQuickOpenService} from 'vs/workbench/services/quickopen/common/quickOpenService';

src/vs/workbench/parts/files/browser/editors/textFileEditorModel.ts

@@ -17,7 +17,7 @@ import {IMode} from 'vs/editor/common/modes';
 import {EventType as WorkbenchEventType, ResourceEvent} from 'vs/workbench/common/events';
 import {LocalFileChangeEvent, EventType as FileEventType, TextFileChangeEvent, ITextFileService, IAutoSaveConfiguration} from 'vs/workbench/parts/files/common/files';
 import {EncodingMode, EditorModel, IEncodingSupport} from 'vs/workbench/common/editor';
-import {BaseTextEditorModel} from 'vs/workbench/browser/parts/editor/textEditorModel';
+import {BaseTextEditorModel} from 'vs/workbench/common/editor/textEditorModel';
 import {IFileService, IFileStat, IFileOperationResult, FileOperationResult, IContent} from 'vs/platform/files/common/files';
 import {IEventService} from 'vs/platform/event/common/event';
 import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation';

src/vs/workbench/parts/files/browser/fileActions.ts

@@ -27,7 +27,7 @@ import Files = require('vs/workbench/parts/files/common/files');
 import {IFileService, IFileStat, IImportResult} from 'vs/platform/files/common/files';
 import {EditorInputAction} from 'vs/workbench/browser/parts/editor/baseEditor';
 import {IFrameEditor} from 'vs/workbench/browser/parts/editor/iframeEditor';
-import {DiffEditorInput} from 'vs/workbench/browser/parts/editor/diffEditorInput';
+import {DiffEditorInput} from 'vs/workbench/common/editor/diffEditorInput';
 import workbenchEditorCommon = require('vs/workbench/common/editor');
 import {IEditorSelection} from 'vs/editor/common/editorCommon';
 import {FileEditorInput} from 'vs/workbench/parts/files/browser/editors/fileEditorInput';

src/vs/workbench/parts/files/browser/fileTracker.ts

@@ -10,7 +10,7 @@ import nls = require('vs/nls');
 import {MIME_UNKNOWN} from 'vs/base/common/mime';
 import URI from 'vs/base/common/uri';
 import paths = require('vs/base/common/paths');
-import {DiffEditorInput} from 'vs/workbench/browser/parts/editor/diffEditorInput';
+import {DiffEditorInput} from 'vs/workbench/common/editor/diffEditorInput';
 import {EditorInput, EditorOptions} from 'vs/workbench/common/editor';
 import {BaseEditor} from 'vs/workbench/browser/parts/editor/baseEditor';
 import {BaseTextEditor} from 'vs/workbench/browser/parts/editor/textEditor';

src/vs/workbench/parts/files/browser/saveErrorHandler.ts

@@ -14,9 +14,9 @@ import {EditorModel} from 'vs/workbench/common/editor';
 import {guessMimeTypes} from 'vs/base/common/mime';
 import {EditorInputAction} from 'vs/workbench/browser/parts/editor/baseEditor';
 import {IModel} from 'vs/editor/common/editorCommon';
-import {ResourceEditorInput} from 'vs/workbench/browser/parts/editor/resourceEditorInput';
-import {DiffEditorInput} from 'vs/workbench/browser/parts/editor/diffEditorInput';
-import {DiffEditorModel} from 'vs/workbench/browser/parts/editor/diffEditorModel';
+import {ResourceEditorInput} from 'vs/workbench/common/editor/resourceEditorInput';
+import {DiffEditorInput} from 'vs/workbench/common/editor/diffEditorInput';
+import {DiffEditorModel} from 'vs/workbench/common/editor/diffEditorModel';
 import {FileEditorInput} from 'vs/workbench/parts/files/browser/editors/fileEditorInput';
 import {SaveFileAsAction, RevertFileAction, SaveFileAction} from 'vs/workbench/parts/files/browser/fileActions';
 import {IFileService, IFileOperationResult, FileOperationResult} from 'vs/platform/files/common/files';

src/vs/workbench/parts/files/electron-browser/textFileServices.ts

@@ -14,7 +14,7 @@ import strings = require('vs/base/common/strings');
 import {isWindows} from 'vs/base/common/platform';
 import URI from 'vs/base/common/uri';
 import {Action} from 'vs/base/common/actions';
-import {UntitledEditorModel} from 'vs/workbench/browser/parts/editor/untitledEditorModel';
+import {UntitledEditorModel} from 'vs/workbench/common/editor/untitledEditorModel';
 import {IEventService} from 'vs/platform/event/common/event';
 import {TextFileService as AbstractTextFileService} from 'vs/workbench/parts/files/browser/textFileServices';
 import {CACHE, TextFileEditorModel} from 'vs/workbench/parts/files/browser/editors/textFileEditorModel';

src/vs/workbench/parts/git/browser/gitEditorInputs.ts

@@ -8,8 +8,8 @@ import winjs = require('vs/base/common/winjs.base');
 import lifecycle = require('vs/base/common/lifecycle');
 import async = require('vs/base/common/async');
 import WorkbenchEditorCommon = require('vs/workbench/common/editor');
-import stringei = require('vs/workbench/browser/parts/editor/stringEditorInput');
-import diffei = require('vs/workbench/browser/parts/editor/diffEditorInput');
+import stringei = require('vs/workbench/common/editor/stringEditorInput');
+import diffei = require('vs/workbench/common/editor/diffEditorInput');
 import git = require('vs/workbench/parts/git/common/git');
 import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService';
 import {IEditorInput} from 'vs/platform/editor/common/editor';

src/vs/workbench/parts/markdown/browser/markdownEditorModel.ts

@@ -8,7 +8,7 @@ import {TPromise} from 'vs/base/common/winjs.base';
 import nls = require('vs/nls');
 import URI from 'vs/base/common/uri';
 import paths = require('vs/base/common/paths');
-import {IFrameEditorModel} from 'vs/workbench/browser/parts/editor/iframeEditorModel';
+import {IFrameEditorModel} from 'vs/workbench/common/editor/iframeEditorModel';
 import {EditorModel} from 'vs/workbench/common/editor';
 import {Preferences} from 'vs/workbench/common/constants';
 import {IModel} from 'vs/editor/common/editorCommon';

src/vs/workbench/services/editor/browser/editorService.ts

@@ -14,8 +14,8 @@ import {IDiffEditor, ICodeEditor} from 'vs/editor/browser/editorBrowser';
 import {ICommonCodeEditor, IModel, EditorType, IEditor as ICommonEditor} from 'vs/editor/common/editorCommon';
 import {BaseEditor, IEditorRegistry, Extensions} from 'vs/workbench/browser/parts/editor/baseEditor';
 import {EditorInput, EditorOptions, IFileEditorInput, TextEditorOptions} from 'vs/workbench/common/editor';
-import {UntitledEditorInput} from 'vs/workbench/browser/parts/editor/untitledEditorInput';
-import {DiffEditorInput} from 'vs/workbench/browser/parts/editor/diffEditorInput';
+import {UntitledEditorInput} from 'vs/workbench/common/editor/untitledEditorInput';
+import {DiffEditorInput} from 'vs/workbench/common/editor/diffEditorInput';
 import {IUntitledEditorService} from 'vs/workbench/services/untitled/common/untitledEditorService';
 import {IWorkbenchEditorService, EditorArrangement, IFileInput} from 'vs/workbench/services/editor/common/editorService';
 import {IEditorInput, IEditorModel, IEditorOptions, Position, IEditor, IResourceInput, ITextEditorModel} from 'vs/platform/editor/common/editor';

src/vs/workbench/services/untitled/browser/untitledEditorService.ts

@@ -7,7 +7,7 @@
 import URI from 'vs/base/common/uri';
 import {EventType} from 'vs/base/common/events';
 import arrays = require('vs/base/common/arrays');
-import {UntitledEditorInput} from 'vs/workbench/browser/parts/editor/untitledEditorInput';
+import {UntitledEditorInput} from 'vs/workbench/common/editor/untitledEditorInput';
 import {IUntitledEditorService} from 'vs/workbench/services/untitled/common/untitledEditorService';
 import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation';
 

src/vs/workbench/test/browser/parts/editor/baseEditor.test.ts

@@ -12,7 +12,7 @@ import {IInstantiationService} from 'vs/platform/instantiation/common/instantiat
 import * as InstantiationService from 'vs/platform/instantiation/common/instantiationService';
 import * as Platform from 'vs/platform/platform';
 import {SyncDescriptor} from 'vs/platform/instantiation/common/descriptors';
-import {StringEditorInput} from 'vs/workbench/browser/parts/editor/stringEditorInput';
+import {StringEditorInput} from 'vs/workbench/common/editor/stringEditorInput';
 import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry';
 import {NullTelemetryService} from 'vs/platform/telemetry/common/nullTelemetryService';
 import mime = require('vs/base/common/mime');

src/vs/workbench/test/browser/parts/editor/editorInput.test.ts

@@ -8,7 +8,7 @@
 import * as assert from 'assert';
 import {EditorInput} from 'vs/workbench/common/editor';
 import {EditorDescriptor} from 'vs/workbench/browser/parts/editor/baseEditor';
-import {DiffEditorInput} from 'vs/workbench/browser/parts/editor/diffEditorInput';
+import {DiffEditorInput} from 'vs/workbench/common/editor/diffEditorInput';
 
 class MyEditorInput extends EditorInput {
 	getMime() {

src/vs/workbench/test/browser/parts/editor/editorModel.test.ts

@@ -7,11 +7,11 @@
 
 import * as assert from 'assert';
 import {EditorModel} from 'vs/workbench/common/editor';
-import {BaseTextEditorModel} from 'vs/workbench/browser/parts/editor/textEditorModel';
-import {TextDiffEditorModel} from 'vs/workbench/browser/parts/editor/textDiffEditorModel';
-import {DiffEditorInput} from 'vs/workbench/browser/parts/editor/diffEditorInput';
-import {StringEditorInput} from 'vs/workbench/browser/parts/editor/stringEditorInput';
-import {StringEditorModel} from 'vs/workbench/browser/parts/editor/stringEditorModel';
+import {BaseTextEditorModel} from 'vs/workbench/common/editor/textEditorModel';
+import {TextDiffEditorModel} from 'vs/workbench/common/editor/textDiffEditorModel';
+import {DiffEditorInput} from 'vs/workbench/common/editor/diffEditorInput';
+import {StringEditorInput} from 'vs/workbench/common/editor/stringEditorInput';
+import {StringEditorModel} from 'vs/workbench/common/editor/stringEditorModel';
 import * as InstantiationService from 'vs/platform/instantiation/common/instantiationService';
 import {createMockModelService, createMockModeService} from 'vs/editor/test/common/servicesTestUtils';
 

src/vs/workbench/test/browser/parts/editor/stringEditorInput.test.ts

@@ -9,10 +9,10 @@ import * as assert from 'assert';
 import {Promise } from 'vs/base/common/winjs.base';
 import * as Strings from 'vs/base/common/strings';
 import URI from 'vs/base/common/uri';
-import {StringEditorInput} from 'vs/workbench/browser/parts/editor/stringEditorInput';
+import {StringEditorInput} from 'vs/workbench/common/editor/stringEditorInput';
 import {LogEditorInput} from 'vs/workbench/browser/parts/editor/logEditorInput';
-import {ResourceEditorInput} from 'vs/workbench/browser/parts/editor/resourceEditorInput';
-import {ResourceEditorModel} from 'vs/workbench/browser/parts/editor/resourceEditorModel';
+import {ResourceEditorInput} from 'vs/workbench/common/editor/resourceEditorInput';
+import {ResourceEditorModel} from 'vs/workbench/common/editor/resourceEditorModel';
 import {TestWorkspace, TestEditorService, MockRequestService} from 'vs/workbench/test/browser/servicesTestUtils';
 import * as InstantiationService from 'vs/platform/instantiation/common/instantiationService';
 import {createMockModelService, createMockModeService} from 'vs/editor/test/common/servicesTestUtils';

src/vs/workbench/test/browser/parts/editor/stringEditorModel.test.ts

@@ -8,7 +8,7 @@
 import * as assert from 'assert';
 import * as Strings from 'vs/base/common/strings';
 import {TestEditorService, TestRequestService} from 'vs/workbench/test/browser/servicesTestUtils';
-import {StringEditorModel} from 'vs/workbench/browser/parts/editor/stringEditorModel';
+import {StringEditorModel} from 'vs/workbench/common/editor/stringEditorModel';
 import * as InstantiationService from 'vs/platform/instantiation/common/instantiationService';
 import {createMockModelService, createMockModeService} from 'vs/editor/test/common/servicesTestUtils';
 

src/vs/workbench/test/browser/parts/quickOpen/quickopen.test.ts

@@ -14,7 +14,7 @@ import {QuickOpenHandlerDescriptor, IQuickOpenRegistry, Extensions as QuickOpenE
 import {QuickOpenController} from 'vs/workbench/browser/parts/quickopen/quickOpenController';
 import {Mode} from 'vs/base/parts/quickopen/common/quickOpen';
 import {QuickOpenAction} from 'vs/workbench/browser/actions/quickOpenAction';
-import {StringEditorInput} from 'vs/workbench/browser/parts/editor/stringEditorInput';
+import {StringEditorInput} from 'vs/workbench/common/editor/stringEditorInput';
 import {EditorInput} from 'vs/workbench/common/editor';
 import {isEmptyObject} from 'vs/base/common/types';
 import {join} from 'vs/base/common/paths';

src/vs/workbench/test/browser/services.test.ts

@@ -12,8 +12,8 @@ import URI from 'vs/base/common/uri';
 import {create} from 'vs/platform/instantiation/common/instantiationService';
 import {BaseEditor} from 'vs/workbench/browser/parts/editor/baseEditor';
 import {EditorInput, EditorOptions, TextEditorOptions} from 'vs/workbench/common/editor';
-import {StringEditorInput} from 'vs/workbench/browser/parts/editor/stringEditorInput';
-import {StringEditorModel} from 'vs/workbench/browser/parts/editor/stringEditorModel';
+import {StringEditorInput} from 'vs/workbench/common/editor/stringEditorInput';
+import {StringEditorModel} from 'vs/workbench/common/editor/stringEditorModel';
 import {FileEditorInput} from 'vs/workbench/parts/files/browser/editors/fileEditorInput';
 import {TextFileEditorModel} from 'vs/workbench/parts/files/browser/editors/textFileEditorModel';
 import {TextFileService} from 'vs/workbench/parts/files/browser/textFileServices';