mirror of
https://github.com/Microsoft/vscode
synced 2024-09-13 21:55:38 +00:00
editors - extract input and side by side to own classes
This commit is contained in:
parent
856fb393cb
commit
eebf8e876a
|
@ -4,7 +4,8 @@
|
||||||
*--------------------------------------------------------------------------------------------*/
|
*--------------------------------------------------------------------------------------------*/
|
||||||
|
|
||||||
import { localize } from 'vs/nls';
|
import { localize } from 'vs/nls';
|
||||||
import { EditorInput, EditorResourceAccessor, IEditorInput, EditorExtensions, SideBySideEditor, IEditorDescriptor as ICommonEditorDescriptor } from 'vs/workbench/common/editor';
|
import { EditorResourceAccessor, IEditorInput, EditorExtensions, SideBySideEditor, IEditorDescriptor as ICommonEditorDescriptor } from 'vs/workbench/common/editor';
|
||||||
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
|
import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
|
||||||
import { Registry } from 'vs/platform/registry/common/platform';
|
import { Registry } from 'vs/platform/registry/common/platform';
|
||||||
import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
|
import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
|
||||||
|
|
|
@ -10,7 +10,8 @@ import { onDidChangeFullscreen, isFullscreen } from 'vs/base/browser/browser';
|
||||||
import { IWorkingCopyBackupService } from 'vs/workbench/services/workingCopy/common/workingCopyBackup';
|
import { IWorkingCopyBackupService } from 'vs/workbench/services/workingCopy/common/workingCopyBackup';
|
||||||
import { Registry } from 'vs/platform/registry/common/platform';
|
import { Registry } from 'vs/platform/registry/common/platform';
|
||||||
import { isWindows, isLinux, isMacintosh, isWeb, isNative } from 'vs/base/common/platform';
|
import { isWindows, isLinux, isMacintosh, isWeb, isNative } from 'vs/base/common/platform';
|
||||||
import { pathsToEditors, SideBySideEditorInput } from 'vs/workbench/common/editor';
|
import { pathsToEditors } from 'vs/workbench/common/editor';
|
||||||
|
import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditoInput';
|
||||||
import { SidebarPart } from 'vs/workbench/browser/parts/sidebar/sidebarPart';
|
import { SidebarPart } from 'vs/workbench/browser/parts/sidebar/sidebarPart';
|
||||||
import { PanelPart } from 'vs/workbench/browser/parts/panel/panelPart';
|
import { PanelPart } from 'vs/workbench/browser/parts/panel/panelPart';
|
||||||
import { PanelRegistry, Extensions as PanelExtensions } from 'vs/workbench/browser/panel';
|
import { PanelRegistry, Extensions as PanelExtensions } from 'vs/workbench/browser/panel';
|
||||||
|
|
|
@ -6,7 +6,8 @@
|
||||||
import 'vs/css!./media/binaryeditor';
|
import 'vs/css!./media/binaryeditor';
|
||||||
import { localize } from 'vs/nls';
|
import { localize } from 'vs/nls';
|
||||||
import { Emitter } from 'vs/base/common/event';
|
import { Emitter } from 'vs/base/common/event';
|
||||||
import { EditorInput, EditorOptions, IEditorOpenContext } from 'vs/workbench/common/editor';
|
import { EditorOptions, IEditorOpenContext } from 'vs/workbench/common/editor';
|
||||||
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
|
import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
|
||||||
import { BinaryEditorModel } from 'vs/workbench/common/editor/binaryEditorModel';
|
import { BinaryEditorModel } from 'vs/workbench/common/editor/binaryEditorModel';
|
||||||
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
|
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
|
||||||
|
|
|
@ -8,10 +8,11 @@ import { localize } from 'vs/nls';
|
||||||
import { URI } from 'vs/base/common/uri';
|
import { URI } from 'vs/base/common/uri';
|
||||||
import { IEditorRegistry, EditorDescriptor } from 'vs/workbench/browser/editor';
|
import { IEditorRegistry, EditorDescriptor } from 'vs/workbench/browser/editor';
|
||||||
import {
|
import {
|
||||||
EditorInput, IEditorInputSerializer, SideBySideEditorInput, IEditorInputFactoryRegistry, TextCompareEditorActiveContext, ActiveEditorPinnedContext,
|
IEditorInputSerializer, IEditorInputFactoryRegistry, TextCompareEditorActiveContext, ActiveEditorPinnedContext, EditorExtensions,
|
||||||
EditorGroupEditorsCountContext, ActiveEditorStickyContext, ActiveEditorAvailableEditorIdsContext, MultipleEditorGroupsContext, ActiveEditorDirtyContext,
|
EditorGroupEditorsCountContext, ActiveEditorStickyContext, ActiveEditorAvailableEditorIdsContext, MultipleEditorGroupsContext, ActiveEditorDirtyContext
|
||||||
EditorExtensions
|
|
||||||
} from 'vs/workbench/common/editor';
|
} from 'vs/workbench/common/editor';
|
||||||
|
import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditoInput';
|
||||||
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
import { TextResourceEditor } from 'vs/workbench/browser/parts/editor/textResourceEditor';
|
import { TextResourceEditor } from 'vs/workbench/browser/parts/editor/textResourceEditor';
|
||||||
import { SideBySideEditor } from 'vs/workbench/browser/parts/editor/sideBySideEditor';
|
import { SideBySideEditor } from 'vs/workbench/browser/parts/editor/sideBySideEditor';
|
||||||
import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
|
import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
|
||||||
|
|
|
@ -3,7 +3,8 @@
|
||||||
* Licensed under the MIT License. See License.txt in the project root for license information.
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
||||||
*--------------------------------------------------------------------------------------------*/
|
*--------------------------------------------------------------------------------------------*/
|
||||||
|
|
||||||
import { GroupIdentifier, IWorkbenchEditorConfiguration, EditorOptions, TextEditorOptions, IEditorInput, IEditorIdentifier, IEditorCloseEvent, IEditorPartOptions, IEditorPartOptionsChangeEvent, EditorInput } from 'vs/workbench/common/editor';
|
import { GroupIdentifier, IWorkbenchEditorConfiguration, EditorOptions, TextEditorOptions, IEditorInput, IEditorIdentifier, IEditorCloseEvent, IEditorPartOptions, IEditorPartOptionsChangeEvent } from 'vs/workbench/common/editor';
|
||||||
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
import { IEditorGroup, GroupDirection, IAddGroupOptions, IMergeGroupOptions, GroupsOrder, GroupsArrangement } from 'vs/workbench/services/editor/common/editorGroupsService';
|
import { IEditorGroup, GroupDirection, IAddGroupOptions, IMergeGroupOptions, GroupsOrder, GroupsArrangement } from 'vs/workbench/services/editor/common/editorGroupsService';
|
||||||
import { IDisposable } from 'vs/base/common/lifecycle';
|
import { IDisposable } from 'vs/base/common/lifecycle';
|
||||||
import { Dimension } from 'vs/base/browser/dom';
|
import { Dimension } from 'vs/base/browser/dom';
|
||||||
|
|
|
@ -5,7 +5,8 @@
|
||||||
|
|
||||||
import { localize } from 'vs/nls';
|
import { localize } from 'vs/nls';
|
||||||
import { Action } from 'vs/base/common/actions';
|
import { Action } from 'vs/base/common/actions';
|
||||||
import { IEditorInput, IEditorIdentifier, IEditorCommandsContext, CloseDirection, SaveReason, EditorsOrder, SideBySideEditorInput, EditorInputCapabilities, IEditorInputFactoryRegistry, EditorExtensions } from 'vs/workbench/common/editor';
|
import { IEditorInput, IEditorIdentifier, IEditorCommandsContext, CloseDirection, SaveReason, EditorsOrder, EditorInputCapabilities, IEditorInputFactoryRegistry, EditorExtensions } from 'vs/workbench/common/editor';
|
||||||
|
import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditoInput';
|
||||||
import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
|
import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
|
||||||
import { IHistoryService } from 'vs/workbench/services/history/common/history';
|
import { IHistoryService } from 'vs/workbench/services/history/common/history';
|
||||||
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
|
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
|
||||||
|
|
|
@ -4,7 +4,8 @@
|
||||||
*--------------------------------------------------------------------------------------------*/
|
*--------------------------------------------------------------------------------------------*/
|
||||||
|
|
||||||
import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
|
import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
|
||||||
import { EditorExtensions, EditorInput, EditorInputCapabilities, EditorOptions, IEditorOpenContext, IVisibleEditorPane } from 'vs/workbench/common/editor';
|
import { EditorExtensions, EditorInputCapabilities, EditorOptions, IEditorOpenContext, IVisibleEditorPane } from 'vs/workbench/common/editor';
|
||||||
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
import { Dimension, show, hide } from 'vs/base/browser/dom';
|
import { Dimension, show, hide } from 'vs/base/browser/dom';
|
||||||
import { Registry } from 'vs/platform/registry/common/platform';
|
import { Registry } from 'vs/platform/registry/common/platform';
|
||||||
import { IEditorRegistry, IEditorDescriptor } from 'vs/workbench/browser/editor';
|
import { IEditorRegistry, IEditorDescriptor } from 'vs/workbench/browser/editor';
|
||||||
|
|
|
@ -5,7 +5,9 @@
|
||||||
|
|
||||||
import 'vs/css!./media/editorgroupview';
|
import 'vs/css!./media/editorgroupview';
|
||||||
import { EditorGroupModel, IEditorOpenOptions, EditorCloseEvent, ISerializedEditorGroupModel, isSerializedEditorGroupModel } from 'vs/workbench/common/editor/editorGroupModel';
|
import { EditorGroupModel, IEditorOpenOptions, EditorCloseEvent, ISerializedEditorGroupModel, isSerializedEditorGroupModel } from 'vs/workbench/common/editor/editorGroupModel';
|
||||||
import { EditorInput, EditorOptions, GroupIdentifier, SideBySideEditorInput, CloseDirection, IEditorCloseEvent, ActiveEditorDirtyContext, IEditorPane, EditorGroupEditorsCountContext, SaveReason, IEditorPartOptionsChangeEvent, EditorsOrder, IVisibleEditorPane, ActiveEditorStickyContext, ActiveEditorPinnedContext, EditorResourceAccessor, IEditorMoveEvent, EditorInputCapabilities, IEditorOpenEvent } from 'vs/workbench/common/editor';
|
import { EditorOptions, GroupIdentifier, CloseDirection, IEditorCloseEvent, ActiveEditorDirtyContext, IEditorPane, EditorGroupEditorsCountContext, SaveReason, IEditorPartOptionsChangeEvent, EditorsOrder, IVisibleEditorPane, ActiveEditorStickyContext, ActiveEditorPinnedContext, EditorResourceAccessor, IEditorMoveEvent, EditorInputCapabilities, IEditorOpenEvent } from 'vs/workbench/common/editor';
|
||||||
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
|
import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditoInput';
|
||||||
import { Event, Emitter, Relay } from 'vs/base/common/event';
|
import { Event, Emitter, Relay } from 'vs/base/common/event';
|
||||||
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
|
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
|
||||||
import { Dimension, trackFocus, addDisposableListener, EventType, EventHelper, findParentWithClass, clearNode, isAncestor, asCSSUrl } from 'vs/base/browser/dom';
|
import { Dimension, trackFocus, addDisposableListener, EventType, EventHelper, findParentWithClass, clearNode, isAncestor, asCSSUrl } from 'vs/base/browser/dom';
|
||||||
|
|
|
@ -4,7 +4,8 @@
|
||||||
*--------------------------------------------------------------------------------------------*/
|
*--------------------------------------------------------------------------------------------*/
|
||||||
|
|
||||||
import { Composite } from 'vs/workbench/browser/composite';
|
import { Composite } from 'vs/workbench/browser/composite';
|
||||||
import { EditorInput, EditorOptions, IEditorPane, GroupIdentifier, IEditorMemento, IEditorOpenContext } from 'vs/workbench/common/editor';
|
import { EditorOptions, IEditorPane, GroupIdentifier, IEditorMemento, IEditorOpenContext } from 'vs/workbench/common/editor';
|
||||||
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
|
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
|
||||||
import { IThemeService } from 'vs/platform/theme/common/themeService';
|
import { IThemeService } from 'vs/platform/theme/common/themeService';
|
||||||
import { CancellationToken } from 'vs/base/common/cancellation';
|
import { CancellationToken } from 'vs/base/common/cancellation';
|
||||||
|
|
|
@ -13,7 +13,7 @@ import { URI } from 'vs/base/common/uri';
|
||||||
import { Action, WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from 'vs/base/common/actions';
|
import { Action, WorkbenchActionExecutedClassification, WorkbenchActionExecutedEvent } from 'vs/base/common/actions';
|
||||||
import { Language } from 'vs/base/common/platform';
|
import { Language } from 'vs/base/common/platform';
|
||||||
import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';
|
import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';
|
||||||
import { IFileEditorInput, EditorResourceAccessor, SideBySideEditorInput, IEditorPane, IEditorInput, SideBySideEditor, EditorInputCapabilities } from 'vs/workbench/common/editor';
|
import { IFileEditorInput, EditorResourceAccessor, IEditorPane, IEditorInput, SideBySideEditor, EditorInputCapabilities } from 'vs/workbench/common/editor';
|
||||||
import { Disposable, MutableDisposable, DisposableStore } from 'vs/base/common/lifecycle';
|
import { Disposable, MutableDisposable, DisposableStore } from 'vs/base/common/lifecycle';
|
||||||
import { IEditorAction } from 'vs/editor/common/editorCommon';
|
import { IEditorAction } from 'vs/editor/common/editorCommon';
|
||||||
import { EndOfLineSequence } from 'vs/editor/common/model';
|
import { EndOfLineSequence } from 'vs/editor/common/model';
|
||||||
|
@ -53,6 +53,7 @@ import { IMarker, IMarkerService, MarkerSeverity, IMarkerData } from 'vs/platfor
|
||||||
import { STATUS_BAR_PROMINENT_ITEM_BACKGROUND, STATUS_BAR_PROMINENT_ITEM_FOREGROUND } from 'vs/workbench/common/theme';
|
import { STATUS_BAR_PROMINENT_ITEM_BACKGROUND, STATUS_BAR_PROMINENT_ITEM_FOREGROUND } from 'vs/workbench/common/theme';
|
||||||
import { themeColorFromId } from 'vs/platform/theme/common/themeService';
|
import { themeColorFromId } from 'vs/platform/theme/common/themeService';
|
||||||
import { ITelemetryData, ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
|
import { ITelemetryData, ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
|
||||||
|
import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditoInput';
|
||||||
|
|
||||||
class SideBySideEditorEncodingSupport implements IEncodingSupport {
|
class SideBySideEditorEncodingSupport implements IEncodingSupport {
|
||||||
constructor(private primary: IEncodingSupport, private secondary: IEncodingSupport) { }
|
constructor(private primary: IEncodingSupport, private secondary: IEncodingSupport) { }
|
||||||
|
|
|
@ -3,7 +3,8 @@
|
||||||
* Licensed under the MIT License. See License.txt in the project root for license information.
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
||||||
*--------------------------------------------------------------------------------------------*/
|
*--------------------------------------------------------------------------------------------*/
|
||||||
|
|
||||||
import { IEditorInput, IEditorInputFactoryRegistry, IEditorIdentifier, GroupIdentifier, EditorExtensions, IEditorPartOptionsChangeEvent, EditorsOrder, SideBySideEditorInput } from 'vs/workbench/common/editor';
|
import { IEditorInput, IEditorInputFactoryRegistry, IEditorIdentifier, GroupIdentifier, EditorExtensions, IEditorPartOptionsChangeEvent, EditorsOrder } from 'vs/workbench/common/editor';
|
||||||
|
import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditoInput';
|
||||||
import { dispose, Disposable, DisposableStore } from 'vs/base/common/lifecycle';
|
import { dispose, Disposable, DisposableStore } from 'vs/base/common/lifecycle';
|
||||||
import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
|
import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
|
||||||
import { Registry } from 'vs/platform/registry/common/platform';
|
import { Registry } from 'vs/platform/registry/common/platform';
|
||||||
|
|
|
@ -5,7 +5,9 @@
|
||||||
|
|
||||||
import { Dimension, $, clearNode } from 'vs/base/browser/dom';
|
import { Dimension, $, clearNode } from 'vs/base/browser/dom';
|
||||||
import { Registry } from 'vs/platform/registry/common/platform';
|
import { Registry } from 'vs/platform/registry/common/platform';
|
||||||
import { EditorInput, EditorOptions, SideBySideEditorInput, IEditorControl, IEditorPane, IEditorOpenContext, EditorExtensions } from 'vs/workbench/common/editor';
|
import { EditorOptions, IEditorControl, IEditorPane, IEditorOpenContext, EditorExtensions } from 'vs/workbench/common/editor';
|
||||||
|
import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditoInput';
|
||||||
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
|
import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
|
||||||
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
|
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
|
||||||
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
|
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
|
||||||
|
|
|
@ -10,7 +10,8 @@ import { Event } from 'vs/base/common/event';
|
||||||
import { isObject, assertIsDefined, withNullAsUndefined, isFunction } from 'vs/base/common/types';
|
import { isObject, assertIsDefined, withNullAsUndefined, isFunction } from 'vs/base/common/types';
|
||||||
import { Dimension } from 'vs/base/browser/dom';
|
import { Dimension } from 'vs/base/browser/dom';
|
||||||
import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditorWidget';
|
import { CodeEditorWidget } from 'vs/editor/browser/widget/codeEditorWidget';
|
||||||
import { EditorInput, EditorOptions, IEditorMemento, ITextEditorPane, TextEditorOptions, IEditorCloseEvent, IEditorInput, IEditorOpenContext, EditorResourceAccessor, SideBySideEditor, EditorInputCapabilities } from 'vs/workbench/common/editor';
|
import { EditorOptions, IEditorMemento, ITextEditorPane, TextEditorOptions, IEditorCloseEvent, IEditorInput, IEditorOpenContext, EditorResourceAccessor, SideBySideEditor, EditorInputCapabilities } from 'vs/workbench/common/editor';
|
||||||
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
import { computeEditorAriaLabel } from 'vs/workbench/browser/editor';
|
import { computeEditorAriaLabel } from 'vs/workbench/browser/editor';
|
||||||
import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
|
import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
|
||||||
import { IEditorViewState, IEditor, ScrollType } from 'vs/editor/common/editorCommon';
|
import { IEditorViewState, IEditor, ScrollType } from 'vs/editor/common/editorCommon';
|
||||||
|
|
|
@ -6,7 +6,8 @@
|
||||||
import { localize } from 'vs/nls';
|
import { localize } from 'vs/nls';
|
||||||
import { assertIsDefined, isFunction, withNullAsUndefined } from 'vs/base/common/types';
|
import { assertIsDefined, isFunction, withNullAsUndefined } from 'vs/base/common/types';
|
||||||
import { ICodeEditor, getCodeEditor, IPasteEvent } from 'vs/editor/browser/editorBrowser';
|
import { ICodeEditor, getCodeEditor, IPasteEvent } from 'vs/editor/browser/editorBrowser';
|
||||||
import { TextEditorOptions, EditorInput, EditorOptions, IEditorOpenContext } from 'vs/workbench/common/editor';
|
import { TextEditorOptions, EditorOptions, IEditorOpenContext } from 'vs/workbench/common/editor';
|
||||||
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
import { AbstractTextResourceEditorInput, TextResourceEditorInput } from 'vs/workbench/common/editor/textResourceEditorInput';
|
import { AbstractTextResourceEditorInput, TextResourceEditorInput } from 'vs/workbench/common/editor/textResourceEditorInput';
|
||||||
import { BaseTextEditorModel } from 'vs/workbench/common/editor/textEditorModel';
|
import { BaseTextEditorModel } from 'vs/workbench/common/editor/textEditorModel';
|
||||||
import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';
|
import { UntitledTextEditorInput } from 'vs/workbench/services/untitled/common/untitledTextEditorInput';
|
||||||
|
|
|
@ -5,7 +5,8 @@
|
||||||
|
|
||||||
import 'vs/css!./media/workspacetrusteditor';
|
import 'vs/css!./media/workspacetrusteditor';
|
||||||
import { localize } from 'vs/nls';
|
import { localize } from 'vs/nls';
|
||||||
import { EditorInput, EditorOptions, IEditorOpenContext } from 'vs/workbench/common/editor';
|
import { EditorOptions, IEditorOpenContext } from 'vs/workbench/common/editor';
|
||||||
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
|
import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
|
||||||
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
|
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
|
||||||
import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
|
import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
|
||||||
|
|
|
@ -4,10 +4,10 @@
|
||||||
*--------------------------------------------------------------------------------------------*/
|
*--------------------------------------------------------------------------------------------*/
|
||||||
|
|
||||||
import { localize } from 'vs/nls';
|
import { localize } from 'vs/nls';
|
||||||
import { Event, Emitter } from 'vs/base/common/event';
|
import { Event } from 'vs/base/common/event';
|
||||||
import { withNullAsUndefined, assertIsDefined, isUndefinedOrNull } from 'vs/base/common/types';
|
import { withNullAsUndefined, assertIsDefined, isUndefinedOrNull } from 'vs/base/common/types';
|
||||||
import { URI } from 'vs/base/common/uri';
|
import { URI } from 'vs/base/common/uri';
|
||||||
import { IDisposable, Disposable, toDisposable } from 'vs/base/common/lifecycle';
|
import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
|
||||||
import { IEditor, IEditorViewState, ScrollType, IDiffEditor } from 'vs/editor/common/editorCommon';
|
import { IEditor, IEditorViewState, ScrollType, IDiffEditor } from 'vs/editor/common/editorCommon';
|
||||||
import { IEditorModel, IEditorOptions, ITextEditorOptions, IBaseResourceEditorInput, IResourceEditorInput, EditorActivation, EditorOpenContext, ITextEditorSelection, TextEditorSelectionRevealType, EditorOverride } from 'vs/platform/editor/common/editor';
|
import { IEditorModel, IEditorOptions, ITextEditorOptions, IBaseResourceEditorInput, IResourceEditorInput, EditorActivation, EditorOpenContext, ITextEditorSelection, TextEditorSelectionRevealType, EditorOverride } from 'vs/platform/editor/common/editor';
|
||||||
import { IInstantiationService, IConstructorSignature0, ServicesAccessor, BrandedService } from 'vs/platform/instantiation/common/instantiation';
|
import { IInstantiationService, IConstructorSignature0, ServicesAccessor, BrandedService } from 'vs/platform/instantiation/common/instantiation';
|
||||||
|
@ -19,10 +19,12 @@ import { ICompositeControl, IComposite } from 'vs/workbench/common/composite';
|
||||||
import { ActionRunner, IAction } from 'vs/base/common/actions';
|
import { ActionRunner, IAction } from 'vs/base/common/actions';
|
||||||
import { IFileService } from 'vs/platform/files/common/files';
|
import { IFileService } from 'vs/platform/files/common/files';
|
||||||
import { IPathData } from 'vs/platform/windows/common/windows';
|
import { IPathData } from 'vs/platform/windows/common/windows';
|
||||||
import { coalesce, firstOrDefault } from 'vs/base/common/arrays';
|
import { coalesce } from 'vs/base/common/arrays';
|
||||||
import { ACTIVE_GROUP, IResourceEditorInputType, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
|
import { ACTIVE_GROUP, IResourceEditorInputType, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
|
||||||
import { IRange } from 'vs/editor/common/core/range';
|
import { IRange } from 'vs/editor/common/core/range';
|
||||||
import { IExtUri } from 'vs/base/common/resources';
|
import { IExtUri } from 'vs/base/common/resources';
|
||||||
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
|
import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditoInput';
|
||||||
|
|
||||||
// Static values for editor contributions
|
// Static values for editor contributions
|
||||||
export const EditorExtensions = {
|
export const EditorExtensions = {
|
||||||
|
@ -571,132 +573,6 @@ export interface IEditorInput extends IDisposable {
|
||||||
isDisposed(): boolean;
|
isDisposed(): boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Editor inputs are lightweight objects that can be passed to the workbench API to open inside the editor part.
|
|
||||||
* Each editor input is mapped to an editor that is capable of opening it through the Platform facade.
|
|
||||||
*/
|
|
||||||
export abstract class EditorInput extends Disposable implements IEditorInput {
|
|
||||||
|
|
||||||
protected readonly _onDidChangeDirty = this._register(new Emitter<void>());
|
|
||||||
readonly onDidChangeDirty = this._onDidChangeDirty.event;
|
|
||||||
|
|
||||||
protected readonly _onDidChangeLabel = this._register(new Emitter<void>());
|
|
||||||
readonly onDidChangeLabel = this._onDidChangeLabel.event;
|
|
||||||
|
|
||||||
private readonly _onWillDispose = this._register(new Emitter<void>());
|
|
||||||
readonly onWillDispose = this._onWillDispose.event;
|
|
||||||
|
|
||||||
private disposed: boolean = false;
|
|
||||||
|
|
||||||
abstract get typeId(): string;
|
|
||||||
|
|
||||||
abstract get resource(): URI | undefined;
|
|
||||||
|
|
||||||
get capabilities(): EditorInputCapabilities {
|
|
||||||
return EditorInputCapabilities.Readonly;
|
|
||||||
}
|
|
||||||
|
|
||||||
hasCapability(capability: EditorInputCapabilities): boolean {
|
|
||||||
if (capability === EditorInputCapabilities.None) {
|
|
||||||
return this.capabilities === EditorInputCapabilities.None;
|
|
||||||
}
|
|
||||||
|
|
||||||
return (this.capabilities & capability) !== 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
getName(): string {
|
|
||||||
return `Editor ${this.typeId}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
getDescription(verbosity?: Verbosity): string | undefined {
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
|
|
||||||
getTitle(verbosity?: Verbosity): string {
|
|
||||||
return this.getName();
|
|
||||||
}
|
|
||||||
|
|
||||||
getAriaLabel(): string {
|
|
||||||
return this.getTitle(Verbosity.SHORT);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns a descriptor suitable for telemetry events.
|
|
||||||
*
|
|
||||||
* Subclasses should extend if they can contribute.
|
|
||||||
*/
|
|
||||||
getTelemetryDescriptor(): { [key: string]: unknown } {
|
|
||||||
/* __GDPR__FRAGMENT__
|
|
||||||
"EditorTelemetryDescriptor" : {
|
|
||||||
"typeId" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
return { typeId: this.typeId };
|
|
||||||
}
|
|
||||||
|
|
||||||
isDirty(): boolean {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
isSaving(): boolean {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
async resolve(): Promise<IEditorModel | null> {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
async save(group: GroupIdentifier, options?: ISaveOptions): Promise<IEditorInput | undefined> {
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
async saveAs(group: GroupIdentifier, options?: ISaveOptions): Promise<IEditorInput | undefined> {
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
async revert(group: GroupIdentifier, options?: IRevertOptions): Promise<void> { }
|
|
||||||
|
|
||||||
rename(group: GroupIdentifier, target: URI): IMoveResult | undefined {
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
|
|
||||||
copy(): IEditorInput {
|
|
||||||
return this;
|
|
||||||
}
|
|
||||||
|
|
||||||
matches(otherInput: unknown): boolean {
|
|
||||||
return this === otherInput;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* If a input was registered onto multiple editors, this method
|
|
||||||
* will be asked to return the preferred one to use.
|
|
||||||
*
|
|
||||||
* @param editors a list of editor descriptors that are candidates
|
|
||||||
* for the editor input to open in.
|
|
||||||
*/
|
|
||||||
prefersEditor<T extends IEditorDescriptor<IEditorPane>>(editors: T[]): T | undefined {
|
|
||||||
return firstOrDefault(editors);
|
|
||||||
}
|
|
||||||
|
|
||||||
asResourceEditorInput(groupId: GroupIdentifier): IResourceEditorInput | undefined {
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
|
|
||||||
isDisposed(): boolean {
|
|
||||||
return this.disposed;
|
|
||||||
}
|
|
||||||
|
|
||||||
override dispose(): void {
|
|
||||||
if (!this.disposed) {
|
|
||||||
this.disposed = true;
|
|
||||||
this._onWillDispose.fire();
|
|
||||||
}
|
|
||||||
|
|
||||||
super.dispose();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface IEditorInputWithPreferredResource {
|
export interface IEditorInputWithPreferredResource {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -783,176 +659,6 @@ export interface IFileEditorInput extends IEditorInput, IEncodingSupport, IModeS
|
||||||
isResolved(): boolean;
|
isResolved(): boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Side by side editor inputs that have a primary and secondary side.
|
|
||||||
*/
|
|
||||||
export class SideBySideEditorInput extends EditorInput {
|
|
||||||
|
|
||||||
static readonly ID: string = 'workbench.editorinputs.sidebysideEditorInput';
|
|
||||||
|
|
||||||
override get typeId(): string {
|
|
||||||
return SideBySideEditorInput.ID;
|
|
||||||
}
|
|
||||||
|
|
||||||
override get capabilities(): EditorInputCapabilities {
|
|
||||||
|
|
||||||
// Use primary capabilities as main capabilities
|
|
||||||
let capabilities = this._primary.capabilities;
|
|
||||||
|
|
||||||
// Trust: should be considered for both sides
|
|
||||||
if (this._secondary.hasCapability(EditorInputCapabilities.RequiresTrust)) {
|
|
||||||
capabilities |= EditorInputCapabilities.RequiresTrust;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Singleton: should be considered for both sides
|
|
||||||
if (this._secondary.hasCapability(EditorInputCapabilities.Singleton)) {
|
|
||||||
capabilities |= EditorInputCapabilities.Singleton;
|
|
||||||
}
|
|
||||||
|
|
||||||
return capabilities;
|
|
||||||
}
|
|
||||||
|
|
||||||
get resource(): URI | undefined {
|
|
||||||
return undefined; // use `EditorResourceAccessor` to obtain one side's resource
|
|
||||||
}
|
|
||||||
|
|
||||||
get primary(): EditorInput {
|
|
||||||
return this._primary;
|
|
||||||
}
|
|
||||||
|
|
||||||
get secondary(): EditorInput {
|
|
||||||
return this._secondary;
|
|
||||||
}
|
|
||||||
|
|
||||||
constructor(
|
|
||||||
protected readonly name: string | undefined,
|
|
||||||
protected readonly description: string | undefined,
|
|
||||||
private readonly _secondary: EditorInput,
|
|
||||||
private readonly _primary: EditorInput
|
|
||||||
) {
|
|
||||||
super();
|
|
||||||
|
|
||||||
this.registerListeners();
|
|
||||||
}
|
|
||||||
|
|
||||||
private registerListeners(): void {
|
|
||||||
|
|
||||||
// When the primary or secondary input gets disposed, dispose this diff editor input
|
|
||||||
const onceSecondaryDisposed = Event.once(this.secondary.onWillDispose);
|
|
||||||
this._register(onceSecondaryDisposed(() => {
|
|
||||||
if (!this.isDisposed()) {
|
|
||||||
this.dispose();
|
|
||||||
}
|
|
||||||
}));
|
|
||||||
|
|
||||||
const oncePrimaryDisposed = Event.once(this.primary.onWillDispose);
|
|
||||||
this._register(oncePrimaryDisposed(() => {
|
|
||||||
if (!this.isDisposed()) {
|
|
||||||
this.dispose();
|
|
||||||
}
|
|
||||||
}));
|
|
||||||
|
|
||||||
// Reemit some events from the primary side to the outside
|
|
||||||
this._register(this.primary.onDidChangeDirty(() => this._onDidChangeDirty.fire()));
|
|
||||||
this._register(this.primary.onDidChangeLabel(() => this._onDidChangeLabel.fire()));
|
|
||||||
}
|
|
||||||
|
|
||||||
override getName(): string {
|
|
||||||
if (!this.name) {
|
|
||||||
return localize('sideBySideLabels', "{0} - {1}", this._secondary.getName(), this._primary.getName());
|
|
||||||
}
|
|
||||||
|
|
||||||
return this.name;
|
|
||||||
}
|
|
||||||
|
|
||||||
override getDescription(): string | undefined {
|
|
||||||
return this.description;
|
|
||||||
}
|
|
||||||
|
|
||||||
override getTelemetryDescriptor(): { [key: string]: unknown } {
|
|
||||||
const descriptor = this.primary.getTelemetryDescriptor();
|
|
||||||
|
|
||||||
return Object.assign(descriptor, super.getTelemetryDescriptor());
|
|
||||||
}
|
|
||||||
|
|
||||||
override isDirty(): boolean {
|
|
||||||
return this.primary.isDirty();
|
|
||||||
}
|
|
||||||
|
|
||||||
override isSaving(): boolean {
|
|
||||||
return this.primary.isSaving();
|
|
||||||
}
|
|
||||||
|
|
||||||
override save(group: GroupIdentifier, options?: ISaveOptions): Promise<IEditorInput | undefined> {
|
|
||||||
return this.primary.save(group, options);
|
|
||||||
}
|
|
||||||
|
|
||||||
override saveAs(group: GroupIdentifier, options?: ISaveOptions): Promise<IEditorInput | undefined> {
|
|
||||||
return this.primary.saveAs(group, options);
|
|
||||||
}
|
|
||||||
|
|
||||||
override revert(group: GroupIdentifier, options?: IRevertOptions): Promise<void> {
|
|
||||||
return this.primary.revert(group, options);
|
|
||||||
}
|
|
||||||
|
|
||||||
override matches(otherInput: unknown): boolean {
|
|
||||||
if (otherInput === this) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (otherInput instanceof SideBySideEditorInput) {
|
|
||||||
return this.primary.matches(otherInput.primary) && this.secondary.matches(otherInput.secondary);
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The editor model is the heavyweight counterpart of editor input. Depending on the editor input, it
|
|
||||||
* resolves from a file system retrieve content and may allow for saving it back or reverting it.
|
|
||||||
* Editor models are typically cached for some while because they are expensive to construct.
|
|
||||||
*/
|
|
||||||
export class EditorModel extends Disposable implements IEditorModel {
|
|
||||||
|
|
||||||
private readonly _onWillDispose = this._register(new Emitter<void>());
|
|
||||||
readonly onWillDispose = this._onWillDispose.event;
|
|
||||||
|
|
||||||
private disposed = false;
|
|
||||||
private resolved = false;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Causes this model to resolve returning a promise when loading is completed.
|
|
||||||
*/
|
|
||||||
async resolve(): Promise<void> {
|
|
||||||
this.resolved = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Returns whether this model was loaded or not.
|
|
||||||
*/
|
|
||||||
isResolved(): boolean {
|
|
||||||
return this.resolved;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Find out if this model has been disposed.
|
|
||||||
*/
|
|
||||||
isDisposed(): boolean {
|
|
||||||
return this.disposed;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Subclasses should implement to free resources that have been claimed through loading.
|
|
||||||
*/
|
|
||||||
override dispose(): void {
|
|
||||||
this.disposed = true;
|
|
||||||
this._onWillDispose.fire();
|
|
||||||
|
|
||||||
super.dispose();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface IEditorInputWithOptions {
|
export interface IEditorInputWithOptions {
|
||||||
editor: IEditorInput;
|
editor: IEditorInput;
|
||||||
options?: IEditorOptions | ITextEditorOptions;
|
options?: IEditorOptions | ITextEditorOptions;
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
* Licensed under the MIT License. See License.txt in the project root for license information.
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
||||||
*--------------------------------------------------------------------------------------------*/
|
*--------------------------------------------------------------------------------------------*/
|
||||||
|
|
||||||
import { EditorModel } from 'vs/workbench/common/editor';
|
import { EditorModel } from 'vs/workbench/common/editor/editorModel';
|
||||||
import { URI } from 'vs/base/common/uri';
|
import { URI } from 'vs/base/common/uri';
|
||||||
import { IFileService } from 'vs/platform/files/common/files';
|
import { IFileService } from 'vs/platform/files/common/files';
|
||||||
import { MIME_BINARY } from 'vs/base/common/mime';
|
import { MIME_BINARY } from 'vs/base/common/mime';
|
||||||
|
|
|
@ -3,7 +3,10 @@
|
||||||
* Licensed under the MIT License. See License.txt in the project root for license information.
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
||||||
*--------------------------------------------------------------------------------------------*/
|
*--------------------------------------------------------------------------------------------*/
|
||||||
|
|
||||||
import { EditorModel, EditorInput, SideBySideEditorInput, TEXT_DIFF_EDITOR_ID, BINARY_DIFF_EDITOR_ID, Verbosity, IEditorDescriptor, IEditorPane } from 'vs/workbench/common/editor';
|
import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditoInput';
|
||||||
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
|
import { EditorModel } from 'vs/workbench/common/editor/editorModel';
|
||||||
|
import { TEXT_DIFF_EDITOR_ID, BINARY_DIFF_EDITOR_ID, Verbosity, IEditorDescriptor, IEditorPane } from 'vs/workbench/common/editor';
|
||||||
import { BaseTextEditorModel } from 'vs/workbench/common/editor/textEditorModel';
|
import { BaseTextEditorModel } from 'vs/workbench/common/editor/textEditorModel';
|
||||||
import { DiffEditorModel } from 'vs/workbench/common/editor/diffEditorModel';
|
import { DiffEditorModel } from 'vs/workbench/common/editor/diffEditorModel';
|
||||||
import { TextDiffEditorModel } from 'vs/workbench/common/editor/textDiffEditorModel';
|
import { TextDiffEditorModel } from 'vs/workbench/common/editor/textDiffEditorModel';
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
* Licensed under the MIT License. See License.txt in the project root for license information.
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
||||||
*--------------------------------------------------------------------------------------------*/
|
*--------------------------------------------------------------------------------------------*/
|
||||||
|
|
||||||
import { EditorModel } from 'vs/workbench/common/editor';
|
import { EditorModel } from 'vs/workbench/common/editor/editorModel';
|
||||||
import { IEditorModel } from 'vs/platform/editor/common/editor';
|
import { IEditorModel } from 'vs/platform/editor/common/editor';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -4,7 +4,9 @@
|
||||||
*--------------------------------------------------------------------------------------------*/
|
*--------------------------------------------------------------------------------------------*/
|
||||||
|
|
||||||
import { Event, Emitter } from 'vs/base/common/event';
|
import { Event, Emitter } from 'vs/base/common/event';
|
||||||
import { IEditorInputFactoryRegistry, EditorInput, IEditorIdentifier, IEditorCloseEvent, GroupIdentifier, SideBySideEditorInput, IEditorInput, EditorsOrder, EditorExtensions } from 'vs/workbench/common/editor';
|
import { IEditorInputFactoryRegistry, IEditorIdentifier, IEditorCloseEvent, GroupIdentifier, IEditorInput, EditorsOrder, EditorExtensions } from 'vs/workbench/common/editor';
|
||||||
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
|
import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditoInput';
|
||||||
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
|
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
|
||||||
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
|
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
|
||||||
import { dispose, Disposable, DisposableStore } from 'vs/base/common/lifecycle';
|
import { dispose, Disposable, DisposableStore } from 'vs/base/common/lifecycle';
|
||||||
|
|
137
src/vs/workbench/common/editor/editorInput.ts
Normal file
137
src/vs/workbench/common/editor/editorInput.ts
Normal file
|
@ -0,0 +1,137 @@
|
||||||
|
/*---------------------------------------------------------------------------------------------
|
||||||
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
||||||
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
||||||
|
*--------------------------------------------------------------------------------------------*/
|
||||||
|
|
||||||
|
import { Emitter } from 'vs/base/common/event';
|
||||||
|
import { URI } from 'vs/base/common/uri';
|
||||||
|
import { Disposable } from 'vs/base/common/lifecycle';
|
||||||
|
import { IEditorModel, IResourceEditorInput } from 'vs/platform/editor/common/editor';
|
||||||
|
import { firstOrDefault } from 'vs/base/common/arrays';
|
||||||
|
import { IEditorInput, EditorInputCapabilities, Verbosity, GroupIdentifier, ISaveOptions, IRevertOptions, IMoveResult, IEditorDescriptor, IEditorPane } from 'vs/workbench/common/editor';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Editor inputs are lightweight objects that can be passed to the workbench API to open inside the editor part.
|
||||||
|
* Each editor input is mapped to an editor that is capable of opening it through the Platform facade.
|
||||||
|
*/
|
||||||
|
export abstract class EditorInput extends Disposable implements IEditorInput {
|
||||||
|
|
||||||
|
protected readonly _onDidChangeDirty = this._register(new Emitter<void>());
|
||||||
|
readonly onDidChangeDirty = this._onDidChangeDirty.event;
|
||||||
|
|
||||||
|
protected readonly _onDidChangeLabel = this._register(new Emitter<void>());
|
||||||
|
readonly onDidChangeLabel = this._onDidChangeLabel.event;
|
||||||
|
|
||||||
|
private readonly _onWillDispose = this._register(new Emitter<void>());
|
||||||
|
readonly onWillDispose = this._onWillDispose.event;
|
||||||
|
|
||||||
|
private disposed: boolean = false;
|
||||||
|
|
||||||
|
abstract get typeId(): string;
|
||||||
|
|
||||||
|
abstract get resource(): URI | undefined;
|
||||||
|
|
||||||
|
get capabilities(): EditorInputCapabilities {
|
||||||
|
return EditorInputCapabilities.Readonly;
|
||||||
|
}
|
||||||
|
|
||||||
|
hasCapability(capability: EditorInputCapabilities): boolean {
|
||||||
|
if (capability === EditorInputCapabilities.None) {
|
||||||
|
return this.capabilities === EditorInputCapabilities.None;
|
||||||
|
}
|
||||||
|
|
||||||
|
return (this.capabilities & capability) !== 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
getName(): string {
|
||||||
|
return `Editor ${this.typeId}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
getDescription(verbosity?: Verbosity): string | undefined {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
getTitle(verbosity?: Verbosity): string {
|
||||||
|
return this.getName();
|
||||||
|
}
|
||||||
|
|
||||||
|
getAriaLabel(): string {
|
||||||
|
return this.getTitle(Verbosity.SHORT);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns a descriptor suitable for telemetry events.
|
||||||
|
*
|
||||||
|
* Subclasses should extend if they can contribute.
|
||||||
|
*/
|
||||||
|
getTelemetryDescriptor(): { [key: string]: unknown } {
|
||||||
|
/* __GDPR__FRAGMENT__
|
||||||
|
"EditorTelemetryDescriptor" : {
|
||||||
|
"typeId" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" }
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
return { typeId: this.typeId };
|
||||||
|
}
|
||||||
|
|
||||||
|
isDirty(): boolean {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
isSaving(): boolean {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
async resolve(): Promise<IEditorModel | null> {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
async save(group: GroupIdentifier, options?: ISaveOptions): Promise<IEditorInput | undefined> {
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
async saveAs(group: GroupIdentifier, options?: ISaveOptions): Promise<IEditorInput | undefined> {
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
async revert(group: GroupIdentifier, options?: IRevertOptions): Promise<void> { }
|
||||||
|
|
||||||
|
rename(group: GroupIdentifier, target: URI): IMoveResult | undefined {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
copy(): IEditorInput {
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
matches(otherInput: unknown): boolean {
|
||||||
|
return this === otherInput;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* If a input was registered onto multiple editors, this method
|
||||||
|
* will be asked to return the preferred one to use.
|
||||||
|
*
|
||||||
|
* @param editors a list of editor descriptors that are candidates
|
||||||
|
* for the editor input to open in.
|
||||||
|
*/
|
||||||
|
prefersEditor<T extends IEditorDescriptor<IEditorPane>>(editors: T[]): T | undefined {
|
||||||
|
return firstOrDefault(editors);
|
||||||
|
}
|
||||||
|
|
||||||
|
asResourceEditorInput(groupId: GroupIdentifier): IResourceEditorInput | undefined {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
|
||||||
|
isDisposed(): boolean {
|
||||||
|
return this.disposed;
|
||||||
|
}
|
||||||
|
|
||||||
|
override dispose(): void {
|
||||||
|
if (!this.disposed) {
|
||||||
|
this.disposed = true;
|
||||||
|
this._onWillDispose.fire();
|
||||||
|
}
|
||||||
|
|
||||||
|
super.dispose();
|
||||||
|
}
|
||||||
|
}
|
53
src/vs/workbench/common/editor/editorModel.ts
Normal file
53
src/vs/workbench/common/editor/editorModel.ts
Normal file
|
@ -0,0 +1,53 @@
|
||||||
|
/*---------------------------------------------------------------------------------------------
|
||||||
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
||||||
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
||||||
|
*--------------------------------------------------------------------------------------------*/
|
||||||
|
|
||||||
|
import { Emitter } from 'vs/base/common/event';
|
||||||
|
import { Disposable } from 'vs/base/common/lifecycle';
|
||||||
|
import { IEditorModel } from 'vs/platform/editor/common/editor';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The editor model is the heavyweight counterpart of editor input. Depending on the editor input, it
|
||||||
|
* resolves from a file system retrieve content and may allow for saving it back or reverting it.
|
||||||
|
* Editor models are typically cached for some while because they are expensive to construct.
|
||||||
|
*/
|
||||||
|
export class EditorModel extends Disposable implements IEditorModel {
|
||||||
|
|
||||||
|
private readonly _onWillDispose = this._register(new Emitter<void>());
|
||||||
|
readonly onWillDispose = this._onWillDispose.event;
|
||||||
|
|
||||||
|
private disposed = false;
|
||||||
|
private resolved = false;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Causes this model to resolve returning a promise when loading is completed.
|
||||||
|
*/
|
||||||
|
async resolve(): Promise<void> {
|
||||||
|
this.resolved = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Returns whether this model was loaded or not.
|
||||||
|
*/
|
||||||
|
isResolved(): boolean {
|
||||||
|
return this.resolved;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Find out if this model has been disposed.
|
||||||
|
*/
|
||||||
|
isDisposed(): boolean {
|
||||||
|
return this.disposed;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Subclasses should implement to free resources that have been claimed through loading.
|
||||||
|
*/
|
||||||
|
override dispose(): void {
|
||||||
|
this.disposed = true;
|
||||||
|
this._onWillDispose.fire();
|
||||||
|
|
||||||
|
super.dispose();
|
||||||
|
}
|
||||||
|
}
|
|
@ -4,7 +4,8 @@
|
||||||
*--------------------------------------------------------------------------------------------*/
|
*--------------------------------------------------------------------------------------------*/
|
||||||
|
|
||||||
import { localize } from 'vs/nls';
|
import { localize } from 'vs/nls';
|
||||||
import { EditorInput, Verbosity, IEditorInputWithPreferredResource, EditorInputCapabilities } from 'vs/workbench/common/editor';
|
import { Verbosity, IEditorInputWithPreferredResource, EditorInputCapabilities } from 'vs/workbench/common/editor';
|
||||||
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
import { URI } from 'vs/base/common/uri';
|
import { URI } from 'vs/base/common/uri';
|
||||||
import { IFileService, FileSystemProviderCapabilities } from 'vs/platform/files/common/files';
|
import { IFileService, FileSystemProviderCapabilities } from 'vs/platform/files/common/files';
|
||||||
import { ILabelService } from 'vs/platform/label/common/label';
|
import { ILabelService } from 'vs/platform/label/common/label';
|
||||||
|
|
135
src/vs/workbench/common/editor/sideBySideEditoInput.ts
Normal file
135
src/vs/workbench/common/editor/sideBySideEditoInput.ts
Normal file
|
@ -0,0 +1,135 @@
|
||||||
|
/*---------------------------------------------------------------------------------------------
|
||||||
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
||||||
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
||||||
|
*--------------------------------------------------------------------------------------------*/
|
||||||
|
|
||||||
|
import { Event } from 'vs/base/common/event';
|
||||||
|
import { URI } from 'vs/base/common/uri';
|
||||||
|
import { localize } from 'vs/nls';
|
||||||
|
import { IEditorInput, EditorInputCapabilities, GroupIdentifier, ISaveOptions, IRevertOptions } from 'vs/workbench/common/editor';
|
||||||
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Side by side editor inputs that have a primary and secondary side.
|
||||||
|
*/
|
||||||
|
export class SideBySideEditorInput extends EditorInput {
|
||||||
|
|
||||||
|
static readonly ID: string = 'workbench.editorinputs.sidebysideEditorInput';
|
||||||
|
|
||||||
|
override get typeId(): string {
|
||||||
|
return SideBySideEditorInput.ID;
|
||||||
|
}
|
||||||
|
|
||||||
|
override get capabilities(): EditorInputCapabilities {
|
||||||
|
|
||||||
|
// Use primary capabilities as main capabilities
|
||||||
|
let capabilities = this._primary.capabilities;
|
||||||
|
|
||||||
|
// Trust: should be considered for both sides
|
||||||
|
if (this._secondary.hasCapability(EditorInputCapabilities.RequiresTrust)) {
|
||||||
|
capabilities |= EditorInputCapabilities.RequiresTrust;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Singleton: should be considered for both sides
|
||||||
|
if (this._secondary.hasCapability(EditorInputCapabilities.Singleton)) {
|
||||||
|
capabilities |= EditorInputCapabilities.Singleton;
|
||||||
|
}
|
||||||
|
|
||||||
|
return capabilities;
|
||||||
|
}
|
||||||
|
|
||||||
|
get resource(): URI | undefined {
|
||||||
|
return undefined; // use `EditorResourceAccessor` to obtain one side's resource
|
||||||
|
}
|
||||||
|
|
||||||
|
get primary(): EditorInput {
|
||||||
|
return this._primary;
|
||||||
|
}
|
||||||
|
|
||||||
|
get secondary(): EditorInput {
|
||||||
|
return this._secondary;
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
protected readonly name: string | undefined,
|
||||||
|
protected readonly description: string | undefined,
|
||||||
|
private readonly _secondary: EditorInput,
|
||||||
|
private readonly _primary: EditorInput
|
||||||
|
) {
|
||||||
|
super();
|
||||||
|
|
||||||
|
this.registerListeners();
|
||||||
|
}
|
||||||
|
|
||||||
|
private registerListeners(): void {
|
||||||
|
|
||||||
|
// When the primary or secondary input gets disposed, dispose this diff editor input
|
||||||
|
const onceSecondaryDisposed = Event.once(this.secondary.onWillDispose);
|
||||||
|
this._register(onceSecondaryDisposed(() => {
|
||||||
|
if (!this.isDisposed()) {
|
||||||
|
this.dispose();
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
|
||||||
|
const oncePrimaryDisposed = Event.once(this.primary.onWillDispose);
|
||||||
|
this._register(oncePrimaryDisposed(() => {
|
||||||
|
if (!this.isDisposed()) {
|
||||||
|
this.dispose();
|
||||||
|
}
|
||||||
|
}));
|
||||||
|
|
||||||
|
// Reemit some events from the primary side to the outside
|
||||||
|
this._register(this.primary.onDidChangeDirty(() => this._onDidChangeDirty.fire()));
|
||||||
|
this._register(this.primary.onDidChangeLabel(() => this._onDidChangeLabel.fire()));
|
||||||
|
}
|
||||||
|
|
||||||
|
override getName(): string {
|
||||||
|
if (!this.name) {
|
||||||
|
return localize('sideBySideLabels', "{0} - {1}", this._secondary.getName(), this._primary.getName());
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.name;
|
||||||
|
}
|
||||||
|
|
||||||
|
override getDescription(): string | undefined {
|
||||||
|
return this.description;
|
||||||
|
}
|
||||||
|
|
||||||
|
override getTelemetryDescriptor(): { [key: string]: unknown } {
|
||||||
|
const descriptor = this.primary.getTelemetryDescriptor();
|
||||||
|
|
||||||
|
return Object.assign(descriptor, super.getTelemetryDescriptor());
|
||||||
|
}
|
||||||
|
|
||||||
|
override isDirty(): boolean {
|
||||||
|
return this.primary.isDirty();
|
||||||
|
}
|
||||||
|
|
||||||
|
override isSaving(): boolean {
|
||||||
|
return this.primary.isSaving();
|
||||||
|
}
|
||||||
|
|
||||||
|
override save(group: GroupIdentifier, options?: ISaveOptions): Promise<IEditorInput | undefined> {
|
||||||
|
return this.primary.save(group, options);
|
||||||
|
}
|
||||||
|
|
||||||
|
override saveAs(group: GroupIdentifier, options?: ISaveOptions): Promise<IEditorInput | undefined> {
|
||||||
|
return this.primary.saveAs(group, options);
|
||||||
|
}
|
||||||
|
|
||||||
|
override revert(group: GroupIdentifier, options?: IRevertOptions): Promise<void> {
|
||||||
|
return this.primary.revert(group, options);
|
||||||
|
}
|
||||||
|
|
||||||
|
override matches(otherInput: unknown): boolean {
|
||||||
|
if (otherInput === this) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (otherInput instanceof SideBySideEditorInput) {
|
||||||
|
return this.primary.matches(otherInput.primary) && this.secondary.matches(otherInput.secondary);
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
|
@ -4,7 +4,7 @@
|
||||||
*--------------------------------------------------------------------------------------------*/
|
*--------------------------------------------------------------------------------------------*/
|
||||||
|
|
||||||
import { ITextModel, ITextBufferFactory, ITextSnapshot, ModelConstants } from 'vs/editor/common/model';
|
import { ITextModel, ITextBufferFactory, ITextSnapshot, ModelConstants } from 'vs/editor/common/model';
|
||||||
import { EditorModel } from 'vs/workbench/common/editor';
|
import { EditorModel } from 'vs/workbench/common/editor/editorModel';
|
||||||
import { IModeSupport } from 'vs/workbench/services/textfile/common/textfiles';
|
import { IModeSupport } from 'vs/workbench/services/textfile/common/textfiles';
|
||||||
import { URI } from 'vs/base/common/uri';
|
import { URI } from 'vs/base/common/uri';
|
||||||
import { ITextEditorModel, IResolvedTextEditorModel } from 'vs/editor/common/services/resolverService';
|
import { ITextEditorModel, IResolvedTextEditorModel } from 'vs/editor/common/services/resolverService';
|
||||||
|
|
|
@ -16,8 +16,9 @@ import { Registry } from 'vs/platform/registry/common/platform';
|
||||||
import { IStorageService } from 'vs/platform/storage/common/storage';
|
import { IStorageService } from 'vs/platform/storage/common/storage';
|
||||||
import * as colorRegistry from 'vs/platform/theme/common/colorRegistry';
|
import * as colorRegistry from 'vs/platform/theme/common/colorRegistry';
|
||||||
import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
|
import { registerThemingParticipant } from 'vs/platform/theme/common/themeService';
|
||||||
import { EditorInput, EditorExtensions, GroupIdentifier, IEditorInput, IEditorInputFactoryRegistry } from 'vs/workbench/common/editor';
|
import { EditorExtensions, GroupIdentifier, IEditorInput, IEditorInputFactoryRegistry } from 'vs/workbench/common/editor';
|
||||||
import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
|
import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
|
||||||
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
import { CONTEXT_ACTIVE_CUSTOM_EDITOR_ID, CONTEXT_FOCUSED_CUSTOM_EDITOR_IS_EDITABLE, CustomEditorCapabilities, CustomEditorInfo, CustomEditorInfoCollection, ICustomEditorService } from 'vs/workbench/contrib/customEditor/common/customEditor';
|
import { CONTEXT_ACTIVE_CUSTOM_EDITOR_ID, CONTEXT_FOCUSED_CUSTOM_EDITOR_IS_EDITABLE, CustomEditorCapabilities, CustomEditorInfo, CustomEditorInfoCollection, ICustomEditorService } from 'vs/workbench/contrib/customEditor/common/customEditor';
|
||||||
import { CustomEditorModelManager } from 'vs/workbench/contrib/customEditor/common/customEditorModelManager';
|
import { CustomEditorModelManager } from 'vs/workbench/contrib/customEditor/common/customEditorModelManager';
|
||||||
import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
|
import { IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
|
||||||
|
|
|
@ -6,7 +6,8 @@
|
||||||
import { Schemas } from 'vs/base/common/network';
|
import { Schemas } from 'vs/base/common/network';
|
||||||
import { URI } from 'vs/base/common/uri';
|
import { URI } from 'vs/base/common/uri';
|
||||||
import { localize } from 'vs/nls';
|
import { localize } from 'vs/nls';
|
||||||
import { EditorInput, EditorInputCapabilities } from 'vs/workbench/common/editor';
|
import { EditorInputCapabilities } from 'vs/workbench/common/editor';
|
||||||
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
import { IExtension } from 'vs/workbench/contrib/extensions/common/extensions';
|
import { IExtension } from 'vs/workbench/contrib/extensions/common/extensions';
|
||||||
import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
|
import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
|
||||||
import { join } from 'vs/base/common/path';
|
import { join } from 'vs/base/common/path';
|
||||||
|
|
|
@ -5,7 +5,8 @@
|
||||||
|
|
||||||
import * as nls from 'vs/nls';
|
import * as nls from 'vs/nls';
|
||||||
import { URI } from 'vs/base/common/uri';
|
import { URI } from 'vs/base/common/uri';
|
||||||
import { EditorInput, EditorInputCapabilities } from 'vs/workbench/common/editor';
|
import { EditorInputCapabilities } from 'vs/workbench/common/editor';
|
||||||
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
|
|
||||||
export class RuntimeExtensionsInput extends EditorInput {
|
export class RuntimeExtensionsInput extends EditorInput {
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,8 @@ import { EditorDescriptor, IEditorRegistry } from 'vs/workbench/browser/editor';
|
||||||
import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
|
import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle';
|
||||||
import { RuntimeExtensionsEditor, StartExtensionHostProfileAction, StopExtensionHostProfileAction, CONTEXT_PROFILE_SESSION_STATE, CONTEXT_EXTENSION_HOST_PROFILE_RECORDED, SaveExtensionHostProfileAction } from 'vs/workbench/contrib/extensions/electron-sandbox/runtimeExtensionsEditor';
|
import { RuntimeExtensionsEditor, StartExtensionHostProfileAction, StopExtensionHostProfileAction, CONTEXT_PROFILE_SESSION_STATE, CONTEXT_EXTENSION_HOST_PROFILE_RECORDED, SaveExtensionHostProfileAction } from 'vs/workbench/contrib/extensions/electron-sandbox/runtimeExtensionsEditor';
|
||||||
import { DebugExtensionHostAction } from 'vs/workbench/contrib/extensions/electron-sandbox/debugExtensionHostAction';
|
import { DebugExtensionHostAction } from 'vs/workbench/contrib/extensions/electron-sandbox/debugExtensionHostAction';
|
||||||
import { EditorInput, IEditorInputSerializer, IEditorInputFactoryRegistry, ActiveEditorContext, EditorExtensions } from 'vs/workbench/common/editor';
|
import { IEditorInputSerializer, IEditorInputFactoryRegistry, ActiveEditorContext, EditorExtensions } from 'vs/workbench/common/editor';
|
||||||
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
import { RuntimeExtensionsInput } from 'vs/workbench/contrib/extensions/common/runtimeExtensionsInput';
|
import { RuntimeExtensionsInput } from 'vs/workbench/contrib/extensions/common/runtimeExtensionsInput';
|
||||||
import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
|
import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
|
||||||
import { OpenExtensionsFolderAction } from 'vs/workbench/contrib/extensions/electron-sandbox/extensionsActions';
|
import { OpenExtensionsFolderAction } from 'vs/workbench/contrib/extensions/electron-sandbox/extensionsActions';
|
||||||
|
|
|
@ -7,7 +7,8 @@ import { localize } from 'vs/nls';
|
||||||
import { BaseBinaryResourceEditor } from 'vs/workbench/browser/parts/editor/binaryEditor';
|
import { BaseBinaryResourceEditor } from 'vs/workbench/browser/parts/editor/binaryEditor';
|
||||||
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
|
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
|
||||||
import { IThemeService } from 'vs/platform/theme/common/themeService';
|
import { IThemeService } from 'vs/platform/theme/common/themeService';
|
||||||
import { EditorInput, EditorOptions } from 'vs/workbench/common/editor';
|
import { EditorOptions } from 'vs/workbench/common/editor';
|
||||||
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
import { FileEditorInput } from 'vs/workbench/contrib/files/browser/editors/fileEditorInput';
|
import { FileEditorInput } from 'vs/workbench/contrib/files/browser/editors/fileEditorInput';
|
||||||
import { BINARY_FILE_EDITOR_ID } from 'vs/workbench/contrib/files/common/files';
|
import { BINARY_FILE_EDITOR_ID } from 'vs/workbench/contrib/files/common/files';
|
||||||
import { IStorageService } from 'vs/platform/storage/common/storage';
|
import { IStorageService } from 'vs/platform/storage/common/storage';
|
||||||
|
|
|
@ -5,7 +5,8 @@
|
||||||
|
|
||||||
import { Disposable } from 'vs/base/common/lifecycle';
|
import { Disposable } from 'vs/base/common/lifecycle';
|
||||||
import { URI, UriComponents } from 'vs/base/common/uri';
|
import { URI, UriComponents } from 'vs/base/common/uri';
|
||||||
import { EditorInput, IEditorInputSerializer } from 'vs/workbench/common/editor';
|
import { IEditorInputSerializer } from 'vs/workbench/common/editor';
|
||||||
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
|
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
|
||||||
import { isEqual } from 'vs/base/common/resources';
|
import { isEqual } from 'vs/base/common/resources';
|
||||||
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
|
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
|
||||||
|
|
|
@ -5,7 +5,8 @@
|
||||||
|
|
||||||
import * as nls from 'vs/nls';
|
import * as nls from 'vs/nls';
|
||||||
import { URI } from 'vs/base/common/uri';
|
import { URI } from 'vs/base/common/uri';
|
||||||
import { EditorResourceAccessor, IEditorCommandsContext, SideBySideEditor, IEditorIdentifier, SaveReason, SideBySideEditorInput, EditorsOrder, EditorInputCapabilities } from 'vs/workbench/common/editor';
|
import { EditorResourceAccessor, IEditorCommandsContext, SideBySideEditor, IEditorIdentifier, SaveReason, EditorsOrder, EditorInputCapabilities } from 'vs/workbench/common/editor';
|
||||||
|
import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditoInput';
|
||||||
import { IWindowOpenable, IOpenWindowOptions, isWorkspaceToOpen, IOpenEmptyWindowOptions } from 'vs/platform/windows/common/windows';
|
import { IWindowOpenable, IOpenWindowOptions, isWorkspaceToOpen, IOpenEmptyWindowOptions } from 'vs/platform/windows/common/windows';
|
||||||
import { IHostService } from 'vs/workbench/services/host/browser/host';
|
import { IHostService } from 'vs/workbench/services/host/browser/host';
|
||||||
import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
|
import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
|
||||||
|
|
|
@ -8,7 +8,7 @@ import { sep } from 'vs/base/common/path';
|
||||||
import { Registry } from 'vs/platform/registry/common/platform';
|
import { Registry } from 'vs/platform/registry/common/platform';
|
||||||
import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope, IConfigurationPropertySchema } from 'vs/platform/configuration/common/configurationRegistry';
|
import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope, IConfigurationPropertySchema } from 'vs/platform/configuration/common/configurationRegistry';
|
||||||
import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWorkbenchContribution } from 'vs/workbench/common/contributions';
|
import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions, IWorkbenchContribution } from 'vs/workbench/common/contributions';
|
||||||
import { EditorInput, IFileEditorInput, IEditorInputFactoryRegistry, EditorExtensions } from 'vs/workbench/common/editor';
|
import { IFileEditorInput, IEditorInputFactoryRegistry, EditorExtensions } from 'vs/workbench/common/editor';
|
||||||
import { AutoSaveConfiguration, HotExitConfiguration, FILES_EXCLUDE_CONFIG, FILES_ASSOCIATIONS_CONFIG } from 'vs/platform/files/common/files';
|
import { AutoSaveConfiguration, HotExitConfiguration, FILES_EXCLUDE_CONFIG, FILES_ASSOCIATIONS_CONFIG } from 'vs/platform/files/common/files';
|
||||||
import { SortOrder, LexicographicOptions, FILE_EDITOR_INPUT_ID } from 'vs/workbench/contrib/files/common/files';
|
import { SortOrder, LexicographicOptions, FILE_EDITOR_INPUT_ID } from 'vs/workbench/contrib/files/common/files';
|
||||||
import { TextFileEditorTracker } from 'vs/workbench/contrib/files/browser/editors/textFileEditorTracker';
|
import { TextFileEditorTracker } from 'vs/workbench/contrib/files/browser/editors/textFileEditorTracker';
|
||||||
|
@ -61,7 +61,7 @@ Registry.as<IEditorRegistry>(EditorExtensions.Editors).registerEditor(
|
||||||
nls.localize('binaryFileEditor', "Binary File Editor")
|
nls.localize('binaryFileEditor', "Binary File Editor")
|
||||||
),
|
),
|
||||||
[
|
[
|
||||||
new SyncDescriptor<EditorInput>(FileEditorInput)
|
new SyncDescriptor(FileEditorInput)
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
|
@ -3,9 +3,9 @@
|
||||||
* Licensed under the MIT License. See License.txt in the project root for license information.
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
||||||
*--------------------------------------------------------------------------------------------*/
|
*--------------------------------------------------------------------------------------------*/
|
||||||
|
|
||||||
import * as nls from 'vs/nls';
|
import { localize } from 'vs/nls';
|
||||||
import { Registry } from 'vs/platform/registry/common/platform';
|
import { Registry } from 'vs/platform/registry/common/platform';
|
||||||
import { EditorExtensions, EditorInput } from 'vs/workbench/common/editor';
|
import { EditorExtensions } from 'vs/workbench/common/editor';
|
||||||
import { FileEditorInput } from 'vs/workbench/contrib/files/browser/editors/fileEditorInput';
|
import { FileEditorInput } from 'vs/workbench/contrib/files/browser/editors/fileEditorInput';
|
||||||
import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
|
import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
|
||||||
import { IEditorRegistry, EditorDescriptor } from 'vs/workbench/browser/editor';
|
import { IEditorRegistry, EditorDescriptor } from 'vs/workbench/browser/editor';
|
||||||
|
@ -16,9 +16,9 @@ Registry.as<IEditorRegistry>(EditorExtensions.Editors).registerEditor(
|
||||||
EditorDescriptor.create(
|
EditorDescriptor.create(
|
||||||
TextFileEditor,
|
TextFileEditor,
|
||||||
TextFileEditor.ID,
|
TextFileEditor.ID,
|
||||||
nls.localize('textFileEditor', "Text File Editor")
|
localize('textFileEditor', "Text File Editor")
|
||||||
),
|
),
|
||||||
[
|
[
|
||||||
new SyncDescriptor<EditorInput>(FileEditorInput)
|
new SyncDescriptor(FileEditorInput)
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
import * as nls from 'vs/nls';
|
import * as nls from 'vs/nls';
|
||||||
import { Registry } from 'vs/platform/registry/common/platform';
|
import { Registry } from 'vs/platform/registry/common/platform';
|
||||||
import { EditorExtensions, EditorInput } from 'vs/workbench/common/editor';
|
import { EditorExtensions } from 'vs/workbench/common/editor';
|
||||||
import { FileEditorInput } from 'vs/workbench/contrib/files/browser/editors/fileEditorInput';
|
import { FileEditorInput } from 'vs/workbench/contrib/files/browser/editors/fileEditorInput';
|
||||||
import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
|
import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
|
||||||
import { IEditorRegistry, EditorDescriptor } from 'vs/workbench/browser/editor';
|
import { IEditorRegistry, EditorDescriptor } from 'vs/workbench/browser/editor';
|
||||||
|
@ -19,6 +19,6 @@ Registry.as<IEditorRegistry>(EditorExtensions.Editors).registerEditor(
|
||||||
nls.localize('textFileEditor', "Text File Editor")
|
nls.localize('textFileEditor', "Text File Editor")
|
||||||
),
|
),
|
||||||
[
|
[
|
||||||
new SyncDescriptor<EditorInput>(FileEditorInput)
|
new SyncDescriptor(FileEditorInput)
|
||||||
]
|
]
|
||||||
);
|
);
|
||||||
|
|
|
@ -24,7 +24,8 @@ import { LifecyclePhase } from 'vs/workbench/services/lifecycle/common/lifecycle
|
||||||
import { Registry } from 'vs/platform/registry/common/platform';
|
import { Registry } from 'vs/platform/registry/common/platform';
|
||||||
import { EditorDescriptor, IEditorRegistry } from 'vs/workbench/browser/editor';
|
import { EditorDescriptor, IEditorRegistry } from 'vs/workbench/browser/editor';
|
||||||
import { Extensions as WorkbenchExtensions, IWorkbenchContribution, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
|
import { Extensions as WorkbenchExtensions, IWorkbenchContribution, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
|
||||||
import { EditorInput, IEditorInput, IEditorInputSerializer, IEditorInputFactoryRegistry, IEditorInputWithOptions, EditorExtensions } from 'vs/workbench/common/editor';
|
import { IEditorInput, IEditorInputSerializer, IEditorInputFactoryRegistry, IEditorInputWithOptions, EditorExtensions } from 'vs/workbench/common/editor';
|
||||||
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
import { NotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookEditor';
|
import { NotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookEditor';
|
||||||
import { NotebookEditorInput } from 'vs/workbench/contrib/notebook/common/notebookEditorInput';
|
import { NotebookEditorInput } from 'vs/workbench/contrib/notebook/common/notebookEditorInput';
|
||||||
import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
|
import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
|
||||||
|
|
|
@ -4,7 +4,9 @@
|
||||||
*--------------------------------------------------------------------------------------------*/
|
*--------------------------------------------------------------------------------------------*/
|
||||||
|
|
||||||
import * as glob from 'vs/base/common/glob';
|
import * as glob from 'vs/base/common/glob';
|
||||||
import { EditorInput, IEditorInput, GroupIdentifier, ISaveOptions, IMoveResult, IRevertOptions, EditorModel, EditorInputCapabilities } from 'vs/workbench/common/editor';
|
import { IEditorInput, GroupIdentifier, ISaveOptions, IMoveResult, IRevertOptions, EditorInputCapabilities } from 'vs/workbench/common/editor';
|
||||||
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
|
import { EditorModel } from 'vs/workbench/common/editor/editorModel';
|
||||||
import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
|
import { INotebookService } from 'vs/workbench/contrib/notebook/common/notebookService';
|
||||||
import { URI } from 'vs/base/common/uri';
|
import { URI } from 'vs/base/common/uri';
|
||||||
import { isEqual } from 'vs/base/common/resources';
|
import { isEqual } from 'vs/base/common/resources';
|
||||||
|
|
|
@ -4,7 +4,8 @@
|
||||||
*--------------------------------------------------------------------------------------------*/
|
*--------------------------------------------------------------------------------------------*/
|
||||||
|
|
||||||
import * as nls from 'vs/nls';
|
import * as nls from 'vs/nls';
|
||||||
import { EditorModel, IEditorInput, IRevertOptions, ISaveOptions } from 'vs/workbench/common/editor';
|
import { IEditorInput, IRevertOptions, ISaveOptions } from 'vs/workbench/common/editor';
|
||||||
|
import { EditorModel } from 'vs/workbench/common/editor/editorModel';
|
||||||
import { Emitter, Event } from 'vs/base/common/event';
|
import { Emitter, Event } from 'vs/base/common/event';
|
||||||
import { ICellDto2, INotebookEditorModel, INotebookLoadOptions, IResolvedNotebookEditorModel, NotebookCellsChangeType, NotebookDataDto, NotebookDocumentBackupData } from 'vs/workbench/contrib/notebook/common/notebookCommon';
|
import { ICellDto2, INotebookEditorModel, INotebookLoadOptions, IResolvedNotebookEditorModel, NotebookCellsChangeType, NotebookDataDto, NotebookDocumentBackupData } from 'vs/workbench/contrib/notebook/common/notebookCommon';
|
||||||
import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
|
import { NotebookTextModel } from 'vs/workbench/contrib/notebook/common/model/notebookTextModel';
|
||||||
|
|
|
@ -14,7 +14,8 @@ import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
|
||||||
import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
|
import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
|
||||||
import { IListService, ListService } from 'vs/platform/list/browser/listService';
|
import { IListService, ListService } from 'vs/platform/list/browser/listService';
|
||||||
import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
|
import { IUndoRedoService } from 'vs/platform/undoRedo/common/undoRedo';
|
||||||
import { EditorModel, IEditorInput } from 'vs/workbench/common/editor';
|
import { IEditorInput } from 'vs/workbench/common/editor';
|
||||||
|
import { EditorModel } from 'vs/workbench/common/editor/editorModel';
|
||||||
import { ICellViewModel, IActiveNotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
|
import { ICellViewModel, IActiveNotebookEditor } from 'vs/workbench/contrib/notebook/browser/notebookBrowser';
|
||||||
import { NotebookEventDispatcher } from 'vs/workbench/contrib/notebook/browser/viewModel/eventDispatcher';
|
import { NotebookEventDispatcher } from 'vs/workbench/contrib/notebook/browser/viewModel/eventDispatcher';
|
||||||
import { CellViewModel, NotebookViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel';
|
import { CellViewModel, NotebookViewModel } from 'vs/workbench/contrib/notebook/browser/viewModel/notebookViewModel';
|
||||||
|
|
|
@ -26,7 +26,7 @@ import { RemoteNameContext, WorkbenchStateContext } from 'vs/workbench/browser/c
|
||||||
import { EditorDescriptor, IEditorRegistry } from 'vs/workbench/browser/editor';
|
import { EditorDescriptor, IEditorRegistry } from 'vs/workbench/browser/editor';
|
||||||
import { AbstractSideBySideEditorInputSerializer } from 'vs/workbench/browser/parts/editor/editor.contribution';
|
import { AbstractSideBySideEditorInputSerializer } from 'vs/workbench/browser/parts/editor/editor.contribution';
|
||||||
import { Extensions as WorkbenchExtensions, IWorkbenchContribution, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
|
import { Extensions as WorkbenchExtensions, IWorkbenchContribution, IWorkbenchContributionsRegistry } from 'vs/workbench/common/contributions';
|
||||||
import { EditorInput, IEditorInputSerializer, IEditorInputFactoryRegistry, EditorExtensions } from 'vs/workbench/common/editor';
|
import { IEditorInputSerializer, IEditorInputFactoryRegistry, EditorExtensions } from 'vs/workbench/common/editor';
|
||||||
import { ResourceContextKey } from 'vs/workbench/common/resources';
|
import { ResourceContextKey } from 'vs/workbench/common/resources';
|
||||||
import { ExplorerFolderContext, ExplorerRootContext } from 'vs/workbench/contrib/files/common/files';
|
import { ExplorerFolderContext, ExplorerRootContext } from 'vs/workbench/contrib/files/common/files';
|
||||||
import { KeybindingsEditor } from 'vs/workbench/contrib/preferences/browser/keybindingsEditor';
|
import { KeybindingsEditor } from 'vs/workbench/contrib/preferences/browser/keybindingsEditor';
|
||||||
|
@ -42,6 +42,7 @@ import { IPreferencesService } from 'vs/workbench/services/preferences/common/pr
|
||||||
import { DefaultPreferencesEditorInput, PreferencesEditorInput, SettingsEditor2Input } from 'vs/workbench/services/preferences/common/preferencesEditorInput';
|
import { DefaultPreferencesEditorInput, PreferencesEditorInput, SettingsEditor2Input } from 'vs/workbench/services/preferences/common/preferencesEditorInput';
|
||||||
import { preferencesOpenSettingsIcon } from 'vs/workbench/contrib/preferences/browser/preferencesIcons';
|
import { preferencesOpenSettingsIcon } from 'vs/workbench/contrib/preferences/browser/preferencesIcons';
|
||||||
import { KeybindingsEditorInput } from 'vs/workbench/services/preferences/browser/keybindingsEditorInput';
|
import { KeybindingsEditorInput } from 'vs/workbench/services/preferences/browser/keybindingsEditorInput';
|
||||||
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
|
|
||||||
const SETTINGS_EDITOR_COMMAND_SEARCH = 'settings.action.search';
|
const SETTINGS_EDITOR_COMMAND_SEARCH = 'settings.action.search';
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,8 @@ import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace
|
||||||
import { IEditorRegistry } from 'vs/workbench/browser/editor';
|
import { IEditorRegistry } from 'vs/workbench/browser/editor';
|
||||||
import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
|
import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
|
||||||
import { BaseTextEditor } from 'vs/workbench/browser/parts/editor/textEditor';
|
import { BaseTextEditor } from 'vs/workbench/browser/parts/editor/textEditor';
|
||||||
import { EditorExtensions, EditorInput, EditorOptions, IEditorControl, IEditorOpenContext } from 'vs/workbench/common/editor';
|
import { EditorExtensions, EditorOptions, IEditorControl, IEditorOpenContext } from 'vs/workbench/common/editor';
|
||||||
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
import { TextResourceEditorModel } from 'vs/workbench/common/editor/textResourceEditorModel';
|
import { TextResourceEditorModel } from 'vs/workbench/common/editor/textResourceEditorModel';
|
||||||
import { DefaultSettingsRenderer, FolderSettingsRenderer, IPreferencesRenderer, UserSettingsRenderer, WorkspaceSettingsRenderer } from 'vs/workbench/contrib/preferences/browser/preferencesRenderers';
|
import { DefaultSettingsRenderer, FolderSettingsRenderer, IPreferencesRenderer, UserSettingsRenderer, WorkspaceSettingsRenderer } from 'vs/workbench/contrib/preferences/browser/preferencesRenderers';
|
||||||
import { SearchWidget, SettingsTarget, SettingsTargetsWidget } from 'vs/workbench/contrib/preferences/browser/preferencesWidgets';
|
import { SearchWidget, SettingsTarget, SettingsTargetsWidget } from 'vs/workbench/contrib/preferences/browser/preferencesWidgets';
|
||||||
|
|
|
@ -27,7 +27,7 @@ import { IModeService } from 'vs/editor/common/services/modeService';
|
||||||
import { localize } from 'vs/nls';
|
import { localize } from 'vs/nls';
|
||||||
import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
|
import { IWorkingCopyService } from 'vs/workbench/services/workingCopy/common/workingCopyService';
|
||||||
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
|
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
|
||||||
import { IWorkbenchEditorConfiguration, IEditorInput, EditorInput, EditorResourceAccessor } from 'vs/workbench/common/editor';
|
import { IWorkbenchEditorConfiguration, IEditorInput, EditorResourceAccessor } from 'vs/workbench/common/editor';
|
||||||
import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService';
|
import { IEditorService, SIDE_GROUP, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService';
|
||||||
import { Range, IRange } from 'vs/editor/common/core/range';
|
import { Range, IRange } from 'vs/editor/common/core/range';
|
||||||
import { ThrottledDelayer } from 'vs/base/common/async';
|
import { ThrottledDelayer } from 'vs/base/common/async';
|
||||||
|
@ -51,6 +51,7 @@ import { withNullAsUndefined } from 'vs/base/common/types';
|
||||||
import { Codicon } from 'vs/base/common/codicons';
|
import { Codicon } from 'vs/base/common/codicons';
|
||||||
import { IUriIdentityService } from 'vs/workbench/services/uriIdentity/common/uriIdentity';
|
import { IUriIdentityService } from 'vs/workbench/services/uriIdentity/common/uriIdentity';
|
||||||
import { stripIcons } from 'vs/base/common/iconLabels';
|
import { stripIcons } from 'vs/base/common/iconLabels';
|
||||||
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
|
|
||||||
interface IAnythingQuickPickItem extends IPickerQuickAccessItem, IQuickPickItemWithResource { }
|
interface IAnythingQuickPickItem extends IPickerQuickAccessItem, IQuickPickItemWithResource { }
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@ import { IFileDialogService } from 'vs/platform/dialogs/common/dialogs';
|
||||||
import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
|
import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
|
||||||
import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
|
import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
|
||||||
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
|
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
|
||||||
import { EditorInput, GroupIdentifier, IEditorInput, IRevertOptions, ISaveOptions, EditorResourceAccessor, IMoveResult, EditorInputCapabilities } from 'vs/workbench/common/editor';
|
import { GroupIdentifier, IEditorInput, IRevertOptions, ISaveOptions, EditorResourceAccessor, IMoveResult, EditorInputCapabilities } from 'vs/workbench/common/editor';
|
||||||
import { Memento } from 'vs/workbench/common/memento';
|
import { Memento } from 'vs/workbench/common/memento';
|
||||||
import { SearchEditorFindMatchClass, SearchEditorScheme, SearchEditorWorkingCopyTypeId } from 'vs/workbench/contrib/searchEditor/browser/constants';
|
import { SearchEditorFindMatchClass, SearchEditorScheme, SearchEditorWorkingCopyTypeId } from 'vs/workbench/contrib/searchEditor/browser/constants';
|
||||||
import { SearchConfigurationModel, SearchEditorModel, searchEditorModelFactory } from 'vs/workbench/contrib/searchEditor/browser/searchEditorModel';
|
import { SearchConfigurationModel, SearchEditorModel, searchEditorModelFactory } from 'vs/workbench/contrib/searchEditor/browser/searchEditorModel';
|
||||||
|
@ -29,6 +29,7 @@ import { CancellationToken } from 'vs/base/common/cancellation';
|
||||||
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
|
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
|
||||||
import { ISearchComplete, ISearchConfigurationProperties } from 'vs/workbench/services/search/common/search';
|
import { ISearchComplete, ISearchConfigurationProperties } from 'vs/workbench/services/search/common/search';
|
||||||
import { bufferToReadable, VSBuffer } from 'vs/base/common/buffer';
|
import { bufferToReadable, VSBuffer } from 'vs/base/common/buffer';
|
||||||
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
|
|
||||||
export type SearchConfiguration = {
|
export type SearchConfiguration = {
|
||||||
query: string,
|
query: string,
|
||||||
|
|
|
@ -32,7 +32,7 @@ import { ITextEditorOptions } from 'vs/platform/editor/common/editor';
|
||||||
import { createDecorator, IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
|
import { createDecorator, IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
|
||||||
import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
|
import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
|
||||||
import { IColorTheme, IThemeService } from 'vs/platform/theme/common/themeService';
|
import { IColorTheme, IThemeService } from 'vs/platform/theme/common/themeService';
|
||||||
import { EditorModel } from 'vs/workbench/common/editor';
|
import { EditorModel } from 'vs/workbench/common/editor/editorModel';
|
||||||
import { testingPeekBorder } from 'vs/workbench/contrib/testing/browser/theme';
|
import { testingPeekBorder } from 'vs/workbench/contrib/testing/browser/theme';
|
||||||
import { AutoOpenPeekViewWhen, getTestingConfiguration, TestingConfigKeys } from 'vs/workbench/contrib/testing/common/configuration';
|
import { AutoOpenPeekViewWhen, getTestingConfiguration, TestingConfigKeys } from 'vs/workbench/contrib/testing/common/configuration';
|
||||||
import { Testing } from 'vs/workbench/contrib/testing/common/constants';
|
import { Testing } from 'vs/workbench/contrib/testing/common/constants';
|
||||||
|
|
|
@ -14,7 +14,8 @@ import { IStorageService } from 'vs/platform/storage/common/storage';
|
||||||
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
|
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
|
||||||
import { IThemeService } from 'vs/platform/theme/common/themeService';
|
import { IThemeService } from 'vs/platform/theme/common/themeService';
|
||||||
import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
|
import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
|
||||||
import { EditorInput, EditorOptions, IEditorOpenContext } from 'vs/workbench/common/editor';
|
import { EditorOptions, IEditorOpenContext } from 'vs/workbench/common/editor';
|
||||||
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
import { WebviewOverlay } from 'vs/workbench/contrib/webview/browser/webview';
|
import { WebviewOverlay } from 'vs/workbench/contrib/webview/browser/webview';
|
||||||
import { WebviewWindowDragMonitor } from 'vs/workbench/contrib/webview/browser/webviewWindowDragMonitor';
|
import { WebviewWindowDragMonitor } from 'vs/workbench/contrib/webview/browser/webviewWindowDragMonitor';
|
||||||
import { WebviewInput } from 'vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
|
import { WebviewInput } from 'vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
|
||||||
|
|
|
@ -5,7 +5,8 @@
|
||||||
|
|
||||||
import { Schemas } from 'vs/base/common/network';
|
import { Schemas } from 'vs/base/common/network';
|
||||||
import { URI } from 'vs/base/common/uri';
|
import { URI } from 'vs/base/common/uri';
|
||||||
import { EditorInput, EditorInputCapabilities, GroupIdentifier, IEditorInput, Verbosity } from 'vs/workbench/common/editor';
|
import { EditorInputCapabilities, GroupIdentifier, IEditorInput, Verbosity } from 'vs/workbench/common/editor';
|
||||||
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
import { WebviewOverlay } from 'vs/workbench/contrib/webview/browser/webview';
|
import { WebviewOverlay } from 'vs/workbench/contrib/webview/browser/webview';
|
||||||
import { WebviewIconManager, WebviewIcons } from 'vs/workbench/contrib/webviewPanel/browser/webviewIconManager';
|
import { WebviewIconManager, WebviewIcons } from 'vs/workbench/contrib/webviewPanel/browser/webviewIconManager';
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
import 'vs/css!./gettingStarted';
|
import 'vs/css!./gettingStarted';
|
||||||
import { localize } from 'vs/nls';
|
import { localize } from 'vs/nls';
|
||||||
import { EditorInput } from 'vs/workbench/common/editor';
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
import { URI } from 'vs/base/common/uri';
|
import { URI } from 'vs/base/common/uri';
|
||||||
import { Schemas } from 'vs/base/common/network';
|
import { Schemas } from 'vs/base/common/network';
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,7 @@ import { registerThemingParticipant } from 'vs/platform/theme/common/themeServic
|
||||||
import { focusBorder, textLinkForeground, textLinkActiveForeground, foreground, descriptionForeground, contrastBorder, activeContrastBorder } from 'vs/platform/theme/common/colorRegistry';
|
import { focusBorder, textLinkForeground, textLinkActiveForeground, foreground, descriptionForeground, contrastBorder, activeContrastBorder } from 'vs/platform/theme/common/colorRegistry';
|
||||||
import { getExtraColor } from 'vs/workbench/contrib/welcome/walkThrough/common/walkThroughUtils';
|
import { getExtraColor } from 'vs/workbench/contrib/welcome/walkThrough/common/walkThroughUtils';
|
||||||
import { IExtensionsViewPaneContainer, IExtensionsWorkbenchService, VIEWLET_ID } from 'vs/workbench/contrib/extensions/common/extensions';
|
import { IExtensionsViewPaneContainer, IExtensionsWorkbenchService, VIEWLET_ID } from 'vs/workbench/contrib/extensions/common/extensions';
|
||||||
import { IEditorInputSerializer, EditorInput } from 'vs/workbench/common/editor';
|
import { IEditorInputSerializer } from 'vs/workbench/common/editor';
|
||||||
import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
|
import { INotificationService, Severity } from 'vs/platform/notification/common/notification';
|
||||||
import { TimeoutTimer } from 'vs/base/common/async';
|
import { TimeoutTimer } from 'vs/base/common/async';
|
||||||
import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
|
import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
|
||||||
|
@ -53,6 +53,7 @@ import { Registry } from 'vs/platform/registry/common/platform';
|
||||||
import { IConfigurationRegistry, Extensions as ConfigurationExtensions, IConfigurationNode, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
|
import { IConfigurationRegistry, Extensions as ConfigurationExtensions, IConfigurationNode, ConfigurationScope } from 'vs/platform/configuration/common/configurationRegistry';
|
||||||
import { workbenchConfigurationNodeBase } from 'vs/workbench/common/configuration';
|
import { workbenchConfigurationNodeBase } from 'vs/workbench/common/configuration';
|
||||||
import { ILogService } from 'vs/platform/log/common/log';
|
import { ILogService } from 'vs/platform/log/common/log';
|
||||||
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
|
|
||||||
|
|
||||||
export const DEFAULT_STARTUP_EDITOR_CONFIG: IConfigurationNode = {
|
export const DEFAULT_STARTUP_EDITOR_CONFIG: IConfigurationNode = {
|
||||||
|
|
|
@ -10,8 +10,9 @@ import { Action } from 'vs/base/common/actions';
|
||||||
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
|
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
|
||||||
import { WalkThroughInput, WalkThroughInputOptions } from 'vs/workbench/contrib/welcome/walkThrough/browser/walkThroughInput';
|
import { WalkThroughInput, WalkThroughInputOptions } from 'vs/workbench/contrib/welcome/walkThrough/browser/walkThroughInput';
|
||||||
import { FileAccess, Schemas } from 'vs/base/common/network';
|
import { FileAccess, Schemas } from 'vs/base/common/network';
|
||||||
import { IEditorInputSerializer, EditorInput } from 'vs/workbench/common/editor';
|
import { IEditorInputSerializer } from 'vs/workbench/common/editor';
|
||||||
import { EditorOverride } from 'vs/platform/editor/common/editor';
|
import { EditorOverride } from 'vs/platform/editor/common/editor';
|
||||||
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
|
|
||||||
const typeId = 'workbench.editors.walkThroughInput';
|
const typeId = 'workbench.editors.walkThroughInput';
|
||||||
const inputOptions: WalkThroughInputOptions = {
|
const inputOptions: WalkThroughInputOptions = {
|
||||||
|
|
|
@ -3,7 +3,8 @@
|
||||||
* Licensed under the MIT License. See License.txt in the project root for license information.
|
* Licensed under the MIT License. See License.txt in the project root for license information.
|
||||||
*--------------------------------------------------------------------------------------------*/
|
*--------------------------------------------------------------------------------------------*/
|
||||||
|
|
||||||
import { EditorInput, EditorModel } from 'vs/workbench/common/editor';
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
|
import { EditorModel } from 'vs/workbench/common/editor/editorModel';
|
||||||
import { URI } from 'vs/base/common/uri';
|
import { URI } from 'vs/base/common/uri';
|
||||||
import { DisposableStore, IReference } from 'vs/base/common/lifecycle';
|
import { DisposableStore, IReference } from 'vs/base/common/lifecycle';
|
||||||
import { ITextEditorModel, ITextModelService } from 'vs/editor/common/services/resolverService';
|
import { ITextEditorModel, ITextModelService } from 'vs/editor/common/services/resolverService';
|
||||||
|
|
|
@ -26,7 +26,7 @@ import { IEditorRegistry, EditorDescriptor } from 'vs/workbench/browser/editor';
|
||||||
import { shieldIcon, WorkspaceTrustEditor } from 'vs/workbench/contrib/workspace/browser/workspaceTrustEditor';
|
import { shieldIcon, WorkspaceTrustEditor } from 'vs/workbench/contrib/workspace/browser/workspaceTrustEditor';
|
||||||
import { WorkspaceTrustEditorInput } from 'vs/workbench/services/workspaces/browser/workspaceTrustEditorInput';
|
import { WorkspaceTrustEditorInput } from 'vs/workbench/services/workspaces/browser/workspaceTrustEditorInput';
|
||||||
import { isWorkspaceTrustEnabled, WORKSPACE_TRUST_EMPTY_WINDOW, WORKSPACE_TRUST_ENABLED, WORKSPACE_TRUST_STARTUP_PROMPT, WORKSPACE_TRUST_UNTRUSTED_FILES } from 'vs/workbench/services/workspaces/common/workspaceTrust';
|
import { isWorkspaceTrustEnabled, WORKSPACE_TRUST_EMPTY_WINDOW, WORKSPACE_TRUST_ENABLED, WORKSPACE_TRUST_STARTUP_PROMPT, WORKSPACE_TRUST_UNTRUSTED_FILES } from 'vs/workbench/services/workspaces/common/workspaceTrust';
|
||||||
import { EditorInput, IEditorInputSerializer, IEditorInputFactoryRegistry, EditorExtensions, EditorResourceAccessor } from 'vs/workbench/common/editor';
|
import { IEditorInputSerializer, IEditorInputFactoryRegistry, EditorExtensions, EditorResourceAccessor } from 'vs/workbench/common/editor';
|
||||||
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
|
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
|
||||||
import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
|
import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
|
||||||
import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
|
import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
|
||||||
|
@ -45,6 +45,7 @@ import { IHostService } from 'vs/workbench/services/host/browser/host';
|
||||||
import { IBannerItem, IBannerService } from 'vs/workbench/services/banner/browser/bannerService';
|
import { IBannerItem, IBannerService } from 'vs/workbench/services/banner/browser/bannerService';
|
||||||
import { getVirtualWorkspaceScheme } from 'vs/platform/remote/common/remoteHosts';
|
import { getVirtualWorkspaceScheme } from 'vs/platform/remote/common/remoteHosts';
|
||||||
import { verifyMicrosoftInternalDomain } from 'vs/platform/telemetry/common/commonProperties';
|
import { verifyMicrosoftInternalDomain } from 'vs/platform/telemetry/common/commonProperties';
|
||||||
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
|
|
||||||
const BANNER_RESTRICTED_MODE = 'workbench.banner.restrictedMode';
|
const BANNER_RESTRICTED_MODE = 'workbench.banner.restrictedMode';
|
||||||
const BANNER_VIRTUAL_WORKSPACE = 'workbench.banner.virtualWorkspace';
|
const BANNER_VIRTUAL_WORKSPACE = 'workbench.banner.virtualWorkspace';
|
||||||
|
|
|
@ -5,7 +5,9 @@
|
||||||
|
|
||||||
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
|
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
|
||||||
import { IResourceEditorInput, ITextEditorOptions, IEditorOptions, EditorActivation, EditorOverride, IResourceEditorInputIdentifier } from 'vs/platform/editor/common/editor';
|
import { IResourceEditorInput, ITextEditorOptions, IEditorOptions, EditorActivation, EditorOverride, IResourceEditorInputIdentifier } from 'vs/platform/editor/common/editor';
|
||||||
import { SideBySideEditor, IEditorInput, IEditorPane, GroupIdentifier, IFileEditorInput, IUntitledTextResourceEditorInput, IResourceDiffEditorInput, IEditorInputFactoryRegistry, EditorExtensions, EditorInput, SideBySideEditorInput, IEditorInputWithOptions, isEditorInputWithOptions, EditorOptions, TextEditorOptions, IEditorIdentifier, IEditorCloseEvent, ITextEditorPane, ITextDiffEditorPane, IRevertOptions, SaveReason, EditorsOrder, isTextEditorPane, IWorkbenchEditorConfiguration, EditorResourceAccessor, IVisibleEditorPane, IEditorInputWithOptionsAndGroup, EditorInputCapabilities } from 'vs/workbench/common/editor';
|
import { SideBySideEditor, IEditorInput, IEditorPane, GroupIdentifier, IFileEditorInput, IUntitledTextResourceEditorInput, IResourceDiffEditorInput, IEditorInputFactoryRegistry, EditorExtensions, IEditorInputWithOptions, isEditorInputWithOptions, EditorOptions, TextEditorOptions, IEditorIdentifier, IEditorCloseEvent, ITextEditorPane, ITextDiffEditorPane, IRevertOptions, SaveReason, EditorsOrder, isTextEditorPane, IWorkbenchEditorConfiguration, EditorResourceAccessor, IVisibleEditorPane, IEditorInputWithOptionsAndGroup, EditorInputCapabilities } from 'vs/workbench/common/editor';
|
||||||
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
|
import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditoInput';
|
||||||
import { TextResourceEditorInput } from 'vs/workbench/common/editor/textResourceEditorInput';
|
import { TextResourceEditorInput } from 'vs/workbench/common/editor/textResourceEditorInput';
|
||||||
import { Registry } from 'vs/platform/registry/common/platform';
|
import { Registry } from 'vs/platform/registry/common/platform';
|
||||||
import { ResourceMap } from 'vs/base/common/map';
|
import { ResourceMap } from 'vs/base/common/map';
|
||||||
|
|
|
@ -8,7 +8,7 @@ import { EditorActivation, EditorOverride } from 'vs/platform/editor/common/edit
|
||||||
import { URI } from 'vs/base/common/uri';
|
import { URI } from 'vs/base/common/uri';
|
||||||
import { Event } from 'vs/base/common/event';
|
import { Event } from 'vs/base/common/event';
|
||||||
import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
|
import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
|
||||||
import { EditorInput, EditorsOrder, SideBySideEditorInput } from 'vs/workbench/common/editor';
|
import { EditorsOrder } from 'vs/workbench/common/editor';
|
||||||
import { workbenchInstantiationService, TestServiceAccessor, registerTestEditor, TestFileEditorInput, ITestInstantiationService, registerTestResourceEditor, registerTestSideBySideEditor, createEditorPart } from 'vs/workbench/test/browser/workbenchTestServices';
|
import { workbenchInstantiationService, TestServiceAccessor, registerTestEditor, TestFileEditorInput, ITestInstantiationService, registerTestResourceEditor, registerTestSideBySideEditor, createEditorPart } from 'vs/workbench/test/browser/workbenchTestServices';
|
||||||
import { TextResourceEditorInput } from 'vs/workbench/common/editor/textResourceEditorInput';
|
import { TextResourceEditorInput } from 'vs/workbench/common/editor/textResourceEditorInput';
|
||||||
import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
|
import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
|
||||||
|
@ -33,6 +33,8 @@ import { MockScopableContextKeyService } from 'vs/platform/keybinding/test/commo
|
||||||
import { ContributedEditorPriority } from 'vs/workbench/services/editor/common/editorOverrideService';
|
import { ContributedEditorPriority } from 'vs/workbench/services/editor/common/editorOverrideService';
|
||||||
import { IWorkspaceTrustRequestService, WorkspaceTrustUriResponse } from 'vs/platform/workspace/common/workspaceTrust';
|
import { IWorkspaceTrustRequestService, WorkspaceTrustUriResponse } from 'vs/platform/workspace/common/workspaceTrust';
|
||||||
import { TestWorkspaceTrustRequestService } from 'vs/workbench/services/workspaces/test/common/testWorkspaceTrustService';
|
import { TestWorkspaceTrustRequestService } from 'vs/workbench/services/workspaces/test/common/testWorkspaceTrustService';
|
||||||
|
import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditoInput';
|
||||||
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
|
|
||||||
suite('EditorService', () => {
|
suite('EditorService', () => {
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
*--------------------------------------------------------------------------------------------*/
|
*--------------------------------------------------------------------------------------------*/
|
||||||
|
|
||||||
import * as assert from 'assert';
|
import * as assert from 'assert';
|
||||||
import { EditorOptions, IEditorInputFactoryRegistry, EditorExtensions, SideBySideEditorInput } from 'vs/workbench/common/editor';
|
import { EditorOptions, IEditorInputFactoryRegistry, EditorExtensions } from 'vs/workbench/common/editor';
|
||||||
import { URI } from 'vs/base/common/uri';
|
import { URI } from 'vs/base/common/uri';
|
||||||
import { workbenchInstantiationService, TestFileEditorInput, registerTestEditor, TestEditorPart, createEditorPart, registerTestSideBySideEditor } from 'vs/workbench/test/browser/workbenchTestServices';
|
import { workbenchInstantiationService, TestFileEditorInput, registerTestEditor, TestEditorPart, createEditorPart, registerTestSideBySideEditor } from 'vs/workbench/test/browser/workbenchTestServices';
|
||||||
import { Registry } from 'vs/platform/registry/common/platform';
|
import { Registry } from 'vs/platform/registry/common/platform';
|
||||||
|
@ -17,6 +17,7 @@ import { DisposableStore, toDisposable } from 'vs/base/common/lifecycle';
|
||||||
import { EditorsObserver } from 'vs/workbench/browser/parts/editor/editorsObserver';
|
import { EditorsObserver } from 'vs/workbench/browser/parts/editor/editorsObserver';
|
||||||
import { timeout } from 'vs/base/common/async';
|
import { timeout } from 'vs/base/common/async';
|
||||||
import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
|
import { TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
|
||||||
|
import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditoInput';
|
||||||
|
|
||||||
suite('EditorsObserver', function () {
|
suite('EditorsObserver', function () {
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,8 @@ import { localize } from 'vs/nls';
|
||||||
import { URI, UriComponents } from 'vs/base/common/uri';
|
import { URI, UriComponents } from 'vs/base/common/uri';
|
||||||
import { IEditor } from 'vs/editor/common/editorCommon';
|
import { IEditor } from 'vs/editor/common/editorCommon';
|
||||||
import { ITextEditorOptions, IResourceEditorInput, TextEditorSelectionRevealType, IEditorOptions } from 'vs/platform/editor/common/editor';
|
import { ITextEditorOptions, IResourceEditorInput, TextEditorSelectionRevealType, IEditorOptions } from 'vs/platform/editor/common/editor';
|
||||||
import { IEditorInput, IEditorPane, EditorExtensions, EditorInput, IEditorCloseEvent, IEditorInputFactoryRegistry, EditorResourceAccessor, IEditorIdentifier, GroupIdentifier, EditorsOrder, SideBySideEditor } from 'vs/workbench/common/editor';
|
import { IEditorInput, IEditorPane, EditorExtensions, IEditorCloseEvent, IEditorInputFactoryRegistry, EditorResourceAccessor, IEditorIdentifier, GroupIdentifier, EditorsOrder, SideBySideEditor } from 'vs/workbench/common/editor';
|
||||||
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
|
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
|
||||||
import { IHistoryService } from 'vs/workbench/services/history/common/history';
|
import { IHistoryService } from 'vs/workbench/services/history/common/history';
|
||||||
import { FileChangesEvent, IFileService, FileChangeType, FILES_EXCLUDE_CONFIG, FileOperationEvent, FileOperation } from 'vs/platform/files/common/files';
|
import { FileChangesEvent, IFileService, FileChangeType, FILES_EXCLUDE_CONFIG, FileOperationEvent, FileOperation } from 'vs/platform/files/common/files';
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
import { OS } from 'vs/base/common/platform';
|
import { OS } from 'vs/base/common/platform';
|
||||||
import * as nls from 'vs/nls';
|
import * as nls from 'vs/nls';
|
||||||
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
|
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
|
||||||
import { EditorInput } from 'vs/workbench/common/editor';
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
import { KeybindingsEditorModel } from 'vs/workbench/services/preferences/browser/keybindingsEditorModel';
|
import { KeybindingsEditorModel } from 'vs/workbench/services/preferences/browser/keybindingsEditorModel';
|
||||||
|
|
||||||
export interface IKeybindingsEditorSearchOptions {
|
export interface IKeybindingsEditorSearchOptions {
|
||||||
|
|
|
@ -13,7 +13,7 @@ import { ResolvedKeybinding, ResolvedKeybindingPart } from 'vs/base/common/keyCo
|
||||||
import { AriaLabelProvider, UserSettingsLabelProvider, UILabelProvider, ModifierLabels as ModLabels } from 'vs/base/common/keybindingLabels';
|
import { AriaLabelProvider, UserSettingsLabelProvider, UILabelProvider, ModifierLabels as ModLabels } from 'vs/base/common/keybindingLabels';
|
||||||
import { MenuRegistry, ILocalizedString, ICommandAction } from 'vs/platform/actions/common/actions';
|
import { MenuRegistry, ILocalizedString, ICommandAction } from 'vs/platform/actions/common/actions';
|
||||||
import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
|
import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
|
||||||
import { EditorModel } from 'vs/workbench/common/editor';
|
import { EditorModel } from 'vs/workbench/common/editor/editorModel';
|
||||||
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
|
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
|
||||||
import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
|
import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
|
||||||
import { getAllUnboundCommands } from 'vs/workbench/services/keybinding/browser/unboundCommands';
|
import { getAllUnboundCommands } from 'vs/workbench/services/keybinding/browser/unboundCommands';
|
||||||
|
|
|
@ -24,7 +24,7 @@ import { ILabelService } from 'vs/platform/label/common/label';
|
||||||
import { INotificationService } from 'vs/platform/notification/common/notification';
|
import { INotificationService } from 'vs/platform/notification/common/notification';
|
||||||
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
|
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
|
||||||
import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
|
import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
|
||||||
import { EditorInput, IEditorInput, IEditorPane } from 'vs/workbench/common/editor';
|
import { IEditorInput, IEditorPane } from 'vs/workbench/common/editor';
|
||||||
import { IJSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditing';
|
import { IJSONEditingService } from 'vs/workbench/services/configuration/common/jsonEditing';
|
||||||
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
|
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
|
||||||
import { GroupDirection, IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
|
import { GroupDirection, IEditorGroup, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
|
||||||
|
@ -42,6 +42,7 @@ import { CoreEditingCommands } from 'vs/editor/browser/controller/coreCommands';
|
||||||
import { getErrorMessage } from 'vs/base/common/errors';
|
import { getErrorMessage } from 'vs/base/common/errors';
|
||||||
import { EditorOverride } from 'vs/platform/editor/common/editor';
|
import { EditorOverride } from 'vs/platform/editor/common/editor';
|
||||||
import { KeybindingsEditorInput } from 'vs/workbench/services/preferences/browser/keybindingsEditorInput';
|
import { KeybindingsEditorInput } from 'vs/workbench/services/preferences/browser/keybindingsEditorInput';
|
||||||
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
|
|
||||||
const emptyEditableSettingsContent = '{\n}';
|
const emptyEditableSettingsContent = '{\n}';
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,9 @@ import { ITextModelService } from 'vs/editor/common/services/resolverService';
|
||||||
import * as nls from 'vs/nls';
|
import * as nls from 'vs/nls';
|
||||||
import { IFileService } from 'vs/platform/files/common/files';
|
import { IFileService } from 'vs/platform/files/common/files';
|
||||||
import { ILabelService } from 'vs/platform/label/common/label';
|
import { ILabelService } from 'vs/platform/label/common/label';
|
||||||
import { EditorInput, SideBySideEditorInput, Verbosity } from 'vs/workbench/common/editor';
|
import { Verbosity } from 'vs/workbench/common/editor';
|
||||||
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
|
import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditoInput';
|
||||||
import { TextResourceEditorInput } from 'vs/workbench/common/editor/textResourceEditorInput';
|
import { TextResourceEditorInput } from 'vs/workbench/common/editor/textResourceEditorInput';
|
||||||
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
|
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
|
||||||
import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
|
import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences';
|
||||||
|
|
|
@ -18,7 +18,7 @@ import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configur
|
||||||
import { ConfigurationScope, Extensions, IConfigurationNode, IConfigurationPropertySchema, IConfigurationRegistry, OVERRIDE_PROPERTY_PATTERN, IConfigurationExtensionInfo } from 'vs/platform/configuration/common/configurationRegistry';
|
import { ConfigurationScope, Extensions, IConfigurationNode, IConfigurationPropertySchema, IConfigurationRegistry, OVERRIDE_PROPERTY_PATTERN, IConfigurationExtensionInfo } from 'vs/platform/configuration/common/configurationRegistry';
|
||||||
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
|
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
|
||||||
import { Registry } from 'vs/platform/registry/common/platform';
|
import { Registry } from 'vs/platform/registry/common/platform';
|
||||||
import { EditorModel } from 'vs/workbench/common/editor';
|
import { EditorModel } from 'vs/workbench/common/editor/editorModel';
|
||||||
import { IFilterMetadata, IFilterResult, IGroupFilter, IKeybindingsEditorModel, ISearchResultGroup, ISetting, ISettingMatch, ISettingMatcher, ISettingsEditorModel, ISettingsGroup } from 'vs/workbench/services/preferences/common/preferences';
|
import { IFilterMetadata, IFilterResult, IGroupFilter, IKeybindingsEditorModel, ISearchResultGroup, ISetting, ISettingMatch, ISettingMatcher, ISettingsEditorModel, ISettingsGroup } from 'vs/workbench/services/preferences/common/preferences';
|
||||||
import { withNullAsUndefined, isArray } from 'vs/base/common/types';
|
import { withNullAsUndefined, isArray } from 'vs/base/common/types';
|
||||||
import { FOLDER_SCOPES, WORKSPACE_SCOPES } from 'vs/workbench/services/configuration/common/configuration';
|
import { FOLDER_SCOPES, WORKSPACE_SCOPES } from 'vs/workbench/services/configuration/common/configuration';
|
||||||
|
|
|
@ -6,7 +6,8 @@
|
||||||
import { Schemas } from 'vs/base/common/network';
|
import { Schemas } from 'vs/base/common/network';
|
||||||
import { Disposable } from 'vs/base/common/lifecycle';
|
import { Disposable } from 'vs/base/common/lifecycle';
|
||||||
import { URI, UriComponents } from 'vs/base/common/uri';
|
import { URI, UriComponents } from 'vs/base/common/uri';
|
||||||
import { EditorInput, IEditorInputSerializer } from 'vs/workbench/common/editor';
|
import { IEditorInputSerializer } from 'vs/workbench/common/editor';
|
||||||
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
|
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
|
||||||
import { isEqual, toLocalResource } from 'vs/base/common/resources';
|
import { isEqual, toLocalResource } from 'vs/base/common/resources';
|
||||||
import { PLAINTEXT_MODE_ID } from 'vs/editor/common/modes/modesRegistry';
|
import { PLAINTEXT_MODE_ID } from 'vs/editor/common/modes/modesRegistry';
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
import { Schemas } from 'vs/base/common/network';
|
import { Schemas } from 'vs/base/common/network';
|
||||||
import { URI } from 'vs/base/common/uri';
|
import { URI } from 'vs/base/common/uri';
|
||||||
import { localize } from 'vs/nls';
|
import { localize } from 'vs/nls';
|
||||||
import { EditorInput } from 'vs/workbench/common/editor';
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
|
|
||||||
export class WorkspaceTrustEditorInput extends EditorInput {
|
export class WorkspaceTrustEditorInput extends EditorInput {
|
||||||
static readonly ID: string = 'workbench.input.workspaceTrust';
|
static readonly ID: string = 'workbench.input.workspaceTrust';
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
*--------------------------------------------------------------------------------------------*/
|
*--------------------------------------------------------------------------------------------*/
|
||||||
|
|
||||||
import * as assert from 'assert';
|
import * as assert from 'assert';
|
||||||
import { EditorResourceAccessor, SideBySideEditor, IEditorInputWithPreferredResource, SideBySideEditorInput, EditorInputCapabilities, isEditorIdentifier } from 'vs/workbench/common/editor';
|
import { EditorResourceAccessor, SideBySideEditor, IEditorInputWithPreferredResource, EditorInputCapabilities, isEditorIdentifier } from 'vs/workbench/common/editor';
|
||||||
import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
|
import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
|
||||||
import { URI } from 'vs/base/common/uri';
|
import { URI } from 'vs/base/common/uri';
|
||||||
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
|
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
|
||||||
|
@ -18,6 +18,7 @@ import { whenEditorClosed } from 'vs/workbench/browser/editor';
|
||||||
import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
|
import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
|
||||||
import { EditorService } from 'vs/workbench/services/editor/browser/editorService';
|
import { EditorService } from 'vs/workbench/services/editor/browser/editorService';
|
||||||
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
|
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
|
||||||
|
import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditoInput';
|
||||||
|
|
||||||
suite('Workbench editor', () => {
|
suite('Workbench editor', () => {
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
import * as assert from 'assert';
|
import * as assert from 'assert';
|
||||||
import { EditorGroupModel, ISerializedEditorGroupModel, EditorCloseEvent } from 'vs/workbench/common/editor/editorGroupModel';
|
import { EditorGroupModel, ISerializedEditorGroupModel, EditorCloseEvent } from 'vs/workbench/common/editor/editorGroupModel';
|
||||||
import { EditorExtensions, IEditorInputFactoryRegistry, EditorInput, IFileEditorInput, IEditorInputSerializer, CloseDirection, EditorsOrder } from 'vs/workbench/common/editor';
|
import { EditorExtensions, IEditorInputFactoryRegistry, IFileEditorInput, IEditorInputSerializer, CloseDirection, EditorsOrder } from 'vs/workbench/common/editor';
|
||||||
import { URI } from 'vs/base/common/uri';
|
import { URI } from 'vs/base/common/uri';
|
||||||
import { TestLifecycleService, workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
|
import { TestLifecycleService, workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
|
||||||
import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
|
import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
|
||||||
|
@ -22,6 +22,7 @@ import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
|
||||||
import { IStorageService } from 'vs/platform/storage/common/storage';
|
import { IStorageService } from 'vs/platform/storage/common/storage';
|
||||||
import { DisposableStore } from 'vs/base/common/lifecycle';
|
import { DisposableStore } from 'vs/base/common/lifecycle';
|
||||||
import { TestContextService, TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
|
import { TestContextService, TestStorageService } from 'vs/workbench/test/common/workbenchTestServices';
|
||||||
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
|
|
||||||
suite('Workbench editor group model', () => {
|
suite('Workbench editor group model', () => {
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
*--------------------------------------------------------------------------------------------*/
|
*--------------------------------------------------------------------------------------------*/
|
||||||
|
|
||||||
import * as assert from 'assert';
|
import * as assert from 'assert';
|
||||||
import { EditorInput } from 'vs/workbench/common/editor';
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
|
import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput';
|
||||||
import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
|
import { workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,6 @@
|
||||||
|
|
||||||
import * as assert from 'assert';
|
import * as assert from 'assert';
|
||||||
import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
|
import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
|
||||||
import { EditorModel } from 'vs/workbench/common/editor';
|
|
||||||
import { BaseTextEditorModel } from 'vs/workbench/common/editor/textEditorModel';
|
import { BaseTextEditorModel } from 'vs/workbench/common/editor/textEditorModel';
|
||||||
import { IModelService } from 'vs/editor/common/services/modelService';
|
import { IModelService } from 'vs/editor/common/services/modelService';
|
||||||
import { IModeService } from 'vs/editor/common/services/modeService';
|
import { IModeService } from 'vs/editor/common/services/modeService';
|
||||||
|
@ -26,6 +25,7 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
|
||||||
import { TestTextResourcePropertiesService } from 'vs/workbench/test/common/workbenchTestServices';
|
import { TestTextResourcePropertiesService } from 'vs/workbench/test/common/workbenchTestServices';
|
||||||
import { IThemeService } from 'vs/platform/theme/common/themeService';
|
import { IThemeService } from 'vs/platform/theme/common/themeService';
|
||||||
import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
|
import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
|
||||||
|
import { EditorModel } from 'vs/workbench/common/editor/editorModel';
|
||||||
|
|
||||||
suite('Workbench editor model', () => {
|
suite('Workbench editor model', () => {
|
||||||
|
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
import * as assert from 'assert';
|
import * as assert from 'assert';
|
||||||
import { EditorPane, EditorMemento } from 'vs/workbench/browser/parts/editor/editorPane';
|
import { EditorPane, EditorMemento } from 'vs/workbench/browser/parts/editor/editorPane';
|
||||||
import { WorkspaceTrustRequiredEditor } from 'vs/workbench/browser/parts/editor/workspaceTrustRequiredEditor';
|
import { WorkspaceTrustRequiredEditor } from 'vs/workbench/browser/parts/editor/workspaceTrustRequiredEditor';
|
||||||
import { EditorInput, EditorOptions, IEditorInputSerializer, IEditorInputFactoryRegistry, EditorExtensions, EditorInputCapabilities, IEditorDescriptor, IEditorPane } from 'vs/workbench/common/editor';
|
import { EditorOptions, IEditorInputSerializer, IEditorInputFactoryRegistry, EditorExtensions, EditorInputCapabilities, IEditorDescriptor, IEditorPane } from 'vs/workbench/common/editor';
|
||||||
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
|
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
|
||||||
import { Registry } from 'vs/platform/registry/common/platform';
|
import { Registry } from 'vs/platform/registry/common/platform';
|
||||||
import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
|
import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
|
||||||
|
@ -27,6 +27,7 @@ import { IEditorService } from 'vs/workbench/services/editor/common/editorServic
|
||||||
import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
|
import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
|
||||||
import { TestWorkspaceTrustManagementService } from 'vs/workbench/services/workspaces/test/common/testWorkspaceTrustService';
|
import { TestWorkspaceTrustManagementService } from 'vs/workbench/services/workspaces/test/common/testWorkspaceTrustService';
|
||||||
import { IWorkspaceTrustManagementService } from 'vs/platform/workspace/common/workspaceTrust';
|
import { IWorkspaceTrustManagementService } from 'vs/platform/workspace/common/workspaceTrust';
|
||||||
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
|
|
||||||
const NullThemeService = new TestThemeService();
|
const NullThemeService = new TestThemeService();
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,8 @@ import { basename } from 'vs/base/common/resources';
|
||||||
import { URI } from 'vs/base/common/uri';
|
import { URI } from 'vs/base/common/uri';
|
||||||
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
|
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
|
||||||
import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
|
import { NullTelemetryService } from 'vs/platform/telemetry/common/telemetryUtils';
|
||||||
import { IEditorInputWithOptions, IEditorIdentifier, IUntitledTextResourceEditorInput, IResourceDiffEditorInput, IEditorInput, IEditorPane, IEditorCloseEvent, IEditorPartOptions, IRevertOptions, GroupIdentifier, EditorInput, EditorOptions, EditorsOrder, IFileEditorInput, IEditorInputFactoryRegistry, IEditorInputSerializer, EditorExtensions, ISaveOptions, IMoveResult, ITextEditorPane, ITextDiffEditorPane, IVisibleEditorPane, IEditorOpenContext, SideBySideEditorInput, IEditorMoveEvent, EditorExtensions as Extensions, EditorInputCapabilities, IEditorOpenEvent } from 'vs/workbench/common/editor';
|
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
|
||||||
|
import { IEditorInputWithOptions, IEditorIdentifier, IUntitledTextResourceEditorInput, IResourceDiffEditorInput, IEditorInput, IEditorPane, IEditorCloseEvent, IEditorPartOptions, IRevertOptions, GroupIdentifier, EditorOptions, EditorsOrder, IFileEditorInput, IEditorInputFactoryRegistry, IEditorInputSerializer, EditorExtensions, ISaveOptions, IMoveResult, ITextEditorPane, ITextDiffEditorPane, IVisibleEditorPane, IEditorOpenContext, IEditorMoveEvent, EditorExtensions as Extensions, EditorInputCapabilities, IEditorOpenEvent } from 'vs/workbench/common/editor';
|
||||||
import { EditorServiceImpl, IEditorGroupView, IEditorGroupsAccessor, IEditorGroupTitleHeight } from 'vs/workbench/browser/parts/editor/editor';
|
import { EditorServiceImpl, IEditorGroupView, IEditorGroupsAccessor, IEditorGroupTitleHeight } from 'vs/workbench/browser/parts/editor/editor';
|
||||||
import { Event, Emitter } from 'vs/base/common/event';
|
import { Event, Emitter } from 'vs/base/common/event';
|
||||||
import { IResolvedWorkingCopyBackup, IWorkingCopyBackupService } from 'vs/workbench/services/workingCopy/common/workingCopyBackup';
|
import { IResolvedWorkingCopyBackup, IWorkingCopyBackupService } from 'vs/workbench/services/workingCopy/common/workingCopyBackup';
|
||||||
|
@ -139,6 +140,7 @@ import { BrowserElevatedFileService } from 'vs/workbench/services/files/browser/
|
||||||
import { IDiffComputationResult, IEditorWorkerService } from 'vs/editor/common/services/editorWorkerService';
|
import { IDiffComputationResult, IEditorWorkerService } from 'vs/editor/common/services/editorWorkerService';
|
||||||
import { TextEdit, IInplaceReplaceSupportResult } from 'vs/editor/common/modes';
|
import { TextEdit, IInplaceReplaceSupportResult } from 'vs/editor/common/modes';
|
||||||
import { ResourceMap } from 'vs/base/common/map';
|
import { ResourceMap } from 'vs/base/common/map';
|
||||||
|
import { SideBySideEditorInput } from 'vs/workbench/common/editor/sideBySideEditoInput';
|
||||||
|
|
||||||
export function createFileEditorInput(instantiationService: IInstantiationService, resource: URI): FileEditorInput {
|
export function createFileEditorInput(instantiationService: IInstantiationService, resource: URI): FileEditorInput {
|
||||||
return instantiationService.createInstance(FileEditorInput, resource, undefined, undefined, undefined, undefined, undefined);
|
return instantiationService.createInstance(FileEditorInput, resource, undefined, undefined, undefined, undefined, undefined);
|
||||||
|
@ -1366,7 +1368,7 @@ export function registerTestFileEditor(): IDisposable {
|
||||||
TestTextFileEditor.ID,
|
TestTextFileEditor.ID,
|
||||||
'Text File Editor'
|
'Text File Editor'
|
||||||
),
|
),
|
||||||
[new SyncDescriptor<EditorInput>(FileEditorInput)]
|
[new SyncDescriptor(FileEditorInput)]
|
||||||
));
|
));
|
||||||
|
|
||||||
return disposables;
|
return disposables;
|
||||||
|
@ -1382,8 +1384,8 @@ export function registerTestResourceEditor(): IDisposable {
|
||||||
'Text Editor'
|
'Text Editor'
|
||||||
),
|
),
|
||||||
[
|
[
|
||||||
new SyncDescriptor<EditorInput>(UntitledTextEditorInput),
|
new SyncDescriptor(UntitledTextEditorInput),
|
||||||
new SyncDescriptor<EditorInput>(TextResourceEditorInput)
|
new SyncDescriptor(TextResourceEditorInput)
|
||||||
]
|
]
|
||||||
));
|
));
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue