@opensumi/ide-editor 2.27.3-rc-1708399099.0 → 2.27.3-rc-1710386185.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/browser/breadcrumb/default.d.ts.map +1 -1
- package/lib/browser/breadcrumb/document-symbol.d.ts +2 -2
- package/lib/browser/breadcrumb/document-symbol.d.ts.map +1 -1
- package/lib/browser/breadcrumb/index.d.ts +2 -2
- package/lib/browser/breadcrumb/index.d.ts.map +1 -1
- package/lib/browser/component.d.ts +2 -2
- package/lib/browser/component.d.ts.map +1 -1
- package/lib/browser/decoration-applier.d.ts +2 -2
- package/lib/browser/decoration-applier.d.ts.map +1 -1
- package/lib/browser/decoration-applier.js.map +1 -1
- package/lib/browser/diff/compare.d.ts +3 -3
- package/lib/browser/diff/compare.d.ts.map +1 -1
- package/lib/browser/diff/compare.js +2 -3
- package/lib/browser/diff/compare.js.map +1 -1
- package/lib/browser/diff/index.d.ts +1 -1
- package/lib/browser/diff/index.d.ts.map +1 -1
- package/lib/browser/diff/index.js.map +1 -1
- package/lib/browser/doc-cache/local-storage-cache.d.ts +1 -1
- package/lib/browser/doc-cache/local-storage-cache.d.ts.map +1 -1
- package/lib/browser/doc-model/editor-document-model-service.d.ts +3 -2
- package/lib/browser/doc-model/editor-document-model-service.d.ts.map +1 -1
- package/lib/browser/doc-model/editor-document-model-service.js.map +1 -1
- package/lib/browser/doc-model/editor-document-model.d.ts +3 -2
- package/lib/browser/doc-model/editor-document-model.d.ts.map +1 -1
- package/lib/browser/doc-model/editor-document-model.js.map +1 -1
- package/lib/browser/doc-model/editor-document-registry.d.ts +2 -2
- package/lib/browser/doc-model/editor-document-registry.d.ts.map +1 -1
- package/lib/browser/doc-model/editor-is-fn.d.ts +1 -1
- package/lib/browser/doc-model/editor-is-fn.d.ts.map +1 -1
- package/lib/browser/doc-model/override.d.ts +1 -1
- package/lib/browser/doc-model/override.d.ts.map +1 -1
- package/lib/browser/doc-model/save-task.d.ts +1 -1
- package/lib/browser/doc-model/save-task.d.ts.map +1 -1
- package/lib/browser/doc-model/saveParticipants.d.ts.map +1 -1
- package/lib/browser/doc-model/saveParticipants.js +1 -1
- package/lib/browser/doc-model/saveParticipants.js.map +1 -1
- package/lib/browser/doc-model/types.d.ts +3 -75
- package/lib/browser/doc-model/types.d.ts.map +1 -1
- package/lib/browser/doc-model/types.js.map +1 -1
- package/lib/browser/editor-collection.service.d.ts +6 -5
- package/lib/browser/editor-collection.service.d.ts.map +1 -1
- package/lib/browser/editor-collection.service.js +5 -6
- package/lib/browser/editor-collection.service.js.map +1 -1
- package/lib/browser/editor-electron.contribution.d.ts +1 -1
- package/lib/browser/editor-electron.contribution.d.ts.map +1 -1
- package/lib/browser/editor-opener.d.ts +1 -1
- package/lib/browser/editor-opener.d.ts.map +1 -1
- package/lib/browser/editor.contribution.d.ts +3 -5
- package/lib/browser/editor.contribution.d.ts.map +1 -1
- package/lib/browser/editor.contribution.js +4 -10
- package/lib/browser/editor.contribution.js.map +1 -1
- package/lib/browser/editor.decoration.service.d.ts +2 -2
- package/lib/browser/editor.decoration.service.d.ts.map +1 -1
- package/lib/browser/editor.module.less +12 -0
- package/lib/browser/editor.override.d.ts +3 -3
- package/lib/browser/editor.override.d.ts.map +1 -1
- package/lib/browser/editor.override.js +7 -10
- package/lib/browser/editor.override.js.map +1 -1
- package/lib/browser/editor.status-bar.service.d.ts +1 -1
- package/lib/browser/editor.status-bar.service.d.ts.map +1 -1
- package/lib/browser/editor.status-bar.service.js.map +1 -1
- package/lib/browser/editor.tab.service.d.ts +8 -0
- package/lib/browser/editor.tab.service.d.ts.map +1 -0
- package/lib/browser/editor.tab.service.js +19 -0
- package/lib/browser/editor.tab.service.js.map +1 -0
- package/lib/browser/editor.view.d.ts.map +1 -1
- package/lib/browser/editor.view.js +9 -6
- package/lib/browser/editor.view.js.map +1 -1
- package/lib/browser/feature.d.ts +2 -2
- package/lib/browser/feature.d.ts.map +1 -1
- package/lib/browser/format/format.service.d.ts.map +1 -1
- package/lib/browser/fs-resource/fs-editor-doc.d.ts +1 -1
- package/lib/browser/fs-resource/fs-editor-doc.d.ts.map +1 -1
- package/lib/browser/fs-resource/fs-resource.d.ts +3 -3
- package/lib/browser/fs-resource/fs-resource.d.ts.map +1 -1
- package/lib/browser/fs-resource/fs-resource.js +1 -2
- package/lib/browser/fs-resource/fs-resource.js.map +1 -1
- package/lib/browser/grid/grid.service.d.ts +2 -2
- package/lib/browser/grid/grid.service.d.ts.map +1 -1
- package/lib/browser/history/index.d.ts +1 -1
- package/lib/browser/history/index.d.ts.map +1 -1
- package/lib/browser/index.d.ts +4 -4
- package/lib/browser/index.d.ts.map +1 -1
- package/lib/browser/index.js +8 -3
- package/lib/browser/index.js.map +1 -1
- package/lib/browser/language/diagnostic-collection.d.ts +1 -1
- package/lib/browser/language/diagnostic-collection.d.ts.map +1 -1
- package/lib/browser/language/language-status.contribution.d.ts.map +1 -1
- package/lib/browser/language/language-status.service.d.ts +1 -1
- package/lib/browser/language/language-status.service.d.ts.map +1 -1
- package/lib/browser/language/language.service.d.ts +2 -2
- package/lib/browser/language/language.service.d.ts.map +1 -1
- package/lib/browser/menu/breadcrumbs.menus.d.ts.map +1 -1
- package/lib/browser/menu/breadcrumbs.menus.js.map +1 -1
- package/lib/browser/menu/editor.context.d.ts.map +1 -1
- package/lib/browser/menu/editor.menu.d.ts +1 -1
- package/lib/browser/menu/editor.menu.d.ts.map +1 -1
- package/lib/browser/menu/open-type-menu.contribution.d.ts.map +1 -1
- package/lib/browser/merge-editor/MergeEditorFloatComponents.d.ts.map +1 -1
- package/lib/browser/merge-editor/MergeEditorFloatComponents.js +2 -3
- package/lib/browser/merge-editor/MergeEditorFloatComponents.js.map +1 -1
- package/lib/browser/merge-editor/merge-editor.provider.d.ts +2 -2
- package/lib/browser/merge-editor/merge-editor.provider.d.ts.map +1 -1
- package/lib/browser/monaco-contrib/callHierarchy/callHierarchy.contribution.d.ts.map +1 -1
- package/lib/browser/monaco-contrib/callHierarchy/callHierarchy.service.d.ts +0 -1
- package/lib/browser/monaco-contrib/callHierarchy/callHierarchy.service.d.ts.map +1 -1
- package/lib/browser/monaco-contrib/command/command.service.d.ts +1 -1
- package/lib/browser/monaco-contrib/command/command.service.d.ts.map +1 -1
- package/lib/browser/monaco-contrib/command/command.service.js +1 -1
- package/lib/browser/monaco-contrib/command/command.service.js.map +1 -1
- package/lib/browser/monaco-contrib/tokenizer/textmate-registry.d.ts.map +1 -1
- package/lib/browser/monaco-contrib/tokenizer/textmate-tokenizer.d.ts +1 -1
- package/lib/browser/monaco-contrib/tokenizer/textmate-tokenizer.d.ts.map +1 -1
- package/lib/browser/monaco-contrib/tokenizer/textmate.service.d.ts +2 -3
- package/lib/browser/monaco-contrib/tokenizer/textmate.service.d.ts.map +1 -1
- package/lib/browser/monaco-contrib/tokenizer/textmate.service.js.map +1 -1
- package/lib/browser/monaco-contrib/typeHierarchy/typeHierarchy.contribution.d.ts.map +1 -1
- package/lib/browser/monaco-contrib/typeHierarchy/typeHierarchy.service.d.ts +1 -1
- package/lib/browser/monaco-contrib/typeHierarchy/typeHierarchy.service.d.ts.map +1 -1
- package/lib/browser/navigation.view.d.ts.map +1 -1
- package/lib/browser/navigation.view.js +12 -9
- package/lib/browser/navigation.view.js.map +1 -1
- package/lib/browser/preference/contribution.d.ts.map +1 -1
- package/lib/browser/preference/converter.d.ts.map +1 -1
- package/lib/browser/preference/converter.js +19 -0
- package/lib/browser/preference/converter.js.map +1 -1
- package/lib/browser/preference/schema.d.ts +2 -1
- package/lib/browser/preference/schema.d.ts.map +1 -1
- package/lib/browser/preference/schema.js +12 -0
- package/lib/browser/preference/schema.js.map +1 -1
- package/lib/browser/preference/util.d.ts.map +1 -1
- package/lib/browser/quick-open/go-to-line.d.ts +1 -1
- package/lib/browser/quick-open/go-to-line.d.ts.map +1 -1
- package/lib/browser/quick-open/workspace-symbol-quickopen.d.ts +3 -4
- package/lib/browser/quick-open/workspace-symbol-quickopen.d.ts.map +1 -1
- package/lib/browser/quick-open/workspace-symbol-quickopen.js.map +1 -1
- package/lib/browser/resource.service.d.ts +2 -2
- package/lib/browser/resource.service.d.ts.map +1 -1
- package/lib/browser/tab.view.d.ts.map +1 -1
- package/lib/browser/tab.view.js +91 -68
- package/lib/browser/tab.view.js.map +1 -1
- package/lib/browser/types.d.ts +8 -3
- package/lib/browser/types.d.ts.map +1 -1
- package/lib/browser/types.js +2 -1
- package/lib/browser/types.js.map +1 -1
- package/lib/browser/untitled-resource.d.ts +2 -2
- package/lib/browser/untitled-resource.d.ts.map +1 -1
- package/lib/browser/view/editor.react.d.ts.map +1 -1
- package/lib/browser/view/editor.react.js.map +1 -1
- package/lib/browser/view/suggest-widget.d.ts +1 -2
- package/lib/browser/view/suggest-widget.d.ts.map +1 -1
- package/lib/browser/view/suggest-widget.js +5 -6
- package/lib/browser/view/suggest-widget.js.map +1 -1
- package/lib/browser/workbench-editor.service.d.ts +12 -11
- package/lib/browser/workbench-editor.service.d.ts.map +1 -1
- package/lib/browser/workbench-editor.service.js +51 -52
- package/lib/browser/workbench-editor.service.js.map +1 -1
- package/lib/common/doc-cache.d.ts +1 -1
- package/lib/common/doc-cache.d.ts.map +1 -1
- package/lib/common/doc-cache.js.map +1 -1
- package/lib/common/editor.d.ts +78 -5
- package/lib/common/editor.d.ts.map +1 -1
- package/lib/common/editor.js.map +1 -1
- package/lib/common/language-status.d.ts +2 -2
- package/lib/common/language-status.d.ts.map +1 -1
- package/lib/common/language-status.js.map +1 -1
- package/lib/common/language.d.ts +1 -3
- package/lib/common/language.d.ts.map +1 -1
- package/lib/common/language.js.map +1 -1
- package/lib/common/mocks/workbench-editor.service.d.ts +3 -3
- package/lib/common/mocks/workbench-editor.service.d.ts.map +1 -1
- package/lib/common/mocks/workbench-editor.service.js +1 -0
- package/lib/common/mocks/workbench-editor.service.js.map +1 -1
- package/lib/common/resource.d.ts +1 -1
- package/lib/common/resource.d.ts.map +1 -1
- package/package.json +13 -13
- package/src/browser/breadcrumb/default.ts +3 -3
- package/src/browser/breadcrumb/document-symbol.ts +7 -7
- package/src/browser/breadcrumb/index.ts +3 -3
- package/src/browser/component.ts +5 -5
- package/src/browser/decoration-applier.ts +8 -7
- package/src/browser/diff/compare.ts +10 -10
- package/src/browser/diff/index.ts +12 -12
- package/src/browser/doc-cache/local-storage-cache.ts +2 -2
- package/src/browser/doc-model/editor-document-model-service.ts +14 -13
- package/src/browser/doc-model/editor-document-model.ts +12 -12
- package/src/browser/doc-model/editor-document-registry.ts +4 -4
- package/src/browser/doc-model/editor-is-fn.ts +1 -1
- package/src/browser/doc-model/override.ts +1 -1
- package/src/browser/doc-model/save-task.ts +5 -5
- package/src/browser/doc-model/saveParticipants.ts +10 -12
- package/src/browser/doc-model/types.ts +6 -102
- package/src/browser/editor-collection.service.ts +26 -29
- package/src/browser/editor-electron.contribution.ts +5 -5
- package/src/browser/editor-opener.ts +2 -2
- package/src/browser/editor.contribution.ts +34 -39
- package/src/browser/editor.decoration.service.ts +7 -7
- package/src/browser/editor.module.less +12 -0
- package/src/browser/editor.override.ts +12 -14
- package/src/browser/editor.status-bar.service.ts +4 -5
- package/src/browser/editor.tab.service.ts +16 -0
- package/src/browser/editor.view.tsx +14 -10
- package/src/browser/feature.ts +3 -3
- package/src/browser/format/format.service.ts +2 -2
- package/src/browser/format/formatterSelect.ts +2 -2
- package/src/browser/fs-resource/fs-editor-doc.ts +8 -8
- package/src/browser/fs-resource/fs-resource.ts +6 -7
- package/src/browser/grid/grid.service.ts +2 -2
- package/src/browser/history/index.ts +6 -6
- package/src/browser/index.ts +19 -13
- package/src/browser/language/diagnostic-collection.ts +2 -2
- package/src/browser/language/language-status.contribution.ts +2 -2
- package/src/browser/language/language-status.service.ts +2 -2
- package/src/browser/language/language.service.ts +6 -6
- package/src/browser/menu/breadcrumbs.menus.ts +2 -6
- package/src/browser/menu/editor.context.ts +1 -1
- package/src/browser/menu/editor.menu.ts +3 -3
- package/src/browser/menu/open-type-menu.contribution.ts +3 -3
- package/src/browser/menu/title-context.menu.ts +1 -1
- package/src/browser/merge-editor/MergeEditorFloatComponents.tsx +8 -2
- package/src/browser/merge-editor/merge-editor.provider.ts +3 -3
- package/src/browser/monaco-contrib/callHierarchy/callHierarchy.contribution.ts +2 -2
- package/src/browser/monaco-contrib/callHierarchy/callHierarchy.service.ts +3 -3
- package/src/browser/monaco-contrib/command/command.service.ts +9 -9
- package/src/browser/monaco-contrib/tokenizer/textmate-registry.ts +2 -2
- package/src/browser/monaco-contrib/tokenizer/textmate-tokenizer.ts +1 -1
- package/src/browser/monaco-contrib/tokenizer/textmate.service.ts +19 -17
- package/src/browser/monaco-contrib/typeHierarchy/typeHierarchy.contribution.ts +3 -3
- package/src/browser/monaco-contrib/typeHierarchy/typeHierarchy.service.ts +5 -5
- package/src/browser/navigation.view.tsx +25 -16
- package/src/browser/preference/contribution.ts +1 -1
- package/src/browser/preference/converter.ts +20 -1
- package/src/browser/preference/schema.ts +22 -4
- package/src/browser/preference/util.ts +1 -1
- package/src/browser/quick-open/go-to-line.ts +3 -3
- package/src/browser/quick-open/workspace-symbol-quickopen.ts +13 -13
- package/src/browser/resource.service.ts +9 -9
- package/src/browser/tab.view.tsx +168 -119
- package/src/browser/types.ts +21 -12
- package/src/browser/untitled-resource.ts +12 -12
- package/src/browser/view/editor.react.tsx +2 -1
- package/src/browser/view/suggest-widget.ts +1 -2
- package/src/browser/workbench-editor.service.ts +59 -60
- package/src/common/doc-cache.ts +2 -1
- package/src/common/editor.ts +109 -10
- package/src/common/language-status.ts +5 -3
- package/src/common/language.ts +2 -2
- package/src/common/mocks/workbench-editor.service.ts +5 -3
- package/src/common/resource.ts +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"suggest-widget.js","sourceRoot":"","sources":["../../../src/browser/view/suggest-widget.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,
|
|
1
|
+
{"version":3,"file":"suggest-widget.js","sourceRoot":"","sources":["../../../src/browser/view/suggest-widget.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,iEAAmG;AACnG,+DAAsD;AACtD,4HAAyH;AAMlH,IAAM,+BAA+B,GAArC,MAAM,+BAA+B;IAO1C,UAAU,CAAC,MAAe;QACxB,MAAM,UAAU,GAAG,IAAI,uCAAoB,EAAE,CAAC;QAC9C,MAAM,iBAAiB,GAAG,MAAM,CAAC,YAAY,CAAC,eAAe,CAAoB,qCAAiB,CAAC,EAAE,CAAC,CAAC;QACvG,IAAI,iBAAiB,IAAI,iBAAiB,CAAC,MAAM,IAAI,iBAAiB,CAAC,MAAM,CAAC,KAAK,EAAE;YACnF,MAAM,aAAa,GAAG,iBAAiB,CAAC,MAAM,CAAC,KAAK,CAAC;YACrD,6EAA6E;YAC7E,UAAU,CAAC,IAAI,CACb,aAAa,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC9B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAChB,IAAI,+BAAY,CAAC;oBACf,SAAS,EAAE,aAAa;oBACxB,IAAI,EAAE,CAAC;iBACR,CAAC,CACH,CAAC;YACJ,CAAC,CAAC,CACH,CAAC;YACF,UAAU,CAAC,IAAI,CACb,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC5B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAChB,IAAI,+BAAY,CAAC;oBACf,SAAS,EAAE,WAAW;oBACtB,IAAI,EAAE,CAAC;iBACR,CAAC,CACH,CAAC;YACJ,CAAC,CAAC,CACH,CAAC;YACF,UAAU,CAAC,IAAI,CACb,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC5B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAChB,IAAI,+BAAY,CAAC;oBACf,SAAS,EAAE,WAAW;oBACtB,IAAI,EAAE,CAAC;iBACR,CAAC,CACH,CAAC;YACJ,CAAC,CAAC,CACH,CAAC;YACF,UAAU,CAAC,IAAI,CACb,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC7B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAChB,IAAI,+BAAY,CAAC;oBACf,SAAS,EAAE,YAAY;oBACvB,IAAI,EAAE,CAAC;iBACR,CAAC,CACH,CAAC;YACJ,CAAC,CAAC,CACH,CAAC;YAEF;;eAEG;YACH,aAAa;YACb,IAAI,aAAa,IAAI,aAAa,CAAC,kBAAkB,EAAE;gBACrD,aAAa;gBACb,aAAa,CAAC,kBAAkB,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,gCAAgC,EAAE,IAAI,CAAC,CAAC,CAAC;aACtG;SACF;QAED,OAAO,UAAU,CAAC;IACpB,CAAC;CACF,CAAA;AAjEC;IAAC,IAAA,cAAS,EAAC,2BAAS,CAAC;;iEACgB;AAErC;IAAC,IAAA,cAAS,EAAC,oCAAiB,CAAC;;0EAC2B;AAL7C,+BAA+B;IAD3C,IAAA,eAAU,GAAE;GACA,+BAA+B,CAkE3C;AAlEY,0EAA+B"}
|
|
@@ -1,14 +1,15 @@
|
|
|
1
|
-
import { AppConfig, IContextKeyService, IScopedContextKeyService, PreferenceService
|
|
1
|
+
import { AppConfig, IContextKeyService, IOpenerService, IScopedContextKeyService, PreferenceService } from '@opensumi/ide-core-browser';
|
|
2
2
|
import { IMergeEditorEditor } from '@opensumi/ide-core-browser/lib/monaco/merge-editor-widget';
|
|
3
|
-
import {
|
|
3
|
+
import { Deferred, Emitter, Event, ILogger, IStorage, MaybeNull, StorageProvider, URI, WithEventBus } from '@opensumi/ide-core-common';
|
|
4
4
|
import { IDialogService } from '@opensumi/ide-overlay';
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
7
|
-
import {
|
|
8
|
-
import {
|
|
5
|
+
import { CursorStatus, EditorCollectionService, EditorGroupSplitAction, ICodeEditor, IDiffEditor, IEditor, IEditorGroup, IEditorGroupState, IEditorOpenType, IOpenResourceResult, IResource, IResourceOpenOptions, IUntitledOptions, ResourceDecorationChangeEvent, ResourceService, SaveReason, WorkbenchEditorService } from '../common';
|
|
6
|
+
import { IEditorDocumentModelRef } from '../common/editor';
|
|
7
|
+
import { IEditorDocumentModelService } from './doc-model/types';
|
|
8
|
+
import { EditorGrid, IGridEditorGroup } from './grid/grid.service';
|
|
9
|
+
import { DragOverPosition, EditorComponentRegistry, EditorGroupChangeEvent, EditorGroupCloseEvent, IEditorComponent, ResourceOpenTypeChangedEvent } from './types';
|
|
9
10
|
export declare class WorkbenchEditorServiceImpl extends WithEventBus implements WorkbenchEditorService {
|
|
10
11
|
editorGroups: EditorGroup[];
|
|
11
|
-
_onDidEditorGroupsChanged:
|
|
12
|
+
_onDidEditorGroupsChanged: Emitter<void>;
|
|
12
13
|
onDidEditorGroupsChanged: Event<void>;
|
|
13
14
|
private _sortedEditorGroups;
|
|
14
15
|
private injector;
|
|
@@ -107,22 +108,22 @@ export declare class EditorGroup extends WithEventBus implements IGridEditorGrou
|
|
|
107
108
|
diffEditor: IDiffEditor;
|
|
108
109
|
mergeEditor: IMergeEditorEditor;
|
|
109
110
|
private openingPromise;
|
|
110
|
-
_onDidEditorFocusChange:
|
|
111
|
+
_onDidEditorFocusChange: Emitter<void>;
|
|
111
112
|
onDidEditorFocusChange: Event<void>;
|
|
112
113
|
/**
|
|
113
114
|
* 当编辑器的tab部分发生变更
|
|
114
115
|
*/
|
|
115
|
-
_onDidEditorGroupTabChanged:
|
|
116
|
+
_onDidEditorGroupTabChanged: Emitter<void>;
|
|
116
117
|
onDidEditorGroupTabChanged: Event<void>;
|
|
117
118
|
/**
|
|
118
119
|
* 当编辑器的主体部分发生变更
|
|
119
120
|
*/
|
|
120
|
-
_onDidEditorGroupBodyChanged:
|
|
121
|
+
_onDidEditorGroupBodyChanged: Emitter<void>;
|
|
121
122
|
onDidEditorGroupBodyChanged: Event<void>;
|
|
122
123
|
/**
|
|
123
124
|
* 当编辑器有内容处于加载状态
|
|
124
125
|
*/
|
|
125
|
-
_onDidEditorGroupContentLoading:
|
|
126
|
+
_onDidEditorGroupContentLoading: Emitter<IResource<any>>;
|
|
126
127
|
onDidEditorGroupContentLoading: Event<IResource>;
|
|
127
128
|
/**
|
|
128
129
|
* 每个group只能有一个preview
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workbench-editor.service.d.ts","sourceRoot":"","sources":["../../src/browser/workbench-editor.service.ts"],"names":[],"mappings":"AAGA,OAAO,
|
|
1
|
+
{"version":3,"file":"workbench-editor.service.d.ts","sourceRoot":"","sources":["../../src/browser/workbench-editor.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,6 @@ const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
|
8
8
|
const resource_1 = require("@opensumi/ide-core-browser/lib/contextkey/resource");
|
|
9
9
|
const merge_editor_widget_1 = require("@opensumi/ide-core-browser/lib/monaco/merge-editor-widget");
|
|
10
10
|
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
11
|
-
const ide_core_common_2 = require("@opensumi/ide-core-common");
|
|
12
11
|
const ide_overlay_1 = require("@opensumi/ide-overlay");
|
|
13
12
|
const monaco = tslib_1.__importStar(require("@opensumi/monaco-editor-core/esm/vs/editor/editor.api"));
|
|
14
13
|
const common_1 = require("../common");
|
|
@@ -19,26 +18,26 @@ const types_2 = require("./types");
|
|
|
19
18
|
const untitled_resource_1 = require("./untitled-resource");
|
|
20
19
|
const MAX_CONFIRM_RESOURCES = 10;
|
|
21
20
|
const couldRevive = (r) => !!(r.supportsRevive && !r.deleted);
|
|
22
|
-
let WorkbenchEditorServiceImpl = class WorkbenchEditorServiceImpl extends
|
|
21
|
+
let WorkbenchEditorServiceImpl = class WorkbenchEditorServiceImpl extends ide_core_common_1.WithEventBus {
|
|
23
22
|
constructor() {
|
|
24
23
|
super();
|
|
25
24
|
this.editorGroups = [];
|
|
26
|
-
this._onDidEditorGroupsChanged = new
|
|
25
|
+
this._onDidEditorGroupsChanged = new ide_core_common_1.Emitter();
|
|
27
26
|
this.onDidEditorGroupsChanged = this._onDidEditorGroupsChanged.event;
|
|
28
27
|
this._sortedEditorGroups = [];
|
|
29
|
-
this._onActiveResourceChange = new
|
|
28
|
+
this._onActiveResourceChange = new ide_core_common_1.Emitter();
|
|
30
29
|
this.onActiveResourceChange = this._onActiveResourceChange.event;
|
|
31
|
-
this._onActiveEditorUriChange = new
|
|
30
|
+
this._onActiveEditorUriChange = new ide_core_common_1.Emitter();
|
|
32
31
|
this.onActiveEditorUriChange = this._onActiveEditorUriChange.event;
|
|
33
|
-
this._onCursorChange = new
|
|
32
|
+
this._onCursorChange = new ide_core_common_1.Emitter();
|
|
34
33
|
this.onCursorChange = this._onCursorChange.event;
|
|
35
|
-
this._onDidCurrentEditorGroupChanged = new
|
|
34
|
+
this._onDidCurrentEditorGroupChanged = new ide_core_common_1.Emitter();
|
|
36
35
|
this.onDidCurrentEditorGroupChanged = this._onDidCurrentEditorGroupChanged.event;
|
|
37
36
|
this._restoring = true;
|
|
38
|
-
this.contributionsReady = new
|
|
37
|
+
this.contributionsReady = new ide_core_common_1.Deferred();
|
|
39
38
|
this.untitledCloseIndex = [];
|
|
40
39
|
this.gridReady = false;
|
|
41
|
-
this._onDidGridReady = new
|
|
40
|
+
this._onDidGridReady = new ide_core_common_1.Emitter();
|
|
42
41
|
this.onDidGridReady = this._onDidGridReady.event;
|
|
43
42
|
this.initialize();
|
|
44
43
|
}
|
|
@@ -103,7 +102,7 @@ let WorkbenchEditorServiceImpl = class WorkbenchEditorServiceImpl extends ide_co
|
|
|
103
102
|
createEditorGroup() {
|
|
104
103
|
const editorGroup = this.injector.get(EditorGroup, [this.generateRandomEditorGroupName()]);
|
|
105
104
|
this.editorGroups.push(editorGroup);
|
|
106
|
-
const currentWatchDisposer = new
|
|
105
|
+
const currentWatchDisposer = new ide_core_common_1.Disposable(editorGroup.onDidEditorGroupBodyChanged(() => {
|
|
107
106
|
if (editorGroup === this.currentEditorGroup) {
|
|
108
107
|
if (!editorGroup.currentOpenType && editorGroup.currentResource) {
|
|
109
108
|
// 暂时状态,不发事件
|
|
@@ -147,9 +146,9 @@ let WorkbenchEditorServiceImpl = class WorkbenchEditorServiceImpl extends ide_co
|
|
|
147
146
|
* 随机生成一个不重复的editor Group
|
|
148
147
|
*/
|
|
149
148
|
generateRandomEditorGroupName() {
|
|
150
|
-
let name = (0,
|
|
149
|
+
let name = (0, ide_core_common_1.makeRandomHexString)(5);
|
|
151
150
|
while (this.editorGroups.findIndex((g) => g.name === name) !== -1) {
|
|
152
|
-
name = (0,
|
|
151
|
+
name = (0, ide_core_common_1.makeRandomHexString)(5);
|
|
153
152
|
}
|
|
154
153
|
return name;
|
|
155
154
|
}
|
|
@@ -166,7 +165,7 @@ let WorkbenchEditorServiceImpl = class WorkbenchEditorServiceImpl extends ide_co
|
|
|
166
165
|
this._currentEditorGroup = this.editorGroups[0];
|
|
167
166
|
}
|
|
168
167
|
async initializeState() {
|
|
169
|
-
const state = await this.getStorage(
|
|
168
|
+
const state = await this.getStorage(ide_core_common_1.STORAGE_NAMESPACE.WORKBENCH);
|
|
170
169
|
return state;
|
|
171
170
|
}
|
|
172
171
|
get currentEditor() {
|
|
@@ -365,10 +364,10 @@ let WorkbenchEditorServiceImpl = class WorkbenchEditorServiceImpl extends ide_co
|
|
|
365
364
|
filesDetail += (0, ide_core_common_1.localize)('file.prompt.more.one');
|
|
366
365
|
}
|
|
367
366
|
else {
|
|
368
|
-
filesDetail += (0,
|
|
367
|
+
filesDetail += (0, ide_core_common_1.formatLocalize)('file.prompt.more.number', toClose.length - MAX_CONFIRM_RESOURCES);
|
|
369
368
|
}
|
|
370
369
|
}
|
|
371
|
-
const selection = await this.dialogService.open((0, ide_core_browser_1.toMarkdown)((0,
|
|
370
|
+
const selection = await this.dialogService.open((0, ide_core_browser_1.toMarkdown)((0, ide_core_common_1.formatLocalize)('saveNFilesChangesMessage', toClose.length, filesDetail), this.openner), ide_core_common_1.MessageType.Info, Object.keys(buttons));
|
|
372
371
|
const result = buttons[selection];
|
|
373
372
|
if (result === types_2.AskSaveResult.SAVE) {
|
|
374
373
|
await Promise.all(toClose.map((v) => { var _a, _b; return (_b = (_a = this.resourceService).close) === null || _b === void 0 ? void 0 : _b.call(_a, v.resource, types_2.AskSaveResult.SAVE); }));
|
|
@@ -401,7 +400,7 @@ let WorkbenchEditorServiceImpl = class WorkbenchEditorServiceImpl extends ide_co
|
|
|
401
400
|
createUntitledURI() {
|
|
402
401
|
// 优先从已删除的 index 中获取
|
|
403
402
|
const index = this.untitledCloseIndex.shift() || this.untitledIndex.id;
|
|
404
|
-
return new
|
|
403
|
+
return new ide_core_common_1.URI().withScheme(ide_core_common_1.Schemes.untitled).withQuery(`name=Untitled-${index}&index=${index}`);
|
|
405
404
|
}
|
|
406
405
|
createUntitledResource(options = {
|
|
407
406
|
uri: this.createUntitledURI(),
|
|
@@ -418,7 +417,7 @@ tslib_1.__decorate([
|
|
|
418
417
|
tslib_1.__metadata("design:type", common_1.ResourceService)
|
|
419
418
|
], WorkbenchEditorServiceImpl.prototype, "resourceService", void 0);
|
|
420
419
|
tslib_1.__decorate([
|
|
421
|
-
(0, di_1.Autowired)(
|
|
420
|
+
(0, di_1.Autowired)(ide_core_common_1.StorageProvider),
|
|
422
421
|
tslib_1.__metadata("design:type", Function)
|
|
423
422
|
], WorkbenchEditorServiceImpl.prototype, "getStorage", void 0);
|
|
424
423
|
tslib_1.__decorate([
|
|
@@ -442,13 +441,13 @@ tslib_1.__decorate([
|
|
|
442
441
|
tslib_1.__metadata("design:type", untitled_resource_1.UntitledDocumentIdCounter)
|
|
443
442
|
], WorkbenchEditorServiceImpl.prototype, "untitledIndex", void 0);
|
|
444
443
|
tslib_1.__decorate([
|
|
445
|
-
(0,
|
|
444
|
+
(0, ide_core_common_1.OnEvent)(types_2.EditorGroupChangeEvent),
|
|
446
445
|
tslib_1.__metadata("design:type", Function),
|
|
447
446
|
tslib_1.__metadata("design:paramtypes", [types_2.EditorGroupChangeEvent]),
|
|
448
447
|
tslib_1.__metadata("design:returntype", void 0)
|
|
449
448
|
], WorkbenchEditorServiceImpl.prototype, "onEditorGroupChangeEvent", null);
|
|
450
449
|
tslib_1.__decorate([
|
|
451
|
-
(0,
|
|
450
|
+
(0, ide_core_common_1.OnEvent)(types_2.EditorGroupCloseEvent),
|
|
452
451
|
tslib_1.__metadata("design:type", Function),
|
|
453
452
|
tslib_1.__metadata("design:paramtypes", [types_2.EditorGroupCloseEvent]),
|
|
454
453
|
tslib_1.__metadata("design:returntype", void 0)
|
|
@@ -462,27 +461,27 @@ exports.WorkbenchEditorServiceImpl = WorkbenchEditorServiceImpl;
|
|
|
462
461
|
* Editor Group是一个可视的编辑区域
|
|
463
462
|
* 它由tab,editor,diff-editor,富组件container组成
|
|
464
463
|
*/
|
|
465
|
-
let EditorGroup = class EditorGroup extends
|
|
464
|
+
let EditorGroup = class EditorGroup extends ide_core_common_1.WithEventBus {
|
|
466
465
|
constructor(name) {
|
|
467
466
|
super();
|
|
468
467
|
this.name = name;
|
|
469
468
|
this.openingPromise = new Map();
|
|
470
|
-
this._onDidEditorFocusChange = this.registerDispose(new
|
|
469
|
+
this._onDidEditorFocusChange = this.registerDispose(new ide_core_common_1.Emitter());
|
|
471
470
|
this.onDidEditorFocusChange = this._onDidEditorFocusChange.event;
|
|
472
471
|
/**
|
|
473
472
|
* 当编辑器的tab部分发生变更
|
|
474
473
|
*/
|
|
475
|
-
this._onDidEditorGroupTabChanged = new
|
|
474
|
+
this._onDidEditorGroupTabChanged = new ide_core_common_1.Emitter();
|
|
476
475
|
this.onDidEditorGroupTabChanged = this._onDidEditorGroupTabChanged.event;
|
|
477
476
|
/**
|
|
478
477
|
* 当编辑器的主体部分发生变更
|
|
479
478
|
*/
|
|
480
|
-
this._onDidEditorGroupBodyChanged = new
|
|
479
|
+
this._onDidEditorGroupBodyChanged = new ide_core_common_1.Emitter();
|
|
481
480
|
this.onDidEditorGroupBodyChanged = this._onDidEditorGroupBodyChanged.event;
|
|
482
481
|
/**
|
|
483
482
|
* 当编辑器有内容处于加载状态
|
|
484
483
|
*/
|
|
485
|
-
this._onDidEditorGroupContentLoading = new
|
|
484
|
+
this._onDidEditorGroupContentLoading = new ide_core_common_1.Emitter();
|
|
486
485
|
this.onDidEditorGroupContentLoading = this._onDidEditorGroupContentLoading.event;
|
|
487
486
|
/**
|
|
488
487
|
* 每个group只能有一个preview
|
|
@@ -510,7 +509,7 @@ let EditorGroup = class EditorGroup extends ide_core_common_2.WithEventBus {
|
|
|
510
509
|
this._diffEditorPendingLayout = false;
|
|
511
510
|
this._mergeEditorPendingLayout = false;
|
|
512
511
|
// 当前为EditorComponent,且monaco光标变化时触发
|
|
513
|
-
this._onCurrentEditorCursorChange = new
|
|
512
|
+
this._onCurrentEditorCursorChange = new ide_core_common_1.Emitter();
|
|
514
513
|
this.onCurrentEditorCursorChange = this._onCurrentEditorCursorChange.event;
|
|
515
514
|
this.resourceOpenHistory = [];
|
|
516
515
|
this._domNode = null;
|
|
@@ -518,11 +517,11 @@ let EditorGroup = class EditorGroup extends ide_core_common_2.WithEventBus {
|
|
|
518
517
|
this._diffEditorDomNodeAttached = false;
|
|
519
518
|
this._mergeEditorDomNode = null;
|
|
520
519
|
this._mergeEditorDomNodeAttached = false;
|
|
521
|
-
this.codeEditorReady = new
|
|
522
|
-
this.diffEditorReady = new
|
|
523
|
-
this.diffEditorDomReady = new
|
|
524
|
-
this.mergeEditorReady = new
|
|
525
|
-
this.mergeEditorDomReady = new
|
|
520
|
+
this.codeEditorReady = new ide_core_common_1.ReadyEvent();
|
|
521
|
+
this.diffEditorReady = new ide_core_common_1.ReadyEvent();
|
|
522
|
+
this.diffEditorDomReady = new ide_core_common_1.ReadyEvent();
|
|
523
|
+
this.mergeEditorReady = new ide_core_common_1.ReadyEvent();
|
|
524
|
+
this.mergeEditorDomReady = new ide_core_common_1.ReadyEvent();
|
|
526
525
|
this._restoringState = false;
|
|
527
526
|
this.eventBus.on(ide_core_browser_1.ResizeEvent, (e) => {
|
|
528
527
|
if (e.payload.slotLocation === (0, ide_core_browser_1.getSlotLocation)('@opensumi/ide-editor', this.config.layoutConfig)) {
|
|
@@ -686,7 +685,7 @@ let EditorGroup = class EditorGroup extends ide_core_common_2.WithEventBus {
|
|
|
686
685
|
this._onDidEditorFocusChange.fire();
|
|
687
686
|
}
|
|
688
687
|
};
|
|
689
|
-
this.updateContextKeyWhenEditorChangesFocusDisposer = new
|
|
688
|
+
this.updateContextKeyWhenEditorChangesFocusDisposer = new ide_core_common_1.Disposable(this.diffEditor.modifiedEditor.onFocus(() => {
|
|
690
689
|
this._currentOrPreviousFocusedEditor = this.diffEditor.modifiedEditor;
|
|
691
690
|
this.setContextKeys();
|
|
692
691
|
this._onDidEditorFocusChange.fire();
|
|
@@ -907,7 +906,7 @@ let EditorGroup = class EditorGroup extends ide_core_common_2.WithEventBus {
|
|
|
907
906
|
resource: this.currentResource,
|
|
908
907
|
selections: e.selections,
|
|
909
908
|
source: e.source,
|
|
910
|
-
editorUri:
|
|
909
|
+
editorUri: ide_core_common_1.URI.from(editor.monacoEditor.getModel().uri),
|
|
911
910
|
side,
|
|
912
911
|
}));
|
|
913
912
|
}
|
|
@@ -1081,7 +1080,7 @@ let EditorGroup = class EditorGroup extends ide_core_common_2.WithEventBus {
|
|
|
1081
1080
|
this._currentResource = resource;
|
|
1082
1081
|
// 只有真正打开的文件才会走到这里,backend模式的只更新了tab,文件内容并未加载
|
|
1083
1082
|
const reportTimer = this.reporterService.time(ide_core_common_1.REPORT_NAME.EDITOR_REACTIVE);
|
|
1084
|
-
resourceReady = new
|
|
1083
|
+
resourceReady = new ide_core_common_1.Deferred();
|
|
1085
1084
|
this.resourceStatus.set(resource, resourceReady.promise);
|
|
1086
1085
|
// 超过60ms loading时间的才展示加载
|
|
1087
1086
|
const delayTimer = setTimeout(() => {
|
|
@@ -1116,10 +1115,10 @@ let EditorGroup = class EditorGroup extends ide_core_common_2.WithEventBus {
|
|
|
1116
1115
|
}
|
|
1117
1116
|
}
|
|
1118
1117
|
catch (e) {
|
|
1119
|
-
(0,
|
|
1118
|
+
(0, ide_core_common_1.getDebugLogger)().error(e);
|
|
1120
1119
|
resourceReady && resourceReady.reject();
|
|
1121
1120
|
if (!(0, error_1.isEditorError)(e, error_1.EditorTabChangedError)) {
|
|
1122
|
-
this.messageService.error((0,
|
|
1121
|
+
this.messageService.error((0, ide_core_common_1.formatLocalize)('editor.failToOpen', uri.displayName, e.message), [], true);
|
|
1123
1122
|
}
|
|
1124
1123
|
return false;
|
|
1125
1124
|
// todo 给用户显示error
|
|
@@ -1159,8 +1158,8 @@ let EditorGroup = class EditorGroup extends ide_core_common_2.WithEventBus {
|
|
|
1159
1158
|
disposeDocumentRef(uri) {
|
|
1160
1159
|
if (uri.scheme === 'diff') {
|
|
1161
1160
|
const query = uri.getParsedQuery();
|
|
1162
|
-
this.doDisposeDocRef(new
|
|
1163
|
-
this.doDisposeDocRef(new
|
|
1161
|
+
this.doDisposeDocRef(new ide_core_common_1.URI(query.original));
|
|
1162
|
+
this.doDisposeDocRef(new ide_core_common_1.URI(query.modified));
|
|
1164
1163
|
}
|
|
1165
1164
|
else {
|
|
1166
1165
|
this.doDisposeDocRef(uri);
|
|
@@ -1295,22 +1294,22 @@ let EditorGroup = class EditorGroup extends ide_core_common_2.WithEventBus {
|
|
|
1295
1294
|
const input1Data = merge_editor_widget_1.MergeEditorInputData.from(input1);
|
|
1296
1295
|
const input2Data = merge_editor_widget_1.MergeEditorInputData.from(input2);
|
|
1297
1296
|
const [ancestorRef, input1Ref, outputRef, input2Ref] = await Promise.all([
|
|
1298
|
-
this.getDocumentModelRef(
|
|
1297
|
+
this.getDocumentModelRef(ide_core_common_1.URI.parse(ancestor)),
|
|
1299
1298
|
this.getDocumentModelRef(input1Data.uri),
|
|
1300
|
-
this.getDocumentModelRef(
|
|
1299
|
+
this.getDocumentModelRef(ide_core_common_1.URI.parse(output)),
|
|
1301
1300
|
this.getDocumentModelRef(input2Data.uri),
|
|
1302
1301
|
]);
|
|
1303
1302
|
await this.mergeEditorReady.onceReady(async () => {
|
|
1304
1303
|
await this.mergeEditor.open({
|
|
1305
1304
|
ancestor: {
|
|
1306
|
-
uri:
|
|
1305
|
+
uri: ide_core_common_1.URI.parse(metadata.ancestor),
|
|
1307
1306
|
textModel: ancestorRef.instance.getMonacoModel(),
|
|
1308
1307
|
baseContent: ancestorRef.instance.baseContent || '',
|
|
1309
1308
|
},
|
|
1310
1309
|
input1: input1Data.setTextModel(input1Ref.instance.getMonacoModel()),
|
|
1311
1310
|
input2: input2Data.setTextModel(input2Ref.instance.getMonacoModel()),
|
|
1312
1311
|
output: {
|
|
1313
|
-
uri:
|
|
1312
|
+
uri: ide_core_common_1.URI.parse(metadata.output),
|
|
1314
1313
|
textModel: outputRef.instance.getMonacoModel(),
|
|
1315
1314
|
},
|
|
1316
1315
|
});
|
|
@@ -1346,7 +1345,7 @@ let EditorGroup = class EditorGroup extends ide_core_common_2.WithEventBus {
|
|
|
1346
1345
|
promises.push(g.close(r.uri));
|
|
1347
1346
|
}
|
|
1348
1347
|
});
|
|
1349
|
-
await Promise.all(promises).catch((0,
|
|
1348
|
+
await Promise.all(promises).catch((0, ide_core_common_1.getDebugLogger)().error);
|
|
1350
1349
|
this.activeComponents.set(component, [resource]);
|
|
1351
1350
|
}
|
|
1352
1351
|
}
|
|
@@ -1729,9 +1728,9 @@ let EditorGroup = class EditorGroup extends ide_core_common_2.WithEventBus {
|
|
|
1729
1728
|
}
|
|
1730
1729
|
async restoreState(state) {
|
|
1731
1730
|
this._restoringState = true;
|
|
1732
|
-
this.previewURI = state.uris[state.previewIndex] ? new
|
|
1731
|
+
this.previewURI = state.uris[state.previewIndex] ? new ide_core_common_1.URI(state.uris[state.previewIndex]) : null;
|
|
1733
1732
|
await Promise.all(state.uris.map(async (uri) => {
|
|
1734
|
-
await this.doOpen(new
|
|
1733
|
+
await this.doOpen(new ide_core_common_1.URI(uri), {
|
|
1735
1734
|
disableNavigate: true,
|
|
1736
1735
|
backend: true,
|
|
1737
1736
|
preview: false,
|
|
@@ -1740,11 +1739,11 @@ let EditorGroup = class EditorGroup extends ide_core_common_2.WithEventBus {
|
|
|
1740
1739
|
}));
|
|
1741
1740
|
let targetUri;
|
|
1742
1741
|
if (state.current) {
|
|
1743
|
-
targetUri = new
|
|
1742
|
+
targetUri = new ide_core_common_1.URI(state.current);
|
|
1744
1743
|
}
|
|
1745
1744
|
else {
|
|
1746
1745
|
if (state.uris.length > 0) {
|
|
1747
|
-
targetUri = new
|
|
1746
|
+
targetUri = new ide_core_common_1.URI(state.uris[state.uris.length - 1]);
|
|
1748
1747
|
}
|
|
1749
1748
|
}
|
|
1750
1749
|
if (targetUri) {
|
|
@@ -1881,7 +1880,7 @@ tslib_1.__decorate([
|
|
|
1881
1880
|
tslib_1.__metadata("design:type", Object)
|
|
1882
1881
|
], EditorGroup.prototype, "documentModelManager", void 0);
|
|
1883
1882
|
tslib_1.__decorate([
|
|
1884
|
-
(0, di_1.Autowired)(
|
|
1883
|
+
(0, di_1.Autowired)(ide_core_common_1.CommandService),
|
|
1885
1884
|
tslib_1.__metadata("design:type", Object)
|
|
1886
1885
|
], EditorGroup.prototype, "commands", void 0);
|
|
1887
1886
|
tslib_1.__decorate([
|
|
@@ -1897,7 +1896,7 @@ tslib_1.__decorate([
|
|
|
1897
1896
|
tslib_1.__metadata("design:type", Object)
|
|
1898
1897
|
], EditorGroup.prototype, "messageService", void 0);
|
|
1899
1898
|
tslib_1.__decorate([
|
|
1900
|
-
(0, di_1.Autowired)(
|
|
1899
|
+
(0, di_1.Autowired)(ide_core_common_1.IReporterService),
|
|
1901
1900
|
tslib_1.__metadata("design:type", Object)
|
|
1902
1901
|
], EditorGroup.prototype, "reporterService", void 0);
|
|
1903
1902
|
tslib_1.__decorate([
|
|
@@ -1909,7 +1908,7 @@ tslib_1.__decorate([
|
|
|
1909
1908
|
tslib_1.__metadata("design:type", Object)
|
|
1910
1909
|
], EditorGroup.prototype, "openerService", void 0);
|
|
1911
1910
|
tslib_1.__decorate([
|
|
1912
|
-
(0, di_1.Autowired)(
|
|
1911
|
+
(0, di_1.Autowired)(ide_core_common_1.ILogger),
|
|
1913
1912
|
tslib_1.__metadata("design:type", Object)
|
|
1914
1913
|
], EditorGroup.prototype, "logger", void 0);
|
|
1915
1914
|
tslib_1.__decorate([
|
|
@@ -1923,19 +1922,19 @@ tslib_1.__decorate([
|
|
|
1923
1922
|
tslib_1.__metadata("design:returntype", void 0)
|
|
1924
1923
|
], EditorGroup.prototype, "doLayoutEditors", null);
|
|
1925
1924
|
tslib_1.__decorate([
|
|
1926
|
-
(0,
|
|
1925
|
+
(0, ide_core_common_1.OnEvent)(common_1.ResourceDecorationChangeEvent),
|
|
1927
1926
|
tslib_1.__metadata("design:type", Function),
|
|
1928
1927
|
tslib_1.__metadata("design:paramtypes", [common_1.ResourceDecorationChangeEvent]),
|
|
1929
1928
|
tslib_1.__metadata("design:returntype", void 0)
|
|
1930
1929
|
], EditorGroup.prototype, "onResourceDecorationChangeEvent", null);
|
|
1931
1930
|
tslib_1.__decorate([
|
|
1932
|
-
(0,
|
|
1931
|
+
(0, ide_core_common_1.OnEvent)(types_2.ResourceOpenTypeChangedEvent),
|
|
1933
1932
|
tslib_1.__metadata("design:type", Function),
|
|
1934
1933
|
tslib_1.__metadata("design:paramtypes", [types_2.ResourceOpenTypeChangedEvent]),
|
|
1935
1934
|
tslib_1.__metadata("design:returntype", void 0)
|
|
1936
1935
|
], EditorGroup.prototype, "oResourceOpenTypeChangedEvent", null);
|
|
1937
1936
|
tslib_1.__decorate([
|
|
1938
|
-
(0,
|
|
1937
|
+
(0, ide_core_common_1.OnEvent)(types_2.RegisterEditorComponentEvent),
|
|
1939
1938
|
tslib_1.__metadata("design:type", Function),
|
|
1940
1939
|
tslib_1.__metadata("design:paramtypes", []),
|
|
1941
1940
|
tslib_1.__metadata("design:returntype", Promise)
|