@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,8 +1,14 @@
|
|
|
1
1
|
import React, { useCallback } from 'react';
|
|
2
2
|
|
|
3
3
|
import { Button } from '@opensumi/ide-components';
|
|
4
|
-
import {
|
|
5
|
-
|
|
4
|
+
import {
|
|
5
|
+
CommandRegistry,
|
|
6
|
+
CommandService,
|
|
7
|
+
SCM_COMMANDS,
|
|
8
|
+
URI,
|
|
9
|
+
localize,
|
|
10
|
+
useInjectable,
|
|
11
|
+
} from '@opensumi/ide-core-browser';
|
|
6
12
|
|
|
7
13
|
import styles from '../editor.module.less';
|
|
8
14
|
import { ReactEditorComponent } from '../types';
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
1
|
+
import { Autowired, Injectable } from '@opensumi/di';
|
|
2
|
+
import { LabelService, MaybePromise, URI, WithEventBus } from '@opensumi/ide-core-browser';
|
|
3
3
|
import { MergeEditorService } from '@opensumi/ide-monaco/lib/browser/contrib/merge-editor/merge-editor.service';
|
|
4
4
|
|
|
5
|
-
import {
|
|
5
|
+
import { IResource, IResourceProvider } from '../../common';
|
|
6
6
|
|
|
7
7
|
@Injectable()
|
|
8
8
|
export class MergeEditorResourceProvider extends WithEventBus implements IResourceProvider {
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { Autowired } from '@opensumi/di';
|
|
2
2
|
import {
|
|
3
|
-
Domain,
|
|
4
3
|
CommandContribution,
|
|
5
4
|
CommandRegistry,
|
|
5
|
+
Domain,
|
|
6
6
|
Event,
|
|
7
|
-
IContextKeyService,
|
|
8
7
|
IContextKey,
|
|
8
|
+
IContextKeyService,
|
|
9
9
|
Uri,
|
|
10
10
|
} from '@opensumi/ide-core-browser';
|
|
11
11
|
import { RawContextKey } from '@opensumi/ide-core-browser/lib/raw-context-key';
|
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Autowired, Injectable } from '@opensumi/di';
|
|
2
2
|
import {
|
|
3
3
|
CancellationToken,
|
|
4
4
|
IDisposable,
|
|
5
5
|
IPosition,
|
|
6
|
-
arrays,
|
|
7
6
|
RefCountedDisposable,
|
|
8
|
-
onUnexpectedExternalError,
|
|
9
7
|
URI,
|
|
10
8
|
Uri,
|
|
9
|
+
arrays,
|
|
10
|
+
onUnexpectedExternalError,
|
|
11
11
|
} from '@opensumi/ide-core-common';
|
|
12
12
|
import {
|
|
13
13
|
CallHierarchyItem,
|
|
@@ -1,29 +1,29 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Autowired, Injectable } from '@opensumi/di';
|
|
2
2
|
import {
|
|
3
3
|
Command,
|
|
4
|
-
Emitter,
|
|
5
|
-
CommandRegistry,
|
|
6
4
|
CommandHandler,
|
|
5
|
+
CommandRegistry,
|
|
6
|
+
CommandService,
|
|
7
|
+
EDITOR_COMMANDS,
|
|
8
|
+
Emitter,
|
|
7
9
|
HANDLER_NOT_FOUND,
|
|
8
10
|
ILogger,
|
|
9
|
-
EDITOR_COMMANDS,
|
|
10
|
-
CommandService,
|
|
11
11
|
IReporterService,
|
|
12
|
+
MonacoOverrideServiceRegistry,
|
|
12
13
|
REPORT_NAME,
|
|
13
14
|
ServiceNames,
|
|
14
|
-
memoize,
|
|
15
15
|
Uri,
|
|
16
|
-
|
|
16
|
+
memoize,
|
|
17
17
|
} from '@opensumi/ide-core-browser';
|
|
18
18
|
import { DELEGATE_COMMANDS } from '@opensumi/ide-monaco';
|
|
19
19
|
import {
|
|
20
|
-
CommandsRegistry as MonacoCommandsRegistry,
|
|
21
20
|
EditorExtensionsRegistry,
|
|
22
21
|
ICommandEvent,
|
|
23
22
|
ICommandService,
|
|
24
23
|
IMonacoActionRegistry,
|
|
25
24
|
IMonacoCommandService,
|
|
26
25
|
IMonacoCommandsRegistry,
|
|
26
|
+
CommandsRegistry as MonacoCommandsRegistry,
|
|
27
27
|
MonacoEditorCommandHandler,
|
|
28
28
|
} from '@opensumi/ide-monaco/lib/browser/contrib/command';
|
|
29
29
|
import { URI } from '@opensumi/ide-monaco/lib/browser/monaco-api';
|
|
@@ -14,12 +14,12 @@
|
|
|
14
14
|
* SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
15
15
|
********************************************************************************/
|
|
16
16
|
|
|
17
|
-
|
|
17
|
+
// Some code copied and modified from https://github.com/eclipse-theia/theia/tree/v1.14.0/packages/monaco/src/browser/textmate/textmate-registry.ts
|
|
18
18
|
|
|
19
19
|
import { IGrammarConfiguration } from 'vscode-textmate';
|
|
20
20
|
|
|
21
21
|
import { Injectable } from '@opensumi/di';
|
|
22
|
-
import {
|
|
22
|
+
import { URI, getDebugLogger } from '@opensumi/ide-core-common';
|
|
23
23
|
|
|
24
24
|
import { TokenizerOption } from './textmate-tokenizer';
|
|
25
25
|
|
|
@@ -1,26 +1,26 @@
|
|
|
1
|
-
import { OnigScanner,
|
|
1
|
+
import { OnigScanner, OnigString, loadWASM } from 'vscode-oniguruma';
|
|
2
2
|
import {
|
|
3
|
-
Registry,
|
|
4
|
-
IRawGrammar,
|
|
5
|
-
IOnigLib,
|
|
6
|
-
parseRawGrammar,
|
|
7
3
|
IEmbeddedLanguagesMap,
|
|
8
|
-
ITokenTypeMap,
|
|
9
4
|
INITIAL,
|
|
5
|
+
IOnigLib,
|
|
6
|
+
IRawGrammar,
|
|
7
|
+
ITokenTypeMap,
|
|
8
|
+
Registry,
|
|
9
|
+
parseRawGrammar,
|
|
10
10
|
} from 'vscode-textmate';
|
|
11
11
|
|
|
12
|
-
import {
|
|
12
|
+
import { Autowired, Injectable } from '@opensumi/di';
|
|
13
13
|
import {
|
|
14
|
-
|
|
15
|
-
parseWithComments,
|
|
16
|
-
PreferenceService,
|
|
17
|
-
ILogger,
|
|
14
|
+
AppConfig,
|
|
18
15
|
ExtensionActivateEvent,
|
|
19
|
-
|
|
16
|
+
ILogger,
|
|
17
|
+
PreferenceService,
|
|
18
|
+
WithEventBus,
|
|
20
19
|
electronEnv,
|
|
21
|
-
|
|
20
|
+
getDebugLogger,
|
|
21
|
+
parseWithComments,
|
|
22
22
|
} from '@opensumi/ide-core-browser';
|
|
23
|
-
import {
|
|
23
|
+
import { Disposable, URI, isObject } from '@opensumi/ide-core-common';
|
|
24
24
|
import { IFileServiceClient } from '@opensumi/ide-file-service/lib/common';
|
|
25
25
|
import {
|
|
26
26
|
GrammarsContribution,
|
|
@@ -40,17 +40,19 @@ import {
|
|
|
40
40
|
import {
|
|
41
41
|
CommentRule,
|
|
42
42
|
IIndentationRule,
|
|
43
|
+
IRegExp,
|
|
43
44
|
IndentAction,
|
|
44
45
|
IndentationRuleDto,
|
|
45
|
-
IRegExp,
|
|
46
46
|
LanguageConfigurationDto,
|
|
47
47
|
LanguagesContribution,
|
|
48
48
|
} from '@opensumi/ide-monaco/lib/common';
|
|
49
49
|
import { IThemeData } from '@opensumi/ide-theme';
|
|
50
50
|
import { ThemeChangedEvent } from '@opensumi/ide-theme/lib/common/event';
|
|
51
51
|
import { asStringArray } from '@opensumi/ide-utils/lib/arrays';
|
|
52
|
-
import {
|
|
53
|
-
|
|
52
|
+
import {
|
|
53
|
+
ILanguageExtensionPoint,
|
|
54
|
+
ILanguageService,
|
|
55
|
+
} from '@opensumi/monaco-editor-core/esm/vs/editor/common/languages/language';
|
|
54
56
|
import { StandaloneServices } from '@opensumi/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
|
|
55
57
|
|
|
56
58
|
import { IEditorDocumentModelService } from '../../doc-model/types';
|
|
@@ -1,18 +1,18 @@
|
|
|
1
1
|
import { Autowired } from '@opensumi/di';
|
|
2
2
|
import {
|
|
3
|
-
Domain,
|
|
4
3
|
CommandContribution,
|
|
5
4
|
CommandRegistry,
|
|
5
|
+
Domain,
|
|
6
6
|
Event,
|
|
7
|
-
IContextKeyService,
|
|
8
7
|
IContextKey,
|
|
8
|
+
IContextKeyService,
|
|
9
9
|
Uri,
|
|
10
10
|
} from '@opensumi/ide-core-browser';
|
|
11
11
|
import { RawContextKey } from '@opensumi/ide-core-browser/lib/raw-context-key';
|
|
12
12
|
import {
|
|
13
13
|
ITypeHierarchyService,
|
|
14
|
-
TypeHierarchyProviderRegistry,
|
|
15
14
|
TypeHierarchyItem,
|
|
15
|
+
TypeHierarchyProviderRegistry,
|
|
16
16
|
} from '@opensumi/ide-monaco/lib/browser/contrib/typeHierarchy';
|
|
17
17
|
import { Position } from '@opensumi/monaco-editor-core/esm/vs/editor/common/core/position';
|
|
18
18
|
|
|
@@ -1,17 +1,17 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Autowired, Injectable } from '@opensumi/di';
|
|
2
2
|
import {
|
|
3
3
|
CancellationToken,
|
|
4
|
-
IPosition,
|
|
5
4
|
IDisposable,
|
|
6
|
-
|
|
5
|
+
IPosition,
|
|
7
6
|
RefCountedDisposable,
|
|
8
|
-
onUnexpectedExternalError,
|
|
9
7
|
URI,
|
|
10
8
|
Uri,
|
|
9
|
+
arrays,
|
|
10
|
+
onUnexpectedExternalError,
|
|
11
11
|
} from '@opensumi/ide-core-common';
|
|
12
12
|
import {
|
|
13
|
-
TypeHierarchyItem,
|
|
14
13
|
ITypeHierarchyService,
|
|
14
|
+
TypeHierarchyItem,
|
|
15
15
|
TypeHierarchyProvider,
|
|
16
16
|
TypeHierarchyProviderRegistry,
|
|
17
17
|
} from '@opensumi/ide-monaco/lib/browser/contrib/typeHierarchy';
|
|
@@ -1,17 +1,15 @@
|
|
|
1
1
|
import cls from 'classnames';
|
|
2
|
-
import {
|
|
2
|
+
import { action, makeObservable, observable } from 'mobx';
|
|
3
3
|
import { observer } from 'mobx-react-lite';
|
|
4
|
-
import React, { useCallback, useEffect, useRef
|
|
4
|
+
import React, { memo, useCallback, useEffect, useRef } from 'react';
|
|
5
5
|
|
|
6
6
|
import { Injectable } from '@opensumi/di';
|
|
7
|
-
import { Icon } from '@opensumi/ide-components';
|
|
8
|
-
import {
|
|
9
|
-
import { useInjectable, DomListener, Disposable, useUpdateOnEvent } from '@opensumi/ide-core-browser';
|
|
10
|
-
import { getIcon } from '@opensumi/ide-core-browser';
|
|
7
|
+
import { Icon, Scrollbars } from '@opensumi/ide-components';
|
|
8
|
+
import { Disposable, DomListener, getIcon, useInjectable, useUpdateOnEvent } from '@opensumi/ide-core-browser';
|
|
11
9
|
|
|
12
10
|
import { BreadCrumbsMenuService } from './menu/breadcrumbs.menus';
|
|
13
11
|
import styles from './navigation.module.less';
|
|
14
|
-
import {
|
|
12
|
+
import { IBreadCrumbPart, IBreadCrumbService } from './types';
|
|
15
13
|
import { useUpdateOnGroupTabChange } from './view/react-hook';
|
|
16
14
|
import { EditorGroup } from './workbench-editor.service';
|
|
17
15
|
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Uri, objects } from '@opensumi/ide-core-browser';
|
|
2
2
|
import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
|
|
3
3
|
import { IConfigurationService } from '@opensumi/monaco-editor-core/esm/vs/platform/configuration/common/configuration';
|
|
4
4
|
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import {
|
|
2
|
-
|
|
3
|
-
isOSX,
|
|
4
|
-
isLinux,
|
|
2
|
+
PreferenceProxy,
|
|
5
3
|
PreferenceSchema,
|
|
6
4
|
PreferenceSchemaProperties,
|
|
7
|
-
|
|
5
|
+
isLinux,
|
|
6
|
+
isOSX,
|
|
7
|
+
localize,
|
|
8
8
|
} from '@opensumi/ide-core-browser';
|
|
9
9
|
|
|
10
10
|
export const USUAL_WORD_SEPARATORS = '`~!@#$%^&*()-=+[{]}\\|;:\'",.<>/?';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { PreferenceService, createPreferenceProxy } from '@opensumi/ide-core-browser';
|
|
2
2
|
|
|
3
|
-
import {
|
|
3
|
+
import { EditorPreferences, editorPreferenceSchema } from './schema';
|
|
4
4
|
|
|
5
5
|
export function createEditorPreferenceProxy(
|
|
6
6
|
preferenceService: PreferenceService,
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Autowired, Injectable } from '@opensumi/di';
|
|
2
2
|
import {
|
|
3
3
|
CommandService,
|
|
4
|
+
QuickOpenHandler,
|
|
4
5
|
formatLocalize,
|
|
5
6
|
localize,
|
|
6
|
-
QuickOpenHandler,
|
|
7
7
|
withNullAsUndefined,
|
|
8
8
|
} from '@opensumi/ide-core-browser';
|
|
9
|
-
import {
|
|
9
|
+
import { Mode, PrefixQuickOpenService, QuickOpenItem, QuickOpenModel } from '@opensumi/ide-core-browser/lib/quick-open';
|
|
10
10
|
import { Event as MonacoEvent } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
|
|
11
11
|
import { IRange as IMonacoRange } from '@opensumi/monaco-editor-core/esm/vs/editor/common/core/range';
|
|
12
12
|
import { IEditor as IMonacoCodeEditor } from '@opensumi/monaco-editor-core/esm/vs/editor/common/editorCommon';
|
|
@@ -1,30 +1,30 @@
|
|
|
1
|
-
import
|
|
2
|
-
|
|
3
|
-
import { Injectable, Autowired } from '@opensumi/di';
|
|
1
|
+
import { Autowired, Injectable } from '@opensumi/di';
|
|
4
2
|
import {
|
|
5
|
-
|
|
6
|
-
QuickOpenModel,
|
|
3
|
+
CancellationToken,
|
|
7
4
|
CancellationTokenSource,
|
|
5
|
+
QuickOpenHandler,
|
|
8
6
|
QuickOpenItem,
|
|
9
|
-
CancellationToken,
|
|
10
|
-
URI,
|
|
11
7
|
QuickOpenMode,
|
|
12
|
-
|
|
8
|
+
QuickOpenModel,
|
|
9
|
+
URI,
|
|
13
10
|
getIcon,
|
|
11
|
+
getSymbolIcon,
|
|
14
12
|
} from '@opensumi/ide-core-browser';
|
|
15
|
-
import { ILogger,
|
|
16
|
-
import {
|
|
13
|
+
import { ILogger, IReporterService, REPORT_NAME, localize } from '@opensumi/ide-core-common';
|
|
14
|
+
import { QuickOpenActionProvider, QuickOpenBaseAction } from '@opensumi/ide-quick-open';
|
|
17
15
|
import { IWorkspaceService } from '@opensumi/ide-workspace';
|
|
18
16
|
import { SymbolKind as SymbolKindEnum } from '@opensumi/monaco-editor-core/esm/vs/editor/common/languages';
|
|
19
17
|
|
|
20
18
|
import {
|
|
21
|
-
|
|
19
|
+
EditorGroupSplitAction,
|
|
22
20
|
ILanguageService,
|
|
23
|
-
WorkspaceSymbolParams,
|
|
24
21
|
WorkbenchEditorService,
|
|
25
|
-
|
|
22
|
+
WorkspaceSymbolParams,
|
|
23
|
+
WorkspaceSymbolProvider,
|
|
26
24
|
} from '../../common';
|
|
27
25
|
|
|
26
|
+
import type { Range, SymbolInformation } from 'vscode-languageserver-types';
|
|
27
|
+
|
|
28
28
|
@Injectable()
|
|
29
29
|
class WorkspaceSymbolOpenSideAction extends QuickOpenBaseAction {
|
|
30
30
|
constructor() {
|
|
@@ -1,19 +1,19 @@
|
|
|
1
1
|
import { observable } from 'mobx';
|
|
2
2
|
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
5
|
-
import { Disposable,
|
|
3
|
+
import { Autowired, Injectable } from '@opensumi/di';
|
|
4
|
+
import { IDisposable, OnEvent, URI, WithEventBus } from '@opensumi/ide-core-browser';
|
|
5
|
+
import { Disposable, Emitter, ILogger, LRUMap, arrays } from '@opensumi/ide-core-common';
|
|
6
6
|
|
|
7
7
|
import {
|
|
8
|
-
|
|
8
|
+
AskSaveResult,
|
|
9
9
|
IResource,
|
|
10
|
-
IResourceProvider,
|
|
11
|
-
ResourceNeedUpdateEvent,
|
|
12
|
-
ResourceDidUpdateEvent,
|
|
13
10
|
IResourceDecoration,
|
|
14
|
-
|
|
11
|
+
IResourceProvider,
|
|
15
12
|
ResourceDecorationChangeEvent,
|
|
16
|
-
|
|
13
|
+
ResourceDecorationNeedChangeEvent,
|
|
14
|
+
ResourceDidUpdateEvent,
|
|
15
|
+
ResourceNeedUpdateEvent,
|
|
16
|
+
ResourceService,
|
|
17
17
|
} from '../common';
|
|
18
18
|
|
|
19
19
|
const { addElement } = arrays;
|
package/src/browser/tab.view.tsx
CHANGED
|
@@ -1,45 +1,45 @@
|
|
|
1
1
|
import cls from 'classnames';
|
|
2
2
|
import React, {
|
|
3
|
-
useEffect,
|
|
4
|
-
useState,
|
|
5
|
-
useCallback,
|
|
6
|
-
useRef,
|
|
7
|
-
useContext,
|
|
8
|
-
useMemo,
|
|
9
|
-
forwardRef,
|
|
10
3
|
DragEvent,
|
|
11
4
|
HTMLAttributes,
|
|
12
|
-
Ref,
|
|
13
5
|
MouseEvent,
|
|
6
|
+
Ref,
|
|
7
|
+
forwardRef,
|
|
8
|
+
useCallback,
|
|
9
|
+
useContext,
|
|
10
|
+
useEffect,
|
|
11
|
+
useMemo,
|
|
12
|
+
useRef,
|
|
13
|
+
useState,
|
|
14
14
|
} from 'react';
|
|
15
15
|
|
|
16
16
|
import { Scrollbars } from '@opensumi/ide-components';
|
|
17
17
|
import {
|
|
18
|
-
|
|
19
|
-
MaybeNull,
|
|
20
|
-
IEventBus,
|
|
21
|
-
getSlotLocation,
|
|
18
|
+
AppConfig,
|
|
22
19
|
ConfigContext,
|
|
23
|
-
ResizeEvent,
|
|
24
|
-
URI,
|
|
25
20
|
Disposable,
|
|
26
|
-
DomListener,
|
|
27
|
-
PreferenceService,
|
|
28
21
|
DisposableCollection,
|
|
22
|
+
DomListener,
|
|
29
23
|
Event,
|
|
24
|
+
IEventBus,
|
|
25
|
+
MaybeNull,
|
|
26
|
+
PreferenceService,
|
|
27
|
+
ResizeEvent,
|
|
28
|
+
URI,
|
|
30
29
|
getExternalIcon,
|
|
30
|
+
getIcon,
|
|
31
|
+
getSlotLocation,
|
|
31
32
|
} from '@opensumi/ide-core-browser';
|
|
32
33
|
import { InlineMenuBar } from '@opensumi/ide-core-browser/lib/components/actions';
|
|
33
|
-
import { LAYOUT_VIEW_SIZE } from '@opensumi/ide-core-browser/lib/layout/constants';
|
|
34
34
|
import { VIEW_CONTAINERS } from '@opensumi/ide-core-browser/lib/layout/view-id';
|
|
35
35
|
import { IMenuRegistry, MenuId } from '@opensumi/ide-core-browser/lib/menu/next';
|
|
36
36
|
import { useInjectable, useUpdateOnEventBusEvent } from '@opensumi/ide-core-browser/lib/react-hooks';
|
|
37
37
|
|
|
38
|
-
import { IResource,
|
|
38
|
+
import { IEditorGroup, IResource, ResourceDidUpdateEvent, ResourceService, WorkbenchEditorService } from '../common';
|
|
39
39
|
|
|
40
40
|
import styles from './editor.module.less';
|
|
41
41
|
import { TabTitleMenuService } from './menu/title-context.menu';
|
|
42
|
-
import {
|
|
42
|
+
import { DragOverPosition, EditorGroupFileDropEvent, GridResizeEvent, IEditorActionRegistry } from './types';
|
|
43
43
|
import { useUpdateOnGroupTabChange } from './view/react-hook';
|
|
44
44
|
import { EditorGroup, WorkbenchEditorServiceImpl } from './workbench-editor.service';
|
|
45
45
|
|
|
@@ -62,6 +62,7 @@ export const Tabs = ({ group }: ITabsProps) => {
|
|
|
62
62
|
const tabTitleMenuService = useInjectable(TabTitleMenuService) as TabTitleMenuService;
|
|
63
63
|
const preferenceService = useInjectable<PreferenceService>(PreferenceService);
|
|
64
64
|
const menuRegistry = useInjectable<IMenuRegistry>(IMenuRegistry);
|
|
65
|
+
const appConfig = useInjectable<AppConfig>(AppConfig);
|
|
65
66
|
|
|
66
67
|
const [tabsLoadingMap, setTabsLoadingMap] = useState<{ [resource: string]: boolean }>({});
|
|
67
68
|
const [wrapMode, setWrapMode] = useState<boolean>(!!preferenceService.get<boolean>('editor.wrapTab'));
|
|
@@ -332,13 +333,8 @@ export const Tabs = ({ group }: ITabsProps) => {
|
|
|
332
333
|
})}
|
|
333
334
|
style={
|
|
334
335
|
wrapMode && i === group.resources.length - 1
|
|
335
|
-
? { marginRight: lastMarginRight, height:
|
|
336
|
-
: {
|
|
337
|
-
height:
|
|
338
|
-
group.currentResource === resource
|
|
339
|
-
? LAYOUT_VIEW_SIZE.EDITOR_TABS_HEIGHT + 1
|
|
340
|
-
: LAYOUT_VIEW_SIZE.EDITOR_TABS_HEIGHT,
|
|
341
|
-
}
|
|
336
|
+
? { marginRight: lastMarginRight, height: appConfig.layoutViewSize!.editorTabsHeight }
|
|
337
|
+
: { height: appConfig.layoutViewSize!.editorTabsHeight }
|
|
342
338
|
}
|
|
343
339
|
onContextMenu={(event) => {
|
|
344
340
|
tabTitleMenuService.show(event.nativeEvent.x, event.nativeEvent.y, resource && resource.uri, group);
|
|
@@ -469,6 +465,7 @@ export const EditorActions = forwardRef<HTMLDivElement, IEditorActionsProps>(
|
|
|
469
465
|
|
|
470
466
|
const editorActionRegistry = useInjectable<IEditorActionRegistry>(IEditorActionRegistry);
|
|
471
467
|
const editorService: WorkbenchEditorServiceImpl = useInjectable(WorkbenchEditorService);
|
|
468
|
+
const appConfig = useInjectable<AppConfig>(AppConfig);
|
|
472
469
|
const menu = editorActionRegistry.getMenu(group);
|
|
473
470
|
const [hasFocus, setHasFocus] = useState<boolean>(editorService.currentEditorGroup === group);
|
|
474
471
|
const [args, setArgs] = useState<[URI, IEditorGroup, MaybeNull<URI>] | undefined>(acquireArgs());
|
|
@@ -500,7 +497,7 @@ export const EditorActions = forwardRef<HTMLDivElement, IEditorActionsProps>(
|
|
|
500
497
|
<div
|
|
501
498
|
ref={ref}
|
|
502
499
|
className={cls(styles.editor_actions, className)}
|
|
503
|
-
style={{ height:
|
|
500
|
+
style={{ height: appConfig.layoutViewSize!.editorTabsHeight }}
|
|
504
501
|
>
|
|
505
502
|
<InlineMenuBar<URI, IEditorGroup, MaybeNull<URI>>
|
|
506
503
|
menus={menu}
|
package/src/browser/types.ts
CHANGED
|
@@ -1,29 +1,29 @@
|
|
|
1
1
|
import {
|
|
2
|
-
MaybePromise,
|
|
3
|
-
IDisposable,
|
|
4
2
|
BasicEvent,
|
|
3
|
+
Event,
|
|
4
|
+
IDisposable,
|
|
5
5
|
IRange,
|
|
6
|
-
MaybeNull,
|
|
7
6
|
ISelection,
|
|
7
|
+
MaybeNull,
|
|
8
|
+
MaybePromise,
|
|
8
9
|
URI,
|
|
9
|
-
Event,
|
|
10
10
|
} from '@opensumi/ide-core-browser';
|
|
11
11
|
import { IContextMenu } from '@opensumi/ide-core-browser/lib/menu/next';
|
|
12
12
|
import { IThemeColor } from '@opensumi/ide-core-common';
|
|
13
13
|
import { editor } from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
|
|
14
14
|
|
|
15
15
|
import {
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
IEditorGroup,
|
|
16
|
+
DragOverPosition,
|
|
17
|
+
EditorOpenType,
|
|
19
18
|
IDecorationRenderOptions,
|
|
19
|
+
IEditor,
|
|
20
|
+
IEditorGroup,
|
|
21
|
+
IEditorOpenType,
|
|
22
|
+
IResource,
|
|
20
23
|
ITextEditorDecorationType,
|
|
21
|
-
TrackedRangeStickiness,
|
|
22
24
|
OverviewRulerLane,
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
DragOverPosition,
|
|
26
|
-
EditorOpenType,
|
|
25
|
+
ResourceService,
|
|
26
|
+
TrackedRangeStickiness,
|
|
27
27
|
} from '../common';
|
|
28
28
|
|
|
29
29
|
import { IEditorDocumentModelContentRegistry } from './doc-model/types';
|
|
@@ -1,31 +1,31 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Autowired, Injectable } from '@opensumi/di';
|
|
2
2
|
import {
|
|
3
|
-
|
|
3
|
+
AppConfig,
|
|
4
|
+
CommandService,
|
|
4
5
|
Emitter,
|
|
5
6
|
Event,
|
|
6
|
-
|
|
7
|
-
WithEventBus,
|
|
7
|
+
IApplicationService,
|
|
8
8
|
IEditorDocumentChange,
|
|
9
9
|
IEditorDocumentModelSaveResult,
|
|
10
|
-
|
|
11
|
-
CommandService,
|
|
10
|
+
MessageType,
|
|
12
11
|
OperatingSystem,
|
|
13
|
-
IApplicationService,
|
|
14
12
|
PreferenceService,
|
|
13
|
+
SaveTaskResponseState,
|
|
14
|
+
Schemes,
|
|
15
|
+
URI,
|
|
16
|
+
WithEventBus,
|
|
17
|
+
formatLocalize,
|
|
15
18
|
getLanguageIdFromMonaco,
|
|
19
|
+
isWindows,
|
|
16
20
|
localize,
|
|
17
|
-
formatLocalize,
|
|
18
|
-
MessageType,
|
|
19
21
|
path,
|
|
20
|
-
isWindows,
|
|
21
|
-
SaveTaskResponseState,
|
|
22
22
|
} from '@opensumi/ide-core-browser';
|
|
23
23
|
import { EOL } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
|
|
24
24
|
import { IDialogService } from '@opensumi/ide-overlay';
|
|
25
25
|
|
|
26
26
|
import { AskSaveResult, IResource, IResourceProvider, WorkbenchEditorService } from '../common';
|
|
27
27
|
|
|
28
|
-
import {
|
|
28
|
+
import { IEditorDocumentModelContentProvider, IEditorDocumentModelService } from './doc-model/types';
|
|
29
29
|
|
|
30
30
|
@Injectable()
|
|
31
31
|
export class UntitledDocumentIdCounter {
|
|
@@ -3,7 +3,8 @@ import React from 'react';
|
|
|
3
3
|
import { URI, useInjectable } from '@opensumi/ide-core-browser';
|
|
4
4
|
|
|
5
5
|
import { EditorCollectionService, ICodeEditor } from '../../common';
|
|
6
|
-
import {
|
|
6
|
+
import { IEditorDocumentModelRef } from '../../common/editor';
|
|
7
|
+
import { IEditorDocumentModelService } from '../doc-model/types';
|
|
7
8
|
|
|
8
9
|
export interface ICodeEditorProps extends React.HTMLAttributes<HTMLDivElement> {
|
|
9
10
|
uri?: URI;
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { Autowired, Injectable } from '@opensumi/di';
|
|
2
|
-
import { PreferenceService } from '@opensumi/ide-core-browser';
|
|
3
|
-
import { SuggestEvent, DisposableCollection } from '@opensumi/ide-core-browser';
|
|
2
|
+
import { DisposableCollection, PreferenceService, SuggestEvent } from '@opensumi/ide-core-browser';
|
|
4
3
|
import { IEventBus } from '@opensumi/ide-core-common';
|
|
5
4
|
import { SuggestController } from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/suggest/browser/suggestController';
|
|
6
5
|
|