Skip to content

Commit 946440a

Browse files
committed
untitled - move input and model closer to service
1 parent b49c688 commit 946440a

File tree

9 files changed

+10
-9
lines changed

9 files changed

+10
-9
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { EditorInput, IEditorInputFactory, SideBySideEditorInput, IEditorInputFa
1313
import { TextResourceEditor } from 'vs/workbench/browser/parts/editor/textResourceEditor';
1414
import { SideBySideEditor } from 'vs/workbench/browser/parts/editor/sideBySideEditor';
1515
import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
16-
import { UntitledTextEditorInput } from 'vs/workbench/common/editor/untitledTextEditorInput';
16+
import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';
1717
import { ResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorInput';
1818
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
1919
import { TextDiffEditor } from 'vs/workbench/browser/parts/editor/textDiffEditor';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { areFunctions, withNullAsUndefined, withUndefinedAsNull } from 'vs/base/
1212
import { URI } from 'vs/base/common/uri';
1313
import { Action } from 'vs/base/common/actions';
1414
import { Language } from 'vs/base/common/platform';
15-
import { UntitledTextEditorInput } from 'vs/workbench/common/editor/untitledTextEditorInput';
15+
import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';
1616
import { IFileEditorInput, EncodingMode, IEncodingSupport, toResource, SideBySideEditorInput, IEditor as IBaseEditor, IEditorInput, SideBySideEditor, IModeSupport } from 'vs/workbench/common/editor';
1717
import { Disposable, MutableDisposable, DisposableStore } from 'vs/base/common/lifecycle';
1818
import { IEditorAction } from 'vs/editor/common/editorCommon';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { ICodeEditor, getCodeEditor, IPasteEvent } from 'vs/editor/browser/edito
99
import { TextEditorOptions, EditorInput, EditorOptions } from 'vs/workbench/common/editor';
1010
import { ResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorInput';
1111
import { BaseTextEditorModel } from 'vs/workbench/common/editor/textEditorModel';
12-
import { UntitledTextEditorInput } from 'vs/workbench/common/editor/untitledTextEditorInput';
12+
import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';
1313
import { BaseTextEditor } from 'vs/workbench/browser/parts/editor/textEditor';
1414
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
1515
import { IStorageService } from 'vs/platform/storage/common/storage';

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ import { IEditorRegistry, EditorDescriptor, Extensions } from 'vs/workbench/brow
1919
import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
2020
import { Registry } from 'vs/platform/registry/common/platform';
2121
import { FileEditorInput } from 'vs/workbench/contrib/files/common/editors/fileEditorInput';
22-
import { UntitledTextEditorInput } from 'vs/workbench/common/editor/untitledTextEditorInput';
22+
import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';
2323
import { timeout } from 'vs/base/common/async';
2424
import { toResource } from 'vs/base/test/common/utils';
2525
import { IFileService } from 'vs/platform/files/common/files';
2626
import { Disposable, IDisposable, dispose } from 'vs/base/common/lifecycle';
2727
import { ModesRegistry } from 'vs/editor/common/modes/modesRegistry';
28-
import { UntitledTextEditorModel } from 'vs/workbench/common/editor/untitledTextEditorModel';
28+
import { UntitledTextEditorModel } from 'vs/workbench/services/untitled/common/untitledTextEditorModel';
2929
import { NullFileSystemProvider } from 'vs/platform/files/test/common/nullFileSystemProvider';
3030
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
3131
import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';

src/vs/workbench/services/textfile/browser/textFileService.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { IFileService, FileOperationError, FileOperationResult, IFileStatWithMet
1313
import { Disposable } from 'vs/base/common/lifecycle';
1414
import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
1515
import { IUntitledTextEditorService, IUntitledTextEditorModelManager } from 'vs/workbench/services/untitled/common/untitledTextEditorService';
16-
import { UntitledTextEditorModel } from 'vs/workbench/common/editor/untitledTextEditorModel';
16+
import { UntitledTextEditorModel } from 'vs/workbench/services/untitled/common/untitledTextEditorModel';
1717
import { TextFileEditorModelManager } from 'vs/workbench/services/textfile/common/textFileEditorModelManager';
1818
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
1919
import { ResourceMap } from 'vs/base/common/map';

src/vs/workbench/common/editor/untitledTextEditorInput.ts renamed to src/vs/workbench/services/untitled/common/untitledTextEditorInput.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import { URI } from 'vs/base/common/uri';
77
import { IEncodingSupport, EncodingMode, Verbosity, IModeSupport, TextResourceEditorInput } from 'vs/workbench/common/editor';
8-
import { UntitledTextEditorModel } from 'vs/workbench/common/editor/untitledTextEditorModel';
8+
import { UntitledTextEditorModel } from 'vs/workbench/services/untitled/common/untitledTextEditorModel';
99
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
1010
import { Emitter } from 'vs/base/common/event';
1111
import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';

src/vs/workbench/services/untitled/common/untitledTextEditorService.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55

66
import { URI } from 'vs/base/common/uri';
77
import { createDecorator, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
8-
import { UntitledTextEditorInput } from 'vs/workbench/common/editor/untitledTextEditorInput';
8+
import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';
9+
import { UntitledTextEditorModel, IUntitledTextEditorModel } from 'vs/workbench/services/untitled/common/untitledTextEditorModel';
910
import { IFilesConfiguration } from 'vs/platform/files/common/files';
1011
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
1112
import { Event, Emitter } from 'vs/base/common/event';
1213
import { ResourceMap } from 'vs/base/common/map';
1314
import { Schemas } from 'vs/base/common/network';
1415
import { Disposable } from 'vs/base/common/lifecycle';
1516
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
16-
import { UntitledTextEditorModel, IUntitledTextEditorModel } from 'vs/workbench/common/editor/untitledTextEditorModel';
1717
import { IResolvedTextEditorModel } from 'vs/editor/common/services/resolverService';
1818

1919
export const IUntitledTextEditorService = createDecorator<IUntitledTextEditorService>('untitledTextEditorService');

src/vs/workbench/test/browser/parts/editor/untitledTextEditor.test.ts renamed to src/vs/workbench/services/untitled/test/browser/untitledTextEditor.test.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
* Copyright (c) Microsoft Corporation. All rights reserved.
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
5+
56
import { URI } from 'vs/base/common/uri';
67
import * as assert from 'assert';
78
import { join } from 'vs/base/common/path';

0 commit comments

Comments
 (0)