@opensumi/ide-editor 2.27.3-next-1707187308.0 → 2.27.3-next-1709176858.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/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 +3 -4
- 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 -4
- package/lib/browser/editor.contribution.d.ts.map +1 -1
- package/lib/browser/editor.contribution.js +4 -5
- 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.override.d.ts +1 -1
- package/lib/browser/editor.override.d.ts.map +1 -1
- 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.view.d.ts.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 +1 -1
- package/lib/browser/index.d.ts.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.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/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 +2 -4
- package/lib/browser/navigation.view.js.map +1 -1
- package/lib/browser/preference/contribution.d.ts.map +1 -1
- package/lib/browser/preference/schema.d.ts +1 -1
- package/lib/browser/preference/schema.d.ts.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 -3
- 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 +5 -8
- package/lib/browser/tab.view.js.map +1 -1
- package/lib/browser/types.d.ts +2 -2
- package/lib/browser/types.d.ts.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 -2
- 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 +9 -9
- package/src/browser/doc-model/types.ts +6 -102
- package/src/browser/editor-collection.service.ts +24 -27
- package/src/browser/editor-electron.contribution.ts +5 -5
- package/src/browser/editor-opener.ts +2 -2
- package/src/browser/editor.contribution.ts +34 -35
- package/src/browser/editor.decoration.service.ts +7 -7
- package/src/browser/editor.override.ts +3 -2
- package/src/browser/editor.status-bar.service.ts +4 -5
- package/src/browser/editor.view.tsx +4 -4
- 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 +10 -10
- 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 +8 -8
- 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 +5 -7
- package/src/browser/preference/contribution.ts +1 -1
- package/src/browser/preference/converter.ts +1 -1
- package/src/browser/preference/schema.ts +4 -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 +24 -27
- package/src/browser/types.ts +12 -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,51 +1,48 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
1
|
+
import { Autowired, INJECTOR_TOKEN, Injectable, Injector } from '@opensumi/di';
|
|
2
|
+
import { IContextKeyService, IRange } from '@opensumi/ide-core-browser';
|
|
3
3
|
import { ResourceContextKey } from '@opensumi/ide-core-browser/lib/contextkey';
|
|
4
4
|
import { MonacoService } from '@opensumi/ide-core-browser/lib/monaco';
|
|
5
5
|
import {
|
|
6
|
+
Disposable,
|
|
7
|
+
Emitter,
|
|
8
|
+
Emitter as EventEmitter,
|
|
6
9
|
ILineChange,
|
|
10
|
+
ISelection,
|
|
11
|
+
OnEvent,
|
|
7
12
|
URI,
|
|
8
13
|
WithEventBus,
|
|
9
|
-
OnEvent,
|
|
10
|
-
Emitter as EventEmitter,
|
|
11
|
-
ISelection,
|
|
12
|
-
Disposable,
|
|
13
|
-
objects,
|
|
14
14
|
isEmptyObject,
|
|
15
|
+
objects,
|
|
15
16
|
} from '@opensumi/ide-core-common';
|
|
16
|
-
import { Emitter } from '@opensumi/ide-core-common';
|
|
17
|
-
import type {
|
|
18
|
-
ICodeEditor as IMonacoCodeEditor,
|
|
19
|
-
IDiffEditor as IMonacoDiffEditor,
|
|
20
|
-
} from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
|
|
21
|
-
import type { IDiffEditorConstructionOptions } from '@opensumi/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
|
|
22
17
|
import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
|
|
23
18
|
import { IConfigurationService } from '@opensumi/monaco-editor-core/esm/vs/platform/configuration/common/configuration';
|
|
24
19
|
|
|
25
20
|
import {
|
|
26
|
-
ICodeEditor,
|
|
27
|
-
IEditor,
|
|
28
|
-
EditorCollectionService,
|
|
29
|
-
IDiffEditor,
|
|
30
|
-
ResourceDecorationNeedChangeEvent,
|
|
31
21
|
CursorStatus,
|
|
32
|
-
|
|
33
|
-
IDecorationApplyOptions,
|
|
22
|
+
EditorCollectionService,
|
|
34
23
|
EditorType,
|
|
24
|
+
ICodeEditor,
|
|
25
|
+
IDecorationApplyOptions,
|
|
26
|
+
IDiffEditor,
|
|
27
|
+
IEditor,
|
|
35
28
|
IResourceOpenOptions,
|
|
29
|
+
IUndoStopOptions,
|
|
30
|
+
ResourceDecorationNeedChangeEvent,
|
|
36
31
|
} from '../common';
|
|
32
|
+
import { IEditorDocumentModel, IEditorDocumentModelRef } from '../common/editor';
|
|
37
33
|
|
|
38
34
|
import { MonacoEditorDecorationApplier } from './decoration-applier';
|
|
39
|
-
import {
|
|
40
|
-
IEditorDocumentModelRef,
|
|
41
|
-
EditorDocumentModelContentChangedEvent,
|
|
42
|
-
IEditorDocumentModelService,
|
|
43
|
-
IEditorDocumentModel,
|
|
44
|
-
} from './doc-model/types';
|
|
35
|
+
import { EditorDocumentModelContentChangedEvent, IEditorDocumentModelService } from './doc-model/types';
|
|
45
36
|
import { EditorFeatureRegistryImpl } from './feature';
|
|
46
|
-
import { getConvertedMonacoOptions,
|
|
37
|
+
import { getConvertedMonacoOptions, isDiffEditorOption, isEditorOption } from './preference/converter';
|
|
47
38
|
import { IEditorFeatureRegistry } from './types';
|
|
48
39
|
|
|
40
|
+
import type {
|
|
41
|
+
ICodeEditor as IMonacoCodeEditor,
|
|
42
|
+
IDiffEditor as IMonacoDiffEditor,
|
|
43
|
+
} from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
|
|
44
|
+
import type { IDiffEditorConstructionOptions } from '@opensumi/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
|
|
45
|
+
|
|
49
46
|
const { removeUndefined } = objects;
|
|
50
47
|
|
|
51
48
|
@Injectable()
|
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
import { Autowired, INJECTOR_TOKEN, Injector } from '@opensumi/di';
|
|
2
2
|
import {
|
|
3
|
-
IClientApp,
|
|
4
3
|
ClientAppContribution,
|
|
4
|
+
Domain,
|
|
5
|
+
EDITOR_COMMANDS,
|
|
6
|
+
IClientApp,
|
|
5
7
|
KeybindingContribution,
|
|
6
8
|
KeybindingRegistry,
|
|
7
|
-
EDITOR_COMMANDS,
|
|
8
|
-
Domain,
|
|
9
9
|
electronEnv,
|
|
10
10
|
} from '@opensumi/ide-core-browser';
|
|
11
|
-
import {
|
|
11
|
+
import { OnEvent, WithEventBus, isOSX } from '@opensumi/ide-core-common';
|
|
12
12
|
import { IElectronMainUIService } from '@opensumi/ide-core-common/lib/electron';
|
|
13
13
|
|
|
14
|
-
import {
|
|
14
|
+
import { IDocPersistentCacheProvider, WorkbenchEditorService } from '../common';
|
|
15
15
|
|
|
16
16
|
import { IEditorDocumentModelContentRegistry } from './doc-model/types';
|
|
17
17
|
import { ResourceDecorationChangeEvent } from './types';
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Autowired, Injectable } from '@opensumi/di';
|
|
2
|
-
import { IOpener,
|
|
2
|
+
import { IOpener, IRange, URI } from '@opensumi/ide-core-browser';
|
|
3
3
|
|
|
4
|
-
import {
|
|
4
|
+
import { ResourceService, WorkbenchEditorService } from '../common';
|
|
5
5
|
|
|
6
6
|
@Injectable()
|
|
7
7
|
export class EditorOpener implements IOpener {
|
|
@@ -1,47 +1,47 @@
|
|
|
1
1
|
import { Autowired, INJECTOR_TOKEN, Injector } from '@opensumi/di';
|
|
2
2
|
import {
|
|
3
|
-
|
|
3
|
+
AppConfig,
|
|
4
4
|
ClientAppContribution,
|
|
5
|
-
KeybindingContribution,
|
|
6
|
-
KeybindingRegistry,
|
|
7
|
-
EDITOR_COMMANDS,
|
|
8
5
|
CommandContribution,
|
|
9
6
|
CommandRegistry,
|
|
10
|
-
URI,
|
|
11
|
-
Domain,
|
|
12
|
-
localize,
|
|
13
|
-
formatLocalize,
|
|
14
|
-
MonacoService,
|
|
15
|
-
ServiceNames,
|
|
16
|
-
MonacoContribution,
|
|
17
7
|
CommandService,
|
|
18
|
-
|
|
19
|
-
IEventBus,
|
|
20
|
-
Schemes,
|
|
21
|
-
PreferenceService,
|
|
8
|
+
CorePreferences,
|
|
22
9
|
Disposable,
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
10
|
+
Domain,
|
|
11
|
+
EDITOR_COMMANDS,
|
|
12
|
+
FILE_COMMANDS,
|
|
13
|
+
IClientApp,
|
|
26
14
|
IClipboardService,
|
|
27
|
-
|
|
15
|
+
IContextKeyService,
|
|
16
|
+
IEventBus,
|
|
17
|
+
IOpenerService,
|
|
18
|
+
IPreferenceSettingsService,
|
|
28
19
|
IQuickOpenHandlerRegistry,
|
|
29
|
-
|
|
20
|
+
KeybindingContribution,
|
|
21
|
+
KeybindingRegistry,
|
|
22
|
+
MonacoContribution,
|
|
30
23
|
MonacoOverrideServiceRegistry,
|
|
31
|
-
|
|
32
|
-
|
|
24
|
+
MonacoService,
|
|
25
|
+
OpenerContribution,
|
|
26
|
+
PreferenceService,
|
|
27
|
+
PrefixQuickOpenService,
|
|
28
|
+
QuickOpenContribution,
|
|
33
29
|
QuickPickItem,
|
|
34
|
-
|
|
30
|
+
QuickPickService,
|
|
35
31
|
SUPPORTED_ENCODINGS,
|
|
36
|
-
|
|
37
|
-
|
|
32
|
+
Schemes,
|
|
33
|
+
ServiceNames,
|
|
34
|
+
URI,
|
|
35
|
+
formatLocalize,
|
|
36
|
+
getLanguageIdFromMonaco,
|
|
37
|
+
localize,
|
|
38
38
|
} from '@opensumi/ide-core-browser';
|
|
39
39
|
import { ComponentContribution, ComponentRegistry } from '@opensumi/ide-core-browser/lib/layout';
|
|
40
|
-
import {
|
|
40
|
+
import { IMenuRegistry, MenuContribution, MenuId } from '@opensumi/ide-core-browser/lib/menu/next';
|
|
41
41
|
import { AbstractContextMenuService } from '@opensumi/ide-core-browser/lib/menu/next/menu.interface';
|
|
42
42
|
import { ICtxMenuRenderer } from '@opensumi/ide-core-browser/lib/menu/next/renderer/ctxmenu/base';
|
|
43
43
|
import { IRelaxedOpenMergeEditorArgs } from '@opensumi/ide-core-browser/lib/monaco/merge-editor-widget';
|
|
44
|
-
import {
|
|
44
|
+
import { ILogger, PreferenceScope, isWindows } from '@opensumi/ide-core-common';
|
|
45
45
|
import { IElectronMainUIService } from '@opensumi/ide-core-common/lib/electron';
|
|
46
46
|
import { MergeEditorService } from '@opensumi/ide-monaco/lib/browser/contrib/merge-editor/merge-editor.service';
|
|
47
47
|
import { ITextmateTokenizer, ITextmateTokenizerService } from '@opensumi/ide-monaco/lib/browser/contrib/tokenizer';
|
|
@@ -52,20 +52,19 @@ import { ContextKeyExpr } from '@opensumi/monaco-editor-core/esm/vs/platform/con
|
|
|
52
52
|
import { SyncDescriptor } from '@opensumi/monaco-editor-core/esm/vs/platform/instantiation/common/descriptors';
|
|
53
53
|
|
|
54
54
|
import {
|
|
55
|
-
WorkbenchEditorService,
|
|
56
|
-
IResourceOpenOptions,
|
|
57
|
-
EditorGroupSplitAction,
|
|
58
|
-
ILanguageService,
|
|
59
55
|
Direction,
|
|
56
|
+
EditorGroupSplitAction,
|
|
60
57
|
IDocPersistentCacheProvider,
|
|
61
58
|
IEditor,
|
|
59
|
+
ILanguageService,
|
|
60
|
+
IResourceOpenOptions,
|
|
62
61
|
SaveReason,
|
|
62
|
+
WorkbenchEditorService,
|
|
63
63
|
} from '../common';
|
|
64
64
|
import { AUTO_SAVE_MODE } from '../common/editor';
|
|
65
65
|
|
|
66
66
|
import { MonacoTextModelService } from './doc-model/override';
|
|
67
|
-
import { IEditorDocumentModelService } from './doc-model/types';
|
|
68
|
-
import { IEditorDocumentModelContentRegistry } from './doc-model/types';
|
|
67
|
+
import { IEditorDocumentModelContentRegistry, IEditorDocumentModelService } from './doc-model/types';
|
|
69
68
|
import { EditorOpener } from './editor-opener';
|
|
70
69
|
import { MonacoCodeService, MonacoContextViewService } from './editor.override';
|
|
71
70
|
import { EditorStatusBarService } from './editor.status-bar.service';
|
|
@@ -77,10 +76,10 @@ import { EditorContextMenuController } from './menu/editor.context';
|
|
|
77
76
|
import { NavigationMenuContainer } from './navigation.view';
|
|
78
77
|
import { GoToLineQuickOpenHandler } from './quick-open/go-to-line';
|
|
79
78
|
import { WorkspaceSymbolQuickOpenHandler } from './quick-open/workspace-symbol-quickopen';
|
|
80
|
-
import {
|
|
79
|
+
import { BrowserEditorContribution, EditorGroupsResetSizeEvent, IEditorFeatureRegistry } from './types';
|
|
81
80
|
import { EditorSuggestWidgetContribution } from './view/suggest-widget';
|
|
82
81
|
import { EditorTopPaddingContribution } from './view/topPadding';
|
|
83
|
-
import {
|
|
82
|
+
import { EditorGroup, WorkbenchEditorServiceImpl } from './workbench-editor.service';
|
|
84
83
|
|
|
85
84
|
interface ResourceArgs {
|
|
86
85
|
group: EditorGroup;
|
|
@@ -1,20 +1,20 @@
|
|
|
1
1
|
import { Autowired, Injectable } from '@opensumi/di';
|
|
2
|
-
import {
|
|
2
|
+
import { Disposable, IDisposable, IEventBus, URI } from '@opensumi/ide-core-browser';
|
|
3
3
|
import { IIconService, IThemeService } from '@opensumi/ide-theme';
|
|
4
4
|
import { ICSSStyleService } from '@opensumi/ide-theme/lib/common/style';
|
|
5
5
|
import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
|
|
6
6
|
|
|
7
|
-
import {
|
|
7
|
+
import { IContentDecorationRenderOptions, IDecorationRenderOptions, IThemeDecorationRenderOptions } from '../common';
|
|
8
8
|
|
|
9
9
|
import {
|
|
10
|
-
|
|
10
|
+
EditorDecorationChangeEvent,
|
|
11
|
+
EditorDecorationProviderRegistrationEvent,
|
|
12
|
+
EditorDecorationTypeRemovedEvent,
|
|
11
13
|
IBrowserTextEditorDecorationType,
|
|
12
14
|
IDynamicModelDecorationProperty,
|
|
13
|
-
|
|
15
|
+
IEditorDecorationCollectionService,
|
|
14
16
|
IEditorDecorationProvider,
|
|
15
|
-
|
|
16
|
-
EditorDecorationChangeEvent,
|
|
17
|
-
EditorDecorationTypeRemovedEvent,
|
|
17
|
+
IThemedCssStyle,
|
|
18
18
|
} from './types';
|
|
19
19
|
|
|
20
20
|
@Injectable()
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { Autowired, Injectable } from '@opensumi/di';
|
|
2
2
|
import { PreferenceService } from '@opensumi/ide-core-browser';
|
|
3
|
-
import {
|
|
4
|
-
import type { ICodeEditor as IMonacoCodeEditor } from '@opensumi/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
|
|
3
|
+
import { IRange, URI } from '@opensumi/ide-core-common';
|
|
5
4
|
import { AbstractCodeEditorService } from '@opensumi/monaco-editor-core/esm/vs/editor/browser/services/abstractCodeEditorService';
|
|
6
5
|
import { ICodeEditorService } from '@opensumi/monaco-editor-core/esm/vs/editor/browser/services/codeEditorService';
|
|
7
6
|
import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
|
|
@@ -16,6 +15,8 @@ import { EditorOpenType, WorkbenchEditorService } from '../common';
|
|
|
16
15
|
import { BrowserCodeEditor } from './editor-collection.service';
|
|
17
16
|
import { WorkbenchEditorServiceImpl } from './workbench-editor.service';
|
|
18
17
|
|
|
18
|
+
import type { ICodeEditor as IMonacoCodeEditor } from '@opensumi/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
|
|
19
|
+
|
|
19
20
|
@Injectable()
|
|
20
21
|
export class MonacoCodeService extends AbstractCodeEditorService {
|
|
21
22
|
@Autowired(WorkbenchEditorService)
|
|
@@ -1,9 +1,8 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
|
|
5
|
-
import { WorkbenchEditorService, IEditor, CursorStatus, ILanguageService } from '../common';
|
|
1
|
+
import { Autowired, Injectable } from '@opensumi/di';
|
|
2
|
+
import { EDITOR_COMMANDS, WithEventBus, localize } from '@opensumi/ide-core-browser';
|
|
3
|
+
import { IStatusBarService, StatusBarAlignment } from '@opensumi/ide-core-browser/lib/services';
|
|
6
4
|
|
|
5
|
+
import { CursorStatus, IEditor, ILanguageService, WorkbenchEditorService } from '../common';
|
|
7
6
|
|
|
8
7
|
import { EditorDocumentModelOptionChangedEvent } from './doc-model/types';
|
|
9
8
|
|
|
@@ -15,8 +15,8 @@ import {
|
|
|
15
15
|
MaybeNull,
|
|
16
16
|
PreferenceService,
|
|
17
17
|
URI,
|
|
18
|
-
useDisposable,
|
|
19
18
|
View,
|
|
19
|
+
useDisposable,
|
|
20
20
|
} from '@opensumi/ide-core-browser';
|
|
21
21
|
import {
|
|
22
22
|
IResizeHandleDelegate,
|
|
@@ -35,16 +35,16 @@ import { EditorGrid, SplitDirection } from './grid/grid.service';
|
|
|
35
35
|
import { NavigationBar } from './navigation.view';
|
|
36
36
|
import { Tabs } from './tab.view';
|
|
37
37
|
import {
|
|
38
|
+
CodeEditorDidVisibleEvent,
|
|
38
39
|
DragOverPosition,
|
|
39
40
|
EditorComponentRegistry,
|
|
40
41
|
EditorComponentRenderMode,
|
|
41
42
|
EditorGroupFileDropEvent,
|
|
42
43
|
EditorGroupsResetSizeEvent,
|
|
43
|
-
|
|
44
|
+
EditorOpenType,
|
|
44
45
|
EditorSide,
|
|
45
46
|
IEditorComponent,
|
|
46
|
-
|
|
47
|
-
EditorOpenType,
|
|
47
|
+
RegisterEditorSideComponentEvent,
|
|
48
48
|
ResoucesOfActiveComponentChangedEvent,
|
|
49
49
|
} from './types';
|
|
50
50
|
import { EditorGroup, WorkbenchEditorServiceImpl } from './workbench-editor.service';
|
package/src/browser/feature.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
1
|
+
import { Autowired, Injectable } from '@opensumi/di';
|
|
2
|
+
import { Emitter, Event, IDisposable, ILogger, URI, arrays } from '@opensumi/ide-core-browser';
|
|
3
3
|
|
|
4
4
|
import { IEditor } from '../common';
|
|
5
5
|
|
|
6
|
-
import {
|
|
6
|
+
import { IEditorFeatureContribution, IEditorFeatureRegistry } from './types';
|
|
7
7
|
|
|
8
8
|
const { addElement } = arrays;
|
|
9
9
|
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Autowired, INJECTOR_TOKEN, Injectable, Injector } from '@opensumi/di';
|
|
2
2
|
import { CancellationToken, ILogger } from '@opensumi/ide-core-common';
|
|
3
3
|
import { languageFeaturesService } from '@opensumi/ide-monaco/lib/browser/monaco-api/languages';
|
|
4
4
|
import { Range } from '@opensumi/monaco-editor-core/esm/vs/editor/common/core/range';
|
|
@@ -7,8 +7,8 @@ import {
|
|
|
7
7
|
DocumentRangeFormattingEditProvider,
|
|
8
8
|
} from '@opensumi/monaco-editor-core/esm/vs/editor/common/languages';
|
|
9
9
|
import {
|
|
10
|
-
getRealAndSyntheticDocumentFormattersOrdered,
|
|
11
10
|
FormattingMode,
|
|
11
|
+
getRealAndSyntheticDocumentFormattersOrdered,
|
|
12
12
|
} from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/format/browser/format';
|
|
13
13
|
import { FormattingEdit } from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/format/browser/formattingEdit';
|
|
14
14
|
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
1
|
+
import { Autowired, Injectable } from '@opensumi/di';
|
|
2
|
+
import { PreferenceScope, PreferenceService, QuickPickService, URI, localize } from '@opensumi/ide-core-browser';
|
|
3
3
|
import { ITextModel } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
|
|
4
4
|
import { FormattingMode } from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/format/browser/format';
|
|
5
5
|
import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
|
|
@@ -1,20 +1,20 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Autowired, Injectable } from '@opensumi/di';
|
|
2
2
|
import {
|
|
3
3
|
Emitter,
|
|
4
|
-
|
|
4
|
+
EncodingRegistry,
|
|
5
5
|
Event,
|
|
6
|
-
IApplicationService,
|
|
7
6
|
FileChangeType,
|
|
8
|
-
|
|
7
|
+
IApplicationService,
|
|
9
8
|
IEditorDocumentChange,
|
|
10
9
|
IEditorDocumentModelSaveResult,
|
|
10
|
+
OperatingSystem,
|
|
11
11
|
PreferenceService,
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
UTF8_with_bom,
|
|
12
|
+
SaveTaskResponseState,
|
|
13
|
+
URI,
|
|
15
14
|
UTF8,
|
|
15
|
+
UTF8_with_bom,
|
|
16
16
|
detectEncodingFromBuffer,
|
|
17
|
-
|
|
17
|
+
getLanguageIdFromMonaco,
|
|
18
18
|
} from '@opensumi/ide-core-browser';
|
|
19
19
|
import { IFileServiceClient } from '@opensumi/ide-file-service';
|
|
20
20
|
import { EOL } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
|
|
@@ -1,21 +1,20 @@
|
|
|
1
1
|
import { Autowired, Injectable } from '@opensumi/di';
|
|
2
2
|
import {
|
|
3
|
+
IApplicationService,
|
|
4
|
+
LRUMap,
|
|
5
|
+
MessageType,
|
|
3
6
|
OperatingSystem,
|
|
4
7
|
URI,
|
|
5
8
|
WithEventBus,
|
|
6
|
-
localize,
|
|
7
9
|
formatLocalize,
|
|
8
|
-
|
|
9
|
-
LRUMap,
|
|
10
|
-
IApplicationService,
|
|
10
|
+
localize,
|
|
11
11
|
} from '@opensumi/ide-core-browser';
|
|
12
12
|
import { LabelService } from '@opensumi/ide-core-browser/lib/services';
|
|
13
13
|
import { FileChangeType, path } from '@opensumi/ide-core-common';
|
|
14
|
-
import {
|
|
14
|
+
import { FileStat, IFileServiceClient } from '@opensumi/ide-file-service/lib/common';
|
|
15
15
|
import { IDialogService } from '@opensumi/ide-overlay';
|
|
16
16
|
|
|
17
|
-
import {
|
|
18
|
-
import { DIFF_SCHEME } from '../../common';
|
|
17
|
+
import { AskSaveResult, DIFF_SCHEME, IResource, IResourceProvider, ResourceNeedUpdateEvent } from '../../common';
|
|
19
18
|
import { IEditorDocumentModelService } from '../doc-model/types';
|
|
20
19
|
|
|
21
20
|
import { FileTreeSet } from './file-tree-set';
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { IDisposable, IEventBus, MaybeNull
|
|
1
|
+
import { Emitter, IDisposable, IEventBus, MaybeNull } from '@opensumi/ide-core-browser';
|
|
2
2
|
import { makeRandomHexString } from '@opensumi/ide-core-common';
|
|
3
3
|
|
|
4
|
-
import { IEditorGroup, IEditorGroupState
|
|
4
|
+
import { Direction, IEditorGroup, IEditorGroupState } from '../../common';
|
|
5
5
|
import { GridResizeEvent } from '../types';
|
|
6
6
|
|
|
7
7
|
export const editorGridUid = new Set();
|
|
@@ -1,17 +1,17 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Autowired, Injectable } from '@opensumi/di';
|
|
2
2
|
import {
|
|
3
|
+
DisposableCollection,
|
|
4
|
+
EventType,
|
|
3
5
|
IPosition,
|
|
4
|
-
URI,
|
|
5
|
-
WithEventBus,
|
|
6
6
|
OnEvent,
|
|
7
7
|
PreferenceService,
|
|
8
|
+
URI,
|
|
9
|
+
WithEventBus,
|
|
8
10
|
addDisposableListener,
|
|
9
|
-
EventType,
|
|
10
|
-
DisposableCollection,
|
|
11
11
|
} from '@opensumi/ide-core-browser';
|
|
12
12
|
|
|
13
13
|
import { WorkbenchEditorService } from '../../common';
|
|
14
|
-
import {
|
|
14
|
+
import { EditorGroupChangeEvent, EditorGroupCloseEvent, EditorOpenType, EditorSelectionChangeEvent } from '../types';
|
|
15
15
|
|
|
16
16
|
const HistoryPositionLineThreshold = 7;
|
|
17
17
|
const HardMaxStateLength = 200; // 超过200个过后,会缩减至100个, 防止反复缩减
|
package/src/browser/index.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Autowired, INJECTOR_TOKEN, Injectable, Injector, Provider } from '@opensumi/di';
|
|
2
2
|
import {
|
|
3
3
|
BrowserModule,
|
|
4
|
-
Domain,
|
|
5
4
|
ClientAppContribution,
|
|
6
5
|
ContributionProvider,
|
|
6
|
+
Domain,
|
|
7
7
|
PreferenceService,
|
|
8
8
|
createPreferenceProxy,
|
|
9
9
|
} from '@opensumi/ide-core-browser';
|
|
@@ -16,20 +16,20 @@ import {
|
|
|
16
16
|
import { ITextmateTokenizer } from '@opensumi/ide-monaco/lib/browser/contrib/tokenizer';
|
|
17
17
|
import { ITypeHierarchyService } from '@opensumi/ide-monaco/lib/browser/contrib/typeHierarchy';
|
|
18
18
|
|
|
19
|
-
import { EditorCollectionService,
|
|
19
|
+
import { EditorCollectionService, ILanguageService, ResourceService, WorkbenchEditorService } from '../common';
|
|
20
20
|
import { IDocPersistentCacheProvider } from '../common/doc-cache';
|
|
21
21
|
|
|
22
22
|
import { BreadCrumbServiceImpl } from './breadcrumb';
|
|
23
23
|
import { EditorComponentRegistryImpl } from './component';
|
|
24
24
|
import { DefaultDiffEditorContribution } from './diff';
|
|
25
|
-
import {
|
|
25
|
+
import { CompareEditorContribution, CompareService } from './diff/compare';
|
|
26
26
|
import { EmptyDocCacheImpl } from './doc-cache';
|
|
27
27
|
import { EditorDocumentModelContentRegistryImpl, EditorDocumentModelServiceImpl } from './doc-model/main';
|
|
28
28
|
import { SaveParticipantsContribution } from './doc-model/saveParticipants';
|
|
29
29
|
import { IEditorDocumentModelContentRegistry, IEditorDocumentModelService } from './doc-model/types';
|
|
30
30
|
import { EditorCollectionServiceImpl } from './editor-collection.service';
|
|
31
31
|
import { EditorElectronContribution } from './editor-electron.contribution';
|
|
32
|
-
import {
|
|
32
|
+
import { EditorAutoSaveEditorContribution, EditorContribution } from './editor.contribution';
|
|
33
33
|
import { EditorDecorationCollectionService } from './editor.decoration.service';
|
|
34
34
|
import { EditorFeatureRegistryImpl } from './feature';
|
|
35
35
|
import { FileSystemResourceContribution } from './fs-resource';
|
|
@@ -42,8 +42,8 @@ import { MergeEditorContribution } from './merge-editor/merge-editor.contributio
|
|
|
42
42
|
import {
|
|
43
43
|
CallHierarchyContribution,
|
|
44
44
|
CallHierarchyService,
|
|
45
|
-
TypeHierarchyService,
|
|
46
45
|
TypeHierarchyContribution,
|
|
46
|
+
TypeHierarchyService,
|
|
47
47
|
} from './monaco-contrib';
|
|
48
48
|
import {
|
|
49
49
|
MonacoActionRegistry,
|
|
@@ -55,12 +55,12 @@ import { EditorPreferenceContribution } from './preference/contribution';
|
|
|
55
55
|
import { EditorPreferences, editorPreferenceSchema } from './preference/schema';
|
|
56
56
|
import { ResourceServiceImpl } from './resource.service';
|
|
57
57
|
import {
|
|
58
|
-
EditorComponentRegistry,
|
|
59
58
|
BrowserEditorContribution,
|
|
60
|
-
|
|
61
|
-
IEditorActionRegistry,
|
|
62
|
-
ICompareService,
|
|
59
|
+
EditorComponentRegistry,
|
|
63
60
|
IBreadCrumbService,
|
|
61
|
+
ICompareService,
|
|
62
|
+
IEditorActionRegistry,
|
|
63
|
+
IEditorDecorationCollectionService,
|
|
64
64
|
IEditorFeatureRegistry,
|
|
65
65
|
ILanguageStatusService,
|
|
66
66
|
} from './types';
|
|
@@ -4,10 +4,10 @@ import IMonacoModel = monaco.editor.IModel;
|
|
|
4
4
|
import IMonacoMarkerData = monaco.editor.IMarkerData;
|
|
5
5
|
|
|
6
6
|
// eslint-disable-next-line import/order
|
|
7
|
-
import {
|
|
7
|
+
import { Disposable, DisposableCollection, IDisposable } from '@opensumi/ide-core-common';
|
|
8
8
|
|
|
9
9
|
// eslint-disable-next-line import/order
|
|
10
|
-
import {
|
|
10
|
+
import { Diagnostic, DiagnosticCollection, asMonacoDiagnostics } from '../../common';
|
|
11
11
|
|
|
12
12
|
export class MonacoDiagnosticCollection implements DiagnosticCollection {
|
|
13
13
|
protected readonly diagnostics = new Map<string, MonacoModelDiagnostics | undefined>();
|
|
@@ -3,13 +3,13 @@ import {
|
|
|
3
3
|
ClientAppContribution,
|
|
4
4
|
Domain,
|
|
5
5
|
IStatusBarService,
|
|
6
|
-
localize,
|
|
7
6
|
Severity,
|
|
8
7
|
StatusBarAlignment,
|
|
9
8
|
WithEventBus,
|
|
9
|
+
localize,
|
|
10
10
|
} from '@opensumi/ide-core-browser';
|
|
11
11
|
|
|
12
|
-
import {
|
|
12
|
+
import { IEditor, ILanguageStatus, ILanguageStatusService, WorkbenchEditorService } from '../../common';
|
|
13
13
|
import { EditorDocumentModelOptionChangedEvent } from '../doc-model/types';
|
|
14
14
|
|
|
15
15
|
@Domain(ClientAppContribution)
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { Injectable } from '@opensumi/di';
|
|
2
|
-
import {
|
|
2
|
+
import { Event, IDisposable, strings } from '@opensumi/ide-core-common';
|
|
3
3
|
import { LanguageFeatureRegistry } from '@opensumi/monaco-editor-core/esm/vs/editor/common/languageFeatureRegistry';
|
|
4
4
|
import { ITextModel } from '@opensumi/monaco-editor-core/esm/vs/editor/common/model';
|
|
5
5
|
|
|
6
|
-
import {
|
|
6
|
+
import { ILanguageStatus, ILanguageStatusService } from '../../common';
|
|
7
7
|
|
|
8
8
|
const { compare } = strings;
|
|
9
9
|
|
|
@@ -1,23 +1,23 @@
|
|
|
1
1
|
import { Autowired, Injectable } from '@opensumi/di';
|
|
2
2
|
import {
|
|
3
|
-
URI,
|
|
4
|
-
IDisposable,
|
|
5
3
|
Disposable,
|
|
6
|
-
|
|
4
|
+
IDisposable,
|
|
7
5
|
IMarkerData,
|
|
8
6
|
IRelatedInformation,
|
|
7
|
+
MarkerManager,
|
|
9
8
|
MarkerSeverity,
|
|
9
|
+
URI,
|
|
10
10
|
} from '@opensumi/ide-core-common';
|
|
11
11
|
import { ITextmateTokenizer, ITextmateTokenizerService } from '@opensumi/ide-monaco/lib/browser/contrib/tokenizer';
|
|
12
12
|
import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
|
|
13
13
|
|
|
14
14
|
import {
|
|
15
|
-
DiagnosticSeverity,
|
|
16
|
-
DiagnosticRelatedInformation,
|
|
17
15
|
Diagnostic,
|
|
16
|
+
DiagnosticRelatedInformation,
|
|
17
|
+
DiagnosticSeverity,
|
|
18
|
+
ILanguageService,
|
|
18
19
|
Language,
|
|
19
20
|
WorkspaceSymbolProvider,
|
|
20
|
-
ILanguageService,
|
|
21
21
|
} from '../../common';
|
|
22
22
|
|
|
23
23
|
import { MonacoDiagnosticCollection } from './diagnostic-collection';
|
|
@@ -1,9 +1,5 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
AbstractContextMenuService,
|
|
4
|
-
ICtxMenuRenderer,
|
|
5
|
-
MenuId,
|
|
6
|
-
} from '@opensumi/ide-core-browser/lib/menu/next';
|
|
1
|
+
import { Autowired, Injectable } from '@opensumi/di';
|
|
2
|
+
import { AbstractContextMenuService, ICtxMenuRenderer, MenuId } from '@opensumi/ide-core-browser/lib/menu/next';
|
|
7
3
|
import { URI } from '@opensumi/ide-core-common';
|
|
8
4
|
|
|
9
5
|
import { EditorGroup } from '../workbench-editor.service';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Disposable, IContextKeyService } from '@opensumi/ide-core-browser';
|
|
2
|
-
import { AbstractContextMenuService,
|
|
2
|
+
import { AbstractContextMenuService, ICtxMenuRenderer, MenuId } from '@opensumi/ide-core-browser/lib/menu/next';
|
|
3
3
|
import { ICodeEditor } from '@opensumi/ide-monaco/lib/common/types';
|
|
4
4
|
import * as dom from '@opensumi/monaco-editor-core/esm/vs/base/browser/dom';
|
|
5
5
|
import { IAnchor } from '@opensumi/monaco-editor-core/esm/vs/base/browser/ui/contextview/contextview';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
1
|
+
import { Autowired, Injectable } from '@opensumi/di';
|
|
2
|
+
import { Disposable, IContextKeyService, IDisposable, ILogger } from '@opensumi/ide-core-browser';
|
|
3
|
+
import { AbstractContextMenuService, IContextMenu, MenuId } from '@opensumi/ide-core-browser/lib/menu/next';
|
|
4
4
|
|
|
5
5
|
import { IEditorGroup } from '../../common';
|
|
6
6
|
import { IEditorActionRegistry } from '../types';
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { Autowired } from '@opensumi/di';
|
|
2
2
|
import { getIcon } from '@opensumi/ide-core-browser';
|
|
3
3
|
import {
|
|
4
|
+
IMenuItem,
|
|
4
5
|
IMenuRegistry,
|
|
5
6
|
ISubmenuItem,
|
|
6
|
-
MenuId,
|
|
7
|
-
MenuContribution,
|
|
8
|
-
IMenuItem,
|
|
9
7
|
MenuCommandDesc,
|
|
8
|
+
MenuContribution,
|
|
9
|
+
MenuId,
|
|
10
10
|
} from '@opensumi/ide-core-browser/lib/menu/next';
|
|
11
11
|
import { Command, CommandContribution, CommandRegistry, Disposable, localize } from '@opensumi/ide-core-common';
|
|
12
12
|
import { Domain } from '@opensumi/ide-core-common/lib/di-helper';
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Autowired, Injectable } from '@opensumi/di';
|
|
2
2
|
import { IContextKeyService } from '@opensumi/ide-core-browser';
|
|
3
3
|
import { ResourceContextKey } from '@opensumi/ide-core-browser/lib/contextkey/resource';
|
|
4
4
|
import { AbstractContextMenuService, ICtxMenuRenderer, MenuId } from '@opensumi/ide-core-browser/lib/menu/next';
|