diff --git a/src/vs/workbench/browser/layout.ts b/src/vs/workbench/browser/layout.ts index e4200e94af32af96b2fcdb816dff79201739be39..8fa9629284cc68c074d87df4eea8d156b45e2b94 100644 --- a/src/vs/workbench/browser/layout.ts +++ b/src/vs/workbench/browser/layout.ts @@ -21,7 +21,7 @@ import { NotificationsCenter } from 'vs/workbench/browser/parts/notifications/no import { NotificationsToasts } from 'vs/workbench/browser/parts/notifications/notificationsToasts'; import { Dimension, getClientArea, size, position, hide, show } from 'vs/base/browser/dom'; import { INextEditorGroupsService } from 'vs/workbench/services/group/common/nextEditorGroupsService'; -import { NextEditorPart } from 'vs/workbench/browser/parts/editor2/nextEditorPart'; +import { NextEditorPart } from 'vs/workbench/browser/parts/editor/nextEditorPart'; import { TitlebarPart } from 'vs/workbench/browser/parts/titlebar/titlebarPart'; import { ActivitybarPart } from 'vs/workbench/browser/parts/activitybar/activitybarPart'; import { SidebarPart } from 'vs/workbench/browser/parts/sidebar/sidebarPart'; diff --git a/src/vs/workbench/browser/parts/editor2/editor2.ts b/src/vs/workbench/browser/parts/editor/editor.ts similarity index 100% rename from src/vs/workbench/browser/parts/editor2/editor2.ts rename to src/vs/workbench/browser/parts/editor/editor.ts diff --git a/src/vs/workbench/browser/parts/editor2/media/nextEditorDropTarget.css b/src/vs/workbench/browser/parts/editor/media/nextEditorDropTarget.css similarity index 100% rename from src/vs/workbench/browser/parts/editor2/media/nextEditorDropTarget.css rename to src/vs/workbench/browser/parts/editor/media/nextEditorDropTarget.css diff --git a/src/vs/workbench/browser/parts/editor2/media/nextEditorGroupView.css b/src/vs/workbench/browser/parts/editor/media/nextEditorGroupView.css similarity index 100% rename from src/vs/workbench/browser/parts/editor2/media/nextEditorGroupView.css rename to src/vs/workbench/browser/parts/editor/media/nextEditorGroupView.css diff --git a/src/vs/workbench/browser/parts/editor2/media/nextNoTabsTitleControl.css b/src/vs/workbench/browser/parts/editor/media/nextNoTabsTitleControl.css similarity index 100% rename from src/vs/workbench/browser/parts/editor2/media/nextNoTabsTitleControl.css rename to src/vs/workbench/browser/parts/editor/media/nextNoTabsTitleControl.css diff --git a/src/vs/workbench/browser/parts/editor2/media/nextTabsTitleControl.css b/src/vs/workbench/browser/parts/editor/media/nextTabsTitleControl.css similarity index 100% rename from src/vs/workbench/browser/parts/editor2/media/nextTabsTitleControl.css rename to src/vs/workbench/browser/parts/editor/media/nextTabsTitleControl.css diff --git a/src/vs/workbench/browser/parts/editor2/media/nextTitleControl.css b/src/vs/workbench/browser/parts/editor/media/nextTitleControl.css similarity index 100% rename from src/vs/workbench/browser/parts/editor2/media/nextTitleControl.css rename to src/vs/workbench/browser/parts/editor/media/nextTitleControl.css diff --git a/src/vs/workbench/browser/parts/editor/media/split-editor-horizontal-inverse.svg b/src/vs/workbench/browser/parts/editor/media/split-editor-horizontal-inverse.svg index 4969d2e785116289475dfc0f2f70332f9f3c24ed..4eab75366980a9cbd5647a8856b9b2d7e7cf9490 100644 --- a/src/vs/workbench/browser/parts/editor/media/split-editor-horizontal-inverse.svg +++ b/src/vs/workbench/browser/parts/editor/media/split-editor-horizontal-inverse.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/vs/workbench/browser/parts/editor/media/split-editor-horizontal.svg b/src/vs/workbench/browser/parts/editor/media/split-editor-horizontal.svg index c307f0142b86072b801d0de11f3e9ab1660bad99..3eeaf7c53624f4f3e87f42e9aa648312362ed79e 100644 --- a/src/vs/workbench/browser/parts/editor/media/split-editor-horizontal.svg +++ b/src/vs/workbench/browser/parts/editor/media/split-editor-horizontal.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/vs/workbench/browser/parts/editor/media/split-editor-vertical-inverse.svg b/src/vs/workbench/browser/parts/editor/media/split-editor-vertical-inverse.svg index 4eab75366980a9cbd5647a8856b9b2d7e7cf9490..4969d2e785116289475dfc0f2f70332f9f3c24ed 100644 --- a/src/vs/workbench/browser/parts/editor/media/split-editor-vertical-inverse.svg +++ b/src/vs/workbench/browser/parts/editor/media/split-editor-vertical-inverse.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/vs/workbench/browser/parts/editor/media/split-editor-vertical.svg b/src/vs/workbench/browser/parts/editor/media/split-editor-vertical.svg index 3eeaf7c53624f4f3e87f42e9aa648312362ed79e..c307f0142b86072b801d0de11f3e9ab1660bad99 100644 --- a/src/vs/workbench/browser/parts/editor/media/split-editor-vertical.svg +++ b/src/vs/workbench/browser/parts/editor/media/split-editor-vertical.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/vs/workbench/browser/parts/editor2/nextEditorControl.ts b/src/vs/workbench/browser/parts/editor/nextEditorControl.ts similarity index 99% rename from src/vs/workbench/browser/parts/editor2/nextEditorControl.ts rename to src/vs/workbench/browser/parts/editor/nextEditorControl.ts index 7fcafa7df5a7263c37d68ab5bdb6e0adf123ace8..a92d7b87af5550d4d0ceff04c7b8a428508cd9fa 100644 --- a/src/vs/workbench/browser/parts/editor2/nextEditorControl.ts +++ b/src/vs/workbench/browser/parts/editor/nextEditorControl.ts @@ -16,7 +16,7 @@ import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IProgressService, LongRunningOperation } from 'vs/platform/progress/common/progress'; import { toWinJsPromise } from 'vs/base/common/async'; -import { INextEditorGroupView } from 'vs/workbench/browser/parts/editor2/editor2'; +import { INextEditorGroupView } from 'vs/workbench/browser/parts/editor/editor'; export interface IOpenEditorResult { readonly control: BaseEditor; diff --git a/src/vs/workbench/browser/parts/editor2/nextEditorDropTarget.ts b/src/vs/workbench/browser/parts/editor/nextEditorDropTarget.ts similarity index 99% rename from src/vs/workbench/browser/parts/editor2/nextEditorDropTarget.ts rename to src/vs/workbench/browser/parts/editor/nextEditorDropTarget.ts index b20dced6fd258f4f1b18dcc23e1f99634251bad6..f385b05e626409d55df8bd3e412d2b58bb7ba49c 100644 --- a/src/vs/workbench/browser/parts/editor2/nextEditorDropTarget.ts +++ b/src/vs/workbench/browser/parts/editor/nextEditorDropTarget.ts @@ -8,7 +8,7 @@ import 'vs/css!./media/nextEditorDropTarget'; import { LocalSelectionTransfer, DraggedEditorIdentifier, ResourcesDropHandler, DraggedEditorGroupIdentifier, DragAndDropObserver } from 'vs/workbench/browser/dnd'; import { addDisposableListener, EventType, EventHelper, isAncestor, toggleClass, addClass, removeClass } from 'vs/base/browser/dom'; -import { INextEditorGroupsAccessor, EDITOR_TITLE_HEIGHT, INextEditorGroupView, getActiveTextEditorOptions } from 'vs/workbench/browser/parts/editor2/editor2'; +import { INextEditorGroupsAccessor, EDITOR_TITLE_HEIGHT, INextEditorGroupView, getActiveTextEditorOptions } from 'vs/workbench/browser/parts/editor/editor'; import { EDITOR_DRAG_AND_DROP_BACKGROUND, Themable } from 'vs/workbench/common/theme'; import { IThemeService } from 'vs/platform/theme/common/themeService'; import { activeContrastBorder } from 'vs/platform/theme/common/colorRegistry'; diff --git a/src/vs/workbench/browser/parts/editor2/nextEditorGroupView.ts b/src/vs/workbench/browser/parts/editor/nextEditorGroupView.ts similarity index 99% rename from src/vs/workbench/browser/parts/editor2/nextEditorGroupView.ts rename to src/vs/workbench/browser/parts/editor/nextEditorGroupView.ts index 1b62bc3948521b90fd73ecb77d941d220a89ba6f..81d3959e4615aad5f6652a433e0aeeebe2d8cbfa 100644 --- a/src/vs/workbench/browser/parts/editor2/nextEditorGroupView.ts +++ b/src/vs/workbench/browser/parts/editor/nextEditorGroupView.ts @@ -20,8 +20,8 @@ import { IThemeService, registerThemingParticipant } from 'vs/platform/theme/com import { editorBackground, contrastBorder, focusBorder } from 'vs/platform/theme/common/colorRegistry'; import { Themable, EDITOR_GROUP_HEADER_TABS_BORDER, EDITOR_GROUP_HEADER_TABS_BACKGROUND, EDITOR_GROUP_HEADER_NO_TABS_BACKGROUND, EDITOR_GROUP_ACTIVE_EMPTY_BACKGROUND, EDITOR_GROUP_EMPTY_BACKGROUND } from 'vs/workbench/common/theme'; import { IMoveEditorOptions, ICopyEditorOptions, ICloseEditorsFilter, IGroupChangeEvent, GroupChangeKind, EditorsOrder } from 'vs/workbench/services/group/common/nextEditorGroupsService'; -import { NextTabsTitleControl } from 'vs/workbench/browser/parts/editor2/nextTabsTitleControl'; -import { NextEditorControl } from 'vs/workbench/browser/parts/editor2/nextEditorControl'; +import { NextTabsTitleControl } from 'vs/workbench/browser/parts/editor/nextTabsTitleControl'; +import { NextEditorControl } from 'vs/workbench/browser/parts/editor/nextEditorControl'; import { IProgressService } from 'vs/platform/progress/common/progress'; import { ProgressService } from 'vs/workbench/services/progress/browser/progressService'; import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor'; @@ -33,8 +33,8 @@ import { toErrorMessage } from 'vs/base/common/errorMessage'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { RunOnceWorker } from 'vs/base/common/async'; import { EventType as TouchEventType, GestureEvent } from 'vs/base/browser/touch'; -import { NextTitleControl } from 'vs/workbench/browser/parts/editor2/nextTitleControl'; -import { INextEditorGroupsAccessor, INextEditorGroupView, INextEditorPartOptionsChangeEvent, EDITOR_TITLE_HEIGHT, EDITOR_MIN_DIMENSIONS, EDITOR_MAX_DIMENSIONS, getActiveTextEditorOptions } from 'vs/workbench/browser/parts/editor2/editor2'; +import { NextTitleControl } from 'vs/workbench/browser/parts/editor/nextTitleControl'; +import { INextEditorGroupsAccessor, INextEditorGroupView, INextEditorPartOptionsChangeEvent, EDITOR_TITLE_HEIGHT, EDITOR_MIN_DIMENSIONS, EDITOR_MAX_DIMENSIONS, getActiveTextEditorOptions } from 'vs/workbench/browser/parts/editor/editor'; import { NextNoTabsTitleControl } from './nextNoTabsTitleControl'; import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService'; import { join } from 'vs/base/common/paths'; diff --git a/src/vs/workbench/browser/parts/editor2/nextEditorPart.ts b/src/vs/workbench/browser/parts/editor/nextEditorPart.ts similarity index 99% rename from src/vs/workbench/browser/parts/editor2/nextEditorPart.ts rename to src/vs/workbench/browser/parts/editor/nextEditorPart.ts index f3b03fc8682143190c2b3b25af54db2809d6c171..999782f208d7988131a3c5d878a5f90597bc6431 100644 --- a/src/vs/workbench/browser/parts/editor2/nextEditorPart.ts +++ b/src/vs/workbench/browser/parts/editor/nextEditorPart.ts @@ -18,8 +18,8 @@ import { GroupIdentifier, IWorkbenchEditorConfiguration } from 'vs/workbench/com import { values } from 'vs/base/common/map'; import { EDITOR_GROUP_BORDER } from 'vs/workbench/common/theme'; import { distinct } from 'vs/base/common/arrays'; -import { INextEditorGroupsAccessor, INextEditorGroupView, INextEditorPartOptions, getEditorPartOptions, impactsEditorPartOptions, INextEditorPartOptionsChangeEvent, EDITOR_MAX_DIMENSIONS, EDITOR_MIN_DIMENSIONS } from 'vs/workbench/browser/parts/editor2/editor2'; -import { NextEditorGroupView } from 'vs/workbench/browser/parts/editor2/nextEditorGroupView'; +import { INextEditorGroupsAccessor, INextEditorGroupView, INextEditorPartOptions, getEditorPartOptions, impactsEditorPartOptions, INextEditorPartOptionsChangeEvent, EDITOR_MAX_DIMENSIONS, EDITOR_MIN_DIMENSIONS } from 'vs/workbench/browser/parts/editor/editor'; +import { NextEditorGroupView } from 'vs/workbench/browser/parts/editor/nextEditorGroupView'; import { IConfigurationService, IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration'; import { IDisposable, dispose, toDisposable } from 'vs/base/common/lifecycle'; import { assign } from 'vs/base/common/objects'; @@ -32,7 +32,7 @@ import { GroupOrientation as LegacyGroupOrientation } from 'vs/workbench/service import { INotificationService, Severity } from 'vs/platform/notification/common/notification'; import { IWindowService } from 'vs/platform/windows/common/windows'; import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle'; -import { NextEditorDropTarget } from 'vs/workbench/browser/parts/editor2/nextEditorDropTarget'; +import { NextEditorDropTarget } from 'vs/workbench/browser/parts/editor/nextEditorDropTarget'; import { localize } from 'vs/nls'; // TODO@grid enable minimized/maximized groups in one dimension diff --git a/src/vs/workbench/browser/parts/editor2/nextNoTabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/nextNoTabsTitleControl.ts similarity index 99% rename from src/vs/workbench/browser/parts/editor2/nextNoTabsTitleControl.ts rename to src/vs/workbench/browser/parts/editor/nextNoTabsTitleControl.ts index ff739929c0ae6f0f75400a05d139afa027594b00..e593134552b570c4b3cf3f67345eadb6eaccbca7 100644 --- a/src/vs/workbench/browser/parts/editor2/nextNoTabsTitleControl.ts +++ b/src/vs/workbench/browser/parts/editor/nextNoTabsTitleControl.ts @@ -7,12 +7,12 @@ import 'vs/css!./media/nextNoTabsTitleControl'; import { toResource, Verbosity, IEditorInput } from 'vs/workbench/common/editor'; -import { NextTitleControl } from 'vs/workbench/browser/parts/editor2/nextTitleControl'; +import { NextTitleControl } from 'vs/workbench/browser/parts/editor/nextTitleControl'; import { ResourceLabel } from 'vs/workbench/browser/labels'; import { TAB_ACTIVE_FOREGROUND, TAB_UNFOCUSED_ACTIVE_FOREGROUND } from 'vs/workbench/common/theme'; import { EventType as TouchEventType, GestureEvent, Gesture } from 'vs/base/browser/touch'; import { addDisposableListener, EventType, addClass, EventHelper, removeClass } from 'vs/base/browser/dom'; -import { INextEditorPartOptions } from 'vs/workbench/browser/parts/editor2/editor2'; +import { INextEditorPartOptions } from 'vs/workbench/browser/parts/editor/editor'; export class NextNoTabsTitleControl extends NextTitleControl { private titleContainer: HTMLElement; diff --git a/src/vs/workbench/browser/parts/editor2/nextTabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/nextTabsTitleControl.ts similarity index 99% rename from src/vs/workbench/browser/parts/editor2/nextTabsTitleControl.ts rename to src/vs/workbench/browser/parts/editor/nextTabsTitleControl.ts index d3c49c48154769b1a9a232a6bbccd4e90589e96c..3b5b71b2e7401199a4d2140ed4ea042376d4413a 100644 --- a/src/vs/workbench/browser/parts/editor2/nextTabsTitleControl.ts +++ b/src/vs/workbench/browser/parts/editor/nextTabsTitleControl.ts @@ -22,7 +22,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { IMenuService } from 'vs/platform/actions/common/actions'; -import { NextTitleControl } from 'vs/workbench/browser/parts/editor2/nextTitleControl'; +import { NextTitleControl } from 'vs/workbench/browser/parts/editor/nextTitleControl'; import { IQuickOpenService } from 'vs/platform/quickOpen/common/quickOpen'; import { IDisposable, dispose, combinedDisposable } from 'vs/base/common/lifecycle'; import { ScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement'; @@ -39,7 +39,7 @@ import { INextEditorGroup } from 'vs/workbench/services/group/common/nextEditorG import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService'; import { addClass, addDisposableListener, hasClass, EventType, EventHelper, removeClass, Dimension, scheduleAtNextAnimationFrame, findParentWithClass, clearNode } from 'vs/base/browser/dom'; import { localize } from 'vs/nls'; -import { INextEditorGroupsAccessor, INextEditorPartOptions } from 'vs/workbench/browser/parts/editor2/editor2'; +import { INextEditorGroupsAccessor, INextEditorPartOptions } from 'vs/workbench/browser/parts/editor/editor'; interface IEditorInputLabel { name: string; diff --git a/src/vs/workbench/browser/parts/editor2/nextTitleControl.ts b/src/vs/workbench/browser/parts/editor/nextTitleControl.ts similarity index 99% rename from src/vs/workbench/browser/parts/editor2/nextTitleControl.ts rename to src/vs/workbench/browser/parts/editor/nextTitleControl.ts index 4bad577963b8b4fa50eb2efe3d74b989c5031d37..9a58164e12609610a68efe34ae83b5eed358fe37 100644 --- a/src/vs/workbench/browser/parts/editor2/nextTitleControl.ts +++ b/src/vs/workbench/browser/parts/editor/nextTitleControl.ts @@ -35,7 +35,7 @@ import { INotificationService } from 'vs/platform/notification/common/notificati import { Dimension, addDisposableListener, EventType } from 'vs/base/browser/dom'; import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions'; import { INextEditorGroup } from 'vs/workbench/services/group/common/nextEditorGroupsService'; -import { INextEditorGroupsAccessor, INextEditorPartOptions } from 'vs/workbench/browser/parts/editor2/editor2'; +import { INextEditorGroupsAccessor, INextEditorPartOptions } from 'vs/workbench/browser/parts/editor/editor'; import { listActiveSelectionBackground, listActiveSelectionForeground } from 'vs/platform/theme/common/colorRegistry'; import { LocalSelectionTransfer, DraggedEditorGroupIdentifier, DraggedEditorIdentifier, fillResourceDataTransfers } from 'vs/workbench/browser/dnd'; import { applyDragImage } from 'vs/base/browser/dnd'; diff --git a/src/vs/workbench/browser/parts/editor2/media/close-dirty-inverse.svg b/src/vs/workbench/browser/parts/editor2/media/close-dirty-inverse.svg deleted file mode 100644 index 02dafab76fc6e4dde364ab476ec2b774a688463e..0000000000000000000000000000000000000000 --- a/src/vs/workbench/browser/parts/editor2/media/close-dirty-inverse.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/vs/workbench/browser/parts/editor2/media/close-dirty.svg b/src/vs/workbench/browser/parts/editor2/media/close-dirty.svg deleted file mode 100644 index 409e5fa539c898f97fd1c66f6f541d3c57f0125e..0000000000000000000000000000000000000000 --- a/src/vs/workbench/browser/parts/editor2/media/close-dirty.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/vs/workbench/browser/parts/editor2/media/close-inverse.svg b/src/vs/workbench/browser/parts/editor2/media/close-inverse.svg deleted file mode 100644 index 751e89b3b0215f74d84195d1dea54ca0c25f91c3..0000000000000000000000000000000000000000 --- a/src/vs/workbench/browser/parts/editor2/media/close-inverse.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/vs/workbench/browser/parts/editor2/media/close.svg b/src/vs/workbench/browser/parts/editor2/media/close.svg deleted file mode 100644 index fde34404d4eb8537f8bf76eb9f76127872ef68ba..0000000000000000000000000000000000000000 --- a/src/vs/workbench/browser/parts/editor2/media/close.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/vs/workbench/browser/parts/editor2/media/split-editor-horizontal-inverse.svg b/src/vs/workbench/browser/parts/editor2/media/split-editor-horizontal-inverse.svg deleted file mode 100644 index 4eab75366980a9cbd5647a8856b9b2d7e7cf9490..0000000000000000000000000000000000000000 --- a/src/vs/workbench/browser/parts/editor2/media/split-editor-horizontal-inverse.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/vs/workbench/browser/parts/editor2/media/split-editor-horizontal.svg b/src/vs/workbench/browser/parts/editor2/media/split-editor-horizontal.svg deleted file mode 100644 index 3eeaf7c53624f4f3e87f42e9aa648312362ed79e..0000000000000000000000000000000000000000 --- a/src/vs/workbench/browser/parts/editor2/media/split-editor-horizontal.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/vs/workbench/browser/parts/editor2/media/split-editor-vertical-inverse.svg b/src/vs/workbench/browser/parts/editor2/media/split-editor-vertical-inverse.svg deleted file mode 100644 index 4969d2e785116289475dfc0f2f70332f9f3c24ed..0000000000000000000000000000000000000000 --- a/src/vs/workbench/browser/parts/editor2/media/split-editor-vertical-inverse.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/vs/workbench/browser/parts/editor2/media/split-editor-vertical.svg b/src/vs/workbench/browser/parts/editor2/media/split-editor-vertical.svg deleted file mode 100644 index c307f0142b86072b801d0de11f3e9ab1660bad99..0000000000000000000000000000000000000000 --- a/src/vs/workbench/browser/parts/editor2/media/split-editor-vertical.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/vs/workbench/electron-browser/workbench.ts b/src/vs/workbench/electron-browser/workbench.ts index ecf773521350fa4ff5197ca456890e54e7301c33..e32aff2d5cea703a00e71a17924a396b754f8312 100644 --- a/src/vs/workbench/electron-browser/workbench.ts +++ b/src/vs/workbench/electron-browser/workbench.ts @@ -109,7 +109,7 @@ import { registerWindowDriver } from 'vs/platform/driver/electron-browser/driver import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences'; import { PreferencesService } from 'vs/workbench/services/preferences/browser/preferencesService'; import { INextEditorService } from 'vs/workbench/services/editor/common/nextEditorService'; -import { NextEditorPart } from 'vs/workbench/browser/parts/editor2/nextEditorPart'; +import { NextEditorPart } from 'vs/workbench/browser/parts/editor/nextEditorPart'; import { INextEditorGroupsService, GroupDirection } from 'vs/workbench/services/group/common/nextEditorGroupsService'; import { NextEditorService } from 'vs/workbench/services/editor/browser/nextEditorService'; import { IExtensionUrlHandler, ExtensionUrlHandler } from 'vs/platform/url/electron-browser/inactiveExtensionUrlHandler'; diff --git a/src/vs/workbench/services/editor/test/browser/nextEditorService.test.ts b/src/vs/workbench/services/editor/test/browser/nextEditorService.test.ts index 9a94483646240839100a9e56fad204b86d7ef5d2..858027c757b8c3be0f08d396567b0b667f578389 100644 --- a/src/vs/workbench/services/editor/test/browser/nextEditorService.test.ts +++ b/src/vs/workbench/services/editor/test/browser/nextEditorService.test.ts @@ -17,7 +17,7 @@ import { ResourceEditorInput } from 'vs/workbench/common/editor/resourceEditorIn import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService'; import { NextEditorService, DelegatingWorkbenchEditorService } from 'vs/workbench/services/editor/browser/nextEditorService'; import { INextEditorGroup, INextEditorGroupsService, GroupDirection } from 'vs/workbench/services/group/common/nextEditorGroupsService'; -import { NextEditorPart } from 'vs/workbench/browser/parts/editor2/nextEditorPart'; +import { NextEditorPart } from 'vs/workbench/browser/parts/editor/nextEditorPart'; import { Dimension } from 'vs/base/browser/dom'; import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection'; import { INextEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/nextEditorService'; @@ -57,7 +57,7 @@ export class TestEditorInput extends EditorInput implements IFileEditorInput { } } -suite('Editor service (editor2)', () => { +suite('Editor service', () => { function registerTestEditorInput(): void { Registry.as(Extensions.Editors).registerEditor(new EditorDescriptor(TestEditorControl, 'MyTestEditorForNextEditorService', 'My Test Editor For Next Editor Service'), new SyncDescriptor(TestEditorInput)); diff --git a/src/vs/workbench/services/group/test/browser/nextEditorGroupsService.test.ts b/src/vs/workbench/services/group/test/browser/nextEditorGroupsService.test.ts index 3da82bfd7ad806c7534733aa887e9ac2cdff8298..cd82831b9a09ad93ddab17a5124a61c2b81e2167 100644 --- a/src/vs/workbench/services/group/test/browser/nextEditorGroupsService.test.ts +++ b/src/vs/workbench/services/group/test/browser/nextEditorGroupsService.test.ts @@ -6,12 +6,12 @@ 'use strict'; import * as assert from 'assert'; -import { NextEditorPart } from 'vs/workbench/browser/parts/editor2/nextEditorPart'; +import { NextEditorPart } from 'vs/workbench/browser/parts/editor/nextEditorPart'; import { workbenchInstantiationService } from 'vs/workbench/test/workbenchTestServices'; import { GroupDirection, GroupsOrder, MergeGroupMode, GroupOrientation, GroupChangeKind, EditorsOrder, GroupLocation } from 'vs/workbench/services/group/common/nextEditorGroupsService'; import { Dimension } from 'vs/base/browser/dom'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { INextEditorPartOptions } from 'vs/workbench/browser/parts/editor2/editor2'; +import { INextEditorPartOptions } from 'vs/workbench/browser/parts/editor/editor'; import { EditorInput, IFileEditorInput, IEditorInputFactory, IEditorInputFactoryRegistry, Extensions as EditorExtensions, EditorOptions, CloseDirection } from 'vs/workbench/common/editor'; import { TPromise } from 'vs/base/common/winjs.base'; import { IEditorModel } from 'vs/platform/editor/common/editor'; @@ -47,7 +47,7 @@ export class TestEditorInput extends EditorInput implements IFileEditorInput { setForceOpenAsBinary(): void { } } -suite('Editor groups service (editor2)', () => { +suite('Editor groups service', () => { function registerTestEditorInput(): void { diff --git a/src/vs/workbench/test/common/editor/editorGroups.test.ts b/src/vs/workbench/test/common/editor/editorGroups.test.ts index c7ff7b6e290c7687fce811f23b42a1980582362a..d29a9cd41e8c4d42e9373006a86fcd7cb1442e71 100644 --- a/src/vs/workbench/test/common/editor/editorGroups.test.ts +++ b/src/vs/workbench/test/common/editor/editorGroups.test.ts @@ -169,7 +169,7 @@ class TestEditorInputFactory implements IEditorInputFactory { } } -suite('Workbench editor groups (editor2)', () => { +suite('Workbench editor groups', () => { function registerEditorInputFactory() { Registry.as(EditorExtensions.EditorInputFactories).registerEditorInputFactory('testEditorInputForGroups', TestEditorInputFactory);