@opensumi/ide-editor 2.27.3-rc-1708399099.0 → 2.27.3-rc-1710489030.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.
Files changed (249) hide show
  1. package/lib/browser/breadcrumb/default.d.ts.map +1 -1
  2. package/lib/browser/breadcrumb/document-symbol.d.ts +2 -2
  3. package/lib/browser/breadcrumb/document-symbol.d.ts.map +1 -1
  4. package/lib/browser/breadcrumb/index.d.ts +2 -2
  5. package/lib/browser/breadcrumb/index.d.ts.map +1 -1
  6. package/lib/browser/component.d.ts +2 -2
  7. package/lib/browser/component.d.ts.map +1 -1
  8. package/lib/browser/decoration-applier.d.ts +2 -2
  9. package/lib/browser/decoration-applier.d.ts.map +1 -1
  10. package/lib/browser/decoration-applier.js.map +1 -1
  11. package/lib/browser/diff/compare.d.ts +3 -3
  12. package/lib/browser/diff/compare.d.ts.map +1 -1
  13. package/lib/browser/diff/compare.js +2 -3
  14. package/lib/browser/diff/compare.js.map +1 -1
  15. package/lib/browser/diff/index.d.ts +1 -1
  16. package/lib/browser/diff/index.d.ts.map +1 -1
  17. package/lib/browser/diff/index.js.map +1 -1
  18. package/lib/browser/doc-cache/local-storage-cache.d.ts +1 -1
  19. package/lib/browser/doc-cache/local-storage-cache.d.ts.map +1 -1
  20. package/lib/browser/doc-model/editor-document-model-service.d.ts +3 -2
  21. package/lib/browser/doc-model/editor-document-model-service.d.ts.map +1 -1
  22. package/lib/browser/doc-model/editor-document-model-service.js.map +1 -1
  23. package/lib/browser/doc-model/editor-document-model.d.ts +3 -2
  24. package/lib/browser/doc-model/editor-document-model.d.ts.map +1 -1
  25. package/lib/browser/doc-model/editor-document-model.js.map +1 -1
  26. package/lib/browser/doc-model/editor-document-registry.d.ts +2 -2
  27. package/lib/browser/doc-model/editor-document-registry.d.ts.map +1 -1
  28. package/lib/browser/doc-model/editor-is-fn.d.ts +1 -1
  29. package/lib/browser/doc-model/editor-is-fn.d.ts.map +1 -1
  30. package/lib/browser/doc-model/override.d.ts +1 -1
  31. package/lib/browser/doc-model/override.d.ts.map +1 -1
  32. package/lib/browser/doc-model/save-task.d.ts +1 -1
  33. package/lib/browser/doc-model/save-task.d.ts.map +1 -1
  34. package/lib/browser/doc-model/saveParticipants.d.ts.map +1 -1
  35. package/lib/browser/doc-model/saveParticipants.js +1 -1
  36. package/lib/browser/doc-model/saveParticipants.js.map +1 -1
  37. package/lib/browser/doc-model/types.d.ts +3 -75
  38. package/lib/browser/doc-model/types.d.ts.map +1 -1
  39. package/lib/browser/doc-model/types.js.map +1 -1
  40. package/lib/browser/editor-collection.service.d.ts +6 -5
  41. package/lib/browser/editor-collection.service.d.ts.map +1 -1
  42. package/lib/browser/editor-collection.service.js +5 -6
  43. package/lib/browser/editor-collection.service.js.map +1 -1
  44. package/lib/browser/editor-electron.contribution.d.ts +1 -1
  45. package/lib/browser/editor-electron.contribution.d.ts.map +1 -1
  46. package/lib/browser/editor-opener.d.ts +1 -1
  47. package/lib/browser/editor-opener.d.ts.map +1 -1
  48. package/lib/browser/editor.contribution.d.ts +3 -5
  49. package/lib/browser/editor.contribution.d.ts.map +1 -1
  50. package/lib/browser/editor.contribution.js +4 -10
  51. package/lib/browser/editor.contribution.js.map +1 -1
  52. package/lib/browser/editor.decoration.service.d.ts +2 -2
  53. package/lib/browser/editor.decoration.service.d.ts.map +1 -1
  54. package/lib/browser/editor.module.less +12 -0
  55. package/lib/browser/editor.override.d.ts +3 -3
  56. package/lib/browser/editor.override.d.ts.map +1 -1
  57. package/lib/browser/editor.override.js +7 -10
  58. package/lib/browser/editor.override.js.map +1 -1
  59. package/lib/browser/editor.status-bar.service.d.ts +1 -1
  60. package/lib/browser/editor.status-bar.service.d.ts.map +1 -1
  61. package/lib/browser/editor.status-bar.service.js.map +1 -1
  62. package/lib/browser/editor.tab.service.d.ts +8 -0
  63. package/lib/browser/editor.tab.service.d.ts.map +1 -0
  64. package/lib/browser/editor.tab.service.js +19 -0
  65. package/lib/browser/editor.tab.service.js.map +1 -0
  66. package/lib/browser/editor.view.d.ts.map +1 -1
  67. package/lib/browser/editor.view.js +9 -6
  68. package/lib/browser/editor.view.js.map +1 -1
  69. package/lib/browser/feature.d.ts +2 -2
  70. package/lib/browser/feature.d.ts.map +1 -1
  71. package/lib/browser/format/format.service.d.ts.map +1 -1
  72. package/lib/browser/fs-resource/fs-editor-doc.d.ts +1 -1
  73. package/lib/browser/fs-resource/fs-editor-doc.d.ts.map +1 -1
  74. package/lib/browser/fs-resource/fs-resource.d.ts +3 -3
  75. package/lib/browser/fs-resource/fs-resource.d.ts.map +1 -1
  76. package/lib/browser/fs-resource/fs-resource.js +1 -2
  77. package/lib/browser/fs-resource/fs-resource.js.map +1 -1
  78. package/lib/browser/grid/grid.service.d.ts +2 -2
  79. package/lib/browser/grid/grid.service.d.ts.map +1 -1
  80. package/lib/browser/history/index.d.ts +1 -1
  81. package/lib/browser/history/index.d.ts.map +1 -1
  82. package/lib/browser/index.d.ts +4 -4
  83. package/lib/browser/index.d.ts.map +1 -1
  84. package/lib/browser/index.js +8 -3
  85. package/lib/browser/index.js.map +1 -1
  86. package/lib/browser/language/diagnostic-collection.d.ts +1 -1
  87. package/lib/browser/language/diagnostic-collection.d.ts.map +1 -1
  88. package/lib/browser/language/language-status.contribution.d.ts.map +1 -1
  89. package/lib/browser/language/language-status.service.d.ts +1 -1
  90. package/lib/browser/language/language-status.service.d.ts.map +1 -1
  91. package/lib/browser/language/language.service.d.ts +2 -2
  92. package/lib/browser/language/language.service.d.ts.map +1 -1
  93. package/lib/browser/menu/breadcrumbs.menus.d.ts.map +1 -1
  94. package/lib/browser/menu/breadcrumbs.menus.js.map +1 -1
  95. package/lib/browser/menu/editor.context.d.ts.map +1 -1
  96. package/lib/browser/menu/editor.menu.d.ts +1 -1
  97. package/lib/browser/menu/editor.menu.d.ts.map +1 -1
  98. package/lib/browser/menu/open-type-menu.contribution.d.ts.map +1 -1
  99. package/lib/browser/merge-editor/MergeEditorFloatComponents.d.ts.map +1 -1
  100. package/lib/browser/merge-editor/MergeEditorFloatComponents.js +2 -3
  101. package/lib/browser/merge-editor/MergeEditorFloatComponents.js.map +1 -1
  102. package/lib/browser/merge-editor/merge-editor.provider.d.ts +2 -2
  103. package/lib/browser/merge-editor/merge-editor.provider.d.ts.map +1 -1
  104. package/lib/browser/monaco-contrib/callHierarchy/callHierarchy.contribution.d.ts.map +1 -1
  105. package/lib/browser/monaco-contrib/callHierarchy/callHierarchy.service.d.ts +0 -1
  106. package/lib/browser/monaco-contrib/callHierarchy/callHierarchy.service.d.ts.map +1 -1
  107. package/lib/browser/monaco-contrib/command/command.service.d.ts +2 -2
  108. package/lib/browser/monaco-contrib/command/command.service.d.ts.map +1 -1
  109. package/lib/browser/monaco-contrib/command/command.service.js +1 -1
  110. package/lib/browser/monaco-contrib/command/command.service.js.map +1 -1
  111. package/lib/browser/monaco-contrib/tokenizer/textmate-registry.d.ts.map +1 -1
  112. package/lib/browser/monaco-contrib/tokenizer/textmate-tokenizer.d.ts +1 -1
  113. package/lib/browser/monaco-contrib/tokenizer/textmate-tokenizer.d.ts.map +1 -1
  114. package/lib/browser/monaco-contrib/tokenizer/textmate.service.d.ts +2 -3
  115. package/lib/browser/monaco-contrib/tokenizer/textmate.service.d.ts.map +1 -1
  116. package/lib/browser/monaco-contrib/tokenizer/textmate.service.js.map +1 -1
  117. package/lib/browser/monaco-contrib/typeHierarchy/typeHierarchy.contribution.d.ts.map +1 -1
  118. package/lib/browser/monaco-contrib/typeHierarchy/typeHierarchy.service.d.ts +1 -1
  119. package/lib/browser/monaco-contrib/typeHierarchy/typeHierarchy.service.d.ts.map +1 -1
  120. package/lib/browser/navigation.view.d.ts.map +1 -1
  121. package/lib/browser/navigation.view.js +12 -9
  122. package/lib/browser/navigation.view.js.map +1 -1
  123. package/lib/browser/preference/contribution.d.ts.map +1 -1
  124. package/lib/browser/preference/converter.d.ts.map +1 -1
  125. package/lib/browser/preference/converter.js +19 -0
  126. package/lib/browser/preference/converter.js.map +1 -1
  127. package/lib/browser/preference/schema.d.ts +2 -1
  128. package/lib/browser/preference/schema.d.ts.map +1 -1
  129. package/lib/browser/preference/schema.js +12 -0
  130. package/lib/browser/preference/schema.js.map +1 -1
  131. package/lib/browser/preference/util.d.ts.map +1 -1
  132. package/lib/browser/quick-open/go-to-line.d.ts +1 -1
  133. package/lib/browser/quick-open/go-to-line.d.ts.map +1 -1
  134. package/lib/browser/quick-open/workspace-symbol-quickopen.d.ts +3 -4
  135. package/lib/browser/quick-open/workspace-symbol-quickopen.d.ts.map +1 -1
  136. package/lib/browser/quick-open/workspace-symbol-quickopen.js.map +1 -1
  137. package/lib/browser/resource.service.d.ts +2 -2
  138. package/lib/browser/resource.service.d.ts.map +1 -1
  139. package/lib/browser/tab.view.d.ts.map +1 -1
  140. package/lib/browser/tab.view.js +91 -68
  141. package/lib/browser/tab.view.js.map +1 -1
  142. package/lib/browser/types.d.ts +8 -3
  143. package/lib/browser/types.d.ts.map +1 -1
  144. package/lib/browser/types.js +2 -1
  145. package/lib/browser/types.js.map +1 -1
  146. package/lib/browser/untitled-resource.d.ts +2 -2
  147. package/lib/browser/untitled-resource.d.ts.map +1 -1
  148. package/lib/browser/view/editor.react.d.ts.map +1 -1
  149. package/lib/browser/view/editor.react.js.map +1 -1
  150. package/lib/browser/view/suggest-widget.d.ts +1 -2
  151. package/lib/browser/view/suggest-widget.d.ts.map +1 -1
  152. package/lib/browser/view/suggest-widget.js +5 -6
  153. package/lib/browser/view/suggest-widget.js.map +1 -1
  154. package/lib/browser/workbench-editor.service.d.ts +12 -11
  155. package/lib/browser/workbench-editor.service.d.ts.map +1 -1
  156. package/lib/browser/workbench-editor.service.js +51 -52
  157. package/lib/browser/workbench-editor.service.js.map +1 -1
  158. package/lib/common/doc-cache.d.ts +1 -1
  159. package/lib/common/doc-cache.d.ts.map +1 -1
  160. package/lib/common/doc-cache.js.map +1 -1
  161. package/lib/common/editor.d.ts +78 -5
  162. package/lib/common/editor.d.ts.map +1 -1
  163. package/lib/common/editor.js.map +1 -1
  164. package/lib/common/language-status.d.ts +2 -2
  165. package/lib/common/language-status.d.ts.map +1 -1
  166. package/lib/common/language-status.js.map +1 -1
  167. package/lib/common/language.d.ts +1 -3
  168. package/lib/common/language.d.ts.map +1 -1
  169. package/lib/common/language.js.map +1 -1
  170. package/lib/common/mocks/workbench-editor.service.d.ts +3 -3
  171. package/lib/common/mocks/workbench-editor.service.d.ts.map +1 -1
  172. package/lib/common/mocks/workbench-editor.service.js +1 -0
  173. package/lib/common/mocks/workbench-editor.service.js.map +1 -1
  174. package/lib/common/resource.d.ts +1 -1
  175. package/lib/common/resource.d.ts.map +1 -1
  176. package/package.json +13 -13
  177. package/src/browser/breadcrumb/default.ts +3 -3
  178. package/src/browser/breadcrumb/document-symbol.ts +7 -7
  179. package/src/browser/breadcrumb/index.ts +3 -3
  180. package/src/browser/component.ts +5 -5
  181. package/src/browser/decoration-applier.ts +8 -7
  182. package/src/browser/diff/compare.ts +10 -10
  183. package/src/browser/diff/index.ts +12 -12
  184. package/src/browser/doc-cache/local-storage-cache.ts +2 -2
  185. package/src/browser/doc-model/editor-document-model-service.ts +14 -13
  186. package/src/browser/doc-model/editor-document-model.ts +12 -12
  187. package/src/browser/doc-model/editor-document-registry.ts +4 -4
  188. package/src/browser/doc-model/editor-is-fn.ts +1 -1
  189. package/src/browser/doc-model/override.ts +1 -1
  190. package/src/browser/doc-model/save-task.ts +5 -5
  191. package/src/browser/doc-model/saveParticipants.ts +10 -12
  192. package/src/browser/doc-model/types.ts +6 -102
  193. package/src/browser/editor-collection.service.ts +26 -29
  194. package/src/browser/editor-electron.contribution.ts +5 -5
  195. package/src/browser/editor-opener.ts +2 -2
  196. package/src/browser/editor.contribution.ts +34 -39
  197. package/src/browser/editor.decoration.service.ts +7 -7
  198. package/src/browser/editor.module.less +12 -0
  199. package/src/browser/editor.override.ts +12 -14
  200. package/src/browser/editor.status-bar.service.ts +4 -5
  201. package/src/browser/editor.tab.service.ts +16 -0
  202. package/src/browser/editor.view.tsx +14 -10
  203. package/src/browser/feature.ts +3 -3
  204. package/src/browser/format/format.service.ts +2 -2
  205. package/src/browser/format/formatterSelect.ts +2 -2
  206. package/src/browser/fs-resource/fs-editor-doc.ts +8 -8
  207. package/src/browser/fs-resource/fs-resource.ts +6 -7
  208. package/src/browser/grid/grid.service.ts +2 -2
  209. package/src/browser/history/index.ts +6 -6
  210. package/src/browser/index.ts +19 -13
  211. package/src/browser/language/diagnostic-collection.ts +2 -2
  212. package/src/browser/language/language-status.contribution.ts +2 -2
  213. package/src/browser/language/language-status.service.ts +2 -2
  214. package/src/browser/language/language.service.ts +6 -6
  215. package/src/browser/menu/breadcrumbs.menus.ts +2 -6
  216. package/src/browser/menu/editor.context.ts +1 -1
  217. package/src/browser/menu/editor.menu.ts +3 -3
  218. package/src/browser/menu/open-type-menu.contribution.ts +3 -3
  219. package/src/browser/menu/title-context.menu.ts +1 -1
  220. package/src/browser/merge-editor/MergeEditorFloatComponents.tsx +8 -2
  221. package/src/browser/merge-editor/merge-editor.provider.ts +3 -3
  222. package/src/browser/monaco-contrib/callHierarchy/callHierarchy.contribution.ts +2 -2
  223. package/src/browser/monaco-contrib/callHierarchy/callHierarchy.service.ts +3 -3
  224. package/src/browser/monaco-contrib/command/command.service.ts +10 -10
  225. package/src/browser/monaco-contrib/tokenizer/textmate-registry.ts +2 -2
  226. package/src/browser/monaco-contrib/tokenizer/textmate-tokenizer.ts +1 -1
  227. package/src/browser/monaco-contrib/tokenizer/textmate.service.ts +19 -17
  228. package/src/browser/monaco-contrib/typeHierarchy/typeHierarchy.contribution.ts +3 -3
  229. package/src/browser/monaco-contrib/typeHierarchy/typeHierarchy.service.ts +5 -5
  230. package/src/browser/navigation.view.tsx +25 -16
  231. package/src/browser/preference/contribution.ts +1 -1
  232. package/src/browser/preference/converter.ts +20 -1
  233. package/src/browser/preference/schema.ts +22 -4
  234. package/src/browser/preference/util.ts +1 -1
  235. package/src/browser/quick-open/go-to-line.ts +3 -3
  236. package/src/browser/quick-open/workspace-symbol-quickopen.ts +13 -13
  237. package/src/browser/resource.service.ts +9 -9
  238. package/src/browser/tab.view.tsx +168 -119
  239. package/src/browser/types.ts +21 -12
  240. package/src/browser/untitled-resource.ts +12 -12
  241. package/src/browser/view/editor.react.tsx +2 -1
  242. package/src/browser/view/suggest-widget.ts +1 -2
  243. package/src/browser/workbench-editor.service.ts +59 -60
  244. package/src/common/doc-cache.ts +2 -1
  245. package/src/common/editor.ts +109 -10
  246. package/src/common/language-status.ts +5 -3
  247. package/src/common/language.ts +2 -2
  248. package/src/common/mocks/workbench-editor.service.ts +5 -3
  249. package/src/common/resource.ts +1 -1
@@ -1,9 +1,9 @@
1
- import { Injectable, Provider, Autowired, Injector, INJECTOR_TOKEN } from '@opensumi/di';
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,21 +16,22 @@ 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, WorkbenchEditorService, ResourceService, ILanguageService } from '../common';
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 { CompareService, CompareEditorContribution } from './diff/compare';
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 { EditorContribution, EditorAutoSaveEditorContribution } from './editor.contribution';
32
+ import { EditorAutoSaveEditorContribution, EditorContribution } from './editor.contribution';
33
33
  import { EditorDecorationCollectionService } from './editor.decoration.service';
34
+ import { EditorTabService } from './editor.tab.service';
34
35
  import { EditorFeatureRegistryImpl } from './feature';
35
36
  import { FileSystemResourceContribution } from './fs-resource';
36
37
  import { LanguageStatusContribution } from './language/language-status.contribution';
@@ -42,8 +43,8 @@ import { MergeEditorContribution } from './merge-editor/merge-editor.contributio
42
43
  import {
43
44
  CallHierarchyContribution,
44
45
  CallHierarchyService,
45
- TypeHierarchyService,
46
46
  TypeHierarchyContribution,
47
+ TypeHierarchyService,
47
48
  } from './monaco-contrib';
48
49
  import {
49
50
  MonacoActionRegistry,
@@ -55,21 +56,22 @@ import { EditorPreferenceContribution } from './preference/contribution';
55
56
  import { EditorPreferences, editorPreferenceSchema } from './preference/schema';
56
57
  import { ResourceServiceImpl } from './resource.service';
57
58
  import {
58
- EditorComponentRegistry,
59
59
  BrowserEditorContribution,
60
- IEditorDecorationCollectionService,
61
- IEditorActionRegistry,
62
- ICompareService,
60
+ EditorComponentRegistry,
63
61
  IBreadCrumbService,
62
+ ICompareService,
63
+ IEditorActionRegistry,
64
+ IEditorDecorationCollectionService,
64
65
  IEditorFeatureRegistry,
66
+ IEditorTabService,
65
67
  ILanguageStatusService,
66
68
  } from './types';
67
69
  import { WorkbenchEditorServiceImpl } from './workbench-editor.service';
68
- export * from './preference/schema';
69
- export * from './types';
70
- export * from './doc-model/types';
71
70
  export * from './doc-cache';
71
+ export * from './doc-model/types';
72
72
  export * from './editor.less';
73
+ export * from './preference/schema';
74
+ export * from './types';
73
75
  export * from './view/editor.react';
74
76
 
75
77
  @Injectable()
@@ -163,6 +165,10 @@ export class EditorModule extends BrowserModule {
163
165
  token: ILanguageStatusService,
164
166
  useClass: LanguageStatusService,
165
167
  },
168
+ {
169
+ token: IEditorTabService,
170
+ useClass: EditorTabService,
171
+ },
166
172
  EditorPreferenceContribution,
167
173
  DefaultDiffEditorContribution,
168
174
  MergeEditorContribution,
@@ -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 { DisposableCollection, Disposable, IDisposable } from '@opensumi/ide-core-common';
7
+ import { Disposable, DisposableCollection, IDisposable } from '@opensumi/ide-core-common';
8
8
 
9
9
  // eslint-disable-next-line import/order
10
- import { DiagnosticCollection, Diagnostic, asMonacoDiagnostics } from '../../common';
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 { WorkbenchEditorService, IEditor, ILanguageStatusService, ILanguageStatus } from '../../common';
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 { strings, Event, IDisposable } from '@opensumi/ide-core-common';
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 { ILanguageStatusService, ILanguageStatus } from '../../common';
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
- MarkerManager,
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 { Injectable, Autowired } from '@opensumi/di';
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, MenuId, ICtxMenuRenderer } from '@opensumi/ide-core-browser/lib/menu/next';
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 { Injectable, Autowired } from '@opensumi/di';
2
- import { IDisposable, Disposable, IContextKeyService, ILogger } from '@opensumi/ide-core-browser';
3
- import { MenuId, AbstractContextMenuService, IContextMenu } from '@opensumi/ide-core-browser/lib/menu/next';
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 { Injectable, Autowired } from '@opensumi/di';
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';
@@ -1,8 +1,14 @@
1
1
  import React, { useCallback } from 'react';
2
2
 
3
3
  import { Button } from '@opensumi/ide-components';
4
- import { CommandRegistry, CommandService, SCM_COMMANDS, URI, localize } from '@opensumi/ide-core-browser';
5
- import { useInjectable } from '@opensumi/ide-core-browser';
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 { Injectable, Autowired } from '@opensumi/di';
2
- import { URI, WithEventBus, MaybePromise, LabelService } from '@opensumi/ide-core-browser';
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 { IResourceProvider, IResource } from '../../common';
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 { Injectable, Autowired } from '@opensumi/di';
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 { Injectable, Autowired } from '@opensumi/di';
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
- MonacoOverrideServiceRegistry,
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';
@@ -205,7 +205,7 @@ export class MonacoCommandRegistry implements IMonacoCommandsRegistry {
205
205
  * 获取当前活动的编辑器
206
206
  * 此处的活动编辑器和 workbenchEditorService.currentEditor 的概念不同,对于diffEditor,需要获取确实的那个editor而不是modifiedEditor
207
207
  */
208
- protected getActiveCodeEditor(): ICodeEditor | undefined {
208
+ public getActiveCodeEditor(): ICodeEditor | undefined {
209
209
  // 先从 monaco 内部获取到当前 focus 的 editor
210
210
  const editor = this.codeEditorService?.getFocusedCodeEditor();
211
211
  if (editor) {
@@ -290,7 +290,7 @@ export class MonacoActionRegistry implements IMonacoActionRegistry {
290
290
 
291
291
  registerMonacoActions() {
292
292
  const editorActions = new Map(
293
- this.monacoEditorRegistry.getEditorActions().map(({ id, label, alias }) => [
293
+ Array.from(this.monacoEditorRegistry.getEditorActions()).map(({ id, label, alias }) => [
294
294
  id,
295
295
  {
296
296
  label,
@@ -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
- // Some code copied and modified from https://github.com/eclipse-theia/theia/tree/v1.14.0/packages/monaco/src/browser/textmate/textmate-registry.ts
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 { getDebugLogger, URI } from '@opensumi/ide-core-common';
22
+ import { URI, getDebugLogger } from '@opensumi/ide-core-common';
23
23
 
24
24
  import { TokenizerOption } from './textmate-tokenizer';
25
25
 
@@ -1,4 +1,4 @@
1
- import { INITIAL, StackElement, IGrammar } from 'vscode-textmate';
1
+ import { IGrammar, INITIAL, StackElement } from 'vscode-textmate';
2
2
 
3
3
  import { Disposable, Emitter, Event } from '@opensumi/ide-core-common/lib/utils';
4
4
  import {
@@ -1,26 +1,26 @@
1
- import { OnigScanner, loadWASM, OnigString } from 'vscode-oniguruma';
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 { Injectable, Autowired } from '@opensumi/di';
12
+ import { Autowired, Injectable } from '@opensumi/di';
13
13
  import {
14
- WithEventBus,
15
- parseWithComments,
16
- PreferenceService,
17
- ILogger,
14
+ AppConfig,
18
15
  ExtensionActivateEvent,
19
- getDebugLogger,
16
+ ILogger,
17
+ PreferenceService,
18
+ WithEventBus,
20
19
  electronEnv,
21
- AppConfig,
20
+ getDebugLogger,
21
+ parseWithComments,
22
22
  } from '@opensumi/ide-core-browser';
23
- import { URI, Disposable, isObject } from '@opensumi/ide-core-common';
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 { ILanguageExtensionPoint } from '@opensumi/monaco-editor-core/esm/vs/editor/common/languages/language';
53
- import { ILanguageService } from '@opensumi/monaco-editor-core/esm/vs/editor/common/languages/language';
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 { Injectable, Autowired } from '@opensumi/di';
1
+ import { Autowired, Injectable } from '@opensumi/di';
2
2
  import {
3
3
  CancellationToken,
4
- IPosition,
5
4
  IDisposable,
6
- arrays,
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,22 +1,29 @@
1
1
  import cls from 'classnames';
2
- import { observable, makeObservable, action } from 'mobx';
2
+ import { action, makeObservable, observable } from 'mobx';
3
3
  import { observer } from 'mobx-react-lite';
4
- import React, { useCallback, useEffect, useRef, memo } from 'react';
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 { Scrollbars } from '@opensumi/ide-components';
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 {
9
+ Disposable,
10
+ DomListener,
11
+ getIcon,
12
+ useDesignStyles,
13
+ useInjectable,
14
+ useUpdateOnEvent,
15
+ } from '@opensumi/ide-core-browser';
11
16
 
12
17
  import { BreadCrumbsMenuService } from './menu/breadcrumbs.menus';
13
18
  import styles from './navigation.module.less';
14
- import { IBreadCrumbService, IBreadCrumbPart } from './types';
19
+ import { IBreadCrumbPart, IBreadCrumbService } from './types';
15
20
  import { useUpdateOnGroupTabChange } from './view/react-hook';
16
21
  import { EditorGroup } from './workbench-editor.service';
17
22
 
18
23
  export const NavigationBar = ({ editorGroup }: { editorGroup: EditorGroup }) => {
19
- const breadCrumbService = useInjectable(IBreadCrumbService) as IBreadCrumbService;
24
+ const breadCrumbService = useInjectable<IBreadCrumbService>(IBreadCrumbService);
25
+ const styles_navigation_container = useDesignStyles(styles.navigation_container);
26
+ const styles_navigation_icon = useDesignStyles(styles.navigation_icon);
20
27
 
21
28
  useUpdateOnGroupTabChange(editorGroup);
22
29
 
@@ -49,14 +56,14 @@ export const NavigationBar = ({ editorGroup }: { editorGroup: EditorGroup }) =>
49
56
  }
50
57
  return parts.length === 0 ? null : (
51
58
  <div
52
- className={styles.navigation_container}
59
+ className={styles_navigation_container}
53
60
  onContextMenu={(event) => {
54
61
  event.preventDefault();
55
62
  }}
56
63
  >
57
64
  {parts.map((p, i) => (
58
65
  <React.Fragment key={i + '-crumb:' + p.name}>
59
- {i > 0 && <Icon icon={'right'} size='small' className={styles.navigation_icon} />}
66
+ {i > 0 && <Icon icon={'right'} size='small' className={styles_navigation_icon} />}
60
67
  <NavigationItem part={p} editorGroup={editorGroup} />
61
68
  </React.Fragment>
62
69
  ))}
@@ -64,9 +71,10 @@ export const NavigationBar = ({ editorGroup }: { editorGroup: EditorGroup }) =>
64
71
  );
65
72
  };
66
73
  export const NavigationItem = memo(({ part, editorGroup }: { part: IBreadCrumbPart; editorGroup: EditorGroup }) => {
67
- const viewService = useInjectable(NavigationBarViewService) as NavigationBarViewService;
68
- const breadcrumbsMenuService = useInjectable(BreadCrumbsMenuService) as BreadCrumbsMenuService;
74
+ const viewService = useInjectable<NavigationBarViewService>(NavigationBarViewService);
75
+ const breadcrumbsMenuService = useInjectable<BreadCrumbsMenuService>(BreadCrumbsMenuService);
69
76
  const itemRef = useRef<HTMLSpanElement>();
77
+ const styles_navigation_part = useDesignStyles(styles['navigation-part']);
70
78
 
71
79
  const onClick = useCallback(async () => {
72
80
  if (part.getSiblings && itemRef.current) {
@@ -90,7 +98,7 @@ export const NavigationItem = memo(({ part, editorGroup }: { part: IBreadCrumbPa
90
98
  }
91
99
  event.preventDefault();
92
100
  }}
93
- className={styles['navigation-part']}
101
+ className={styles_navigation_part}
94
102
  ref={itemRef as any}
95
103
  >
96
104
  {part.icon && <span className={part.icon}></span>}
@@ -109,7 +117,8 @@ export const NavigationMenu = observer(({ model }: { model: NavigationMenuModel
109
117
  }
110
118
 
111
119
  const scrollerContainer = useRef<HTMLDivElement | null>();
112
-
120
+ const styles_navigation_menu = useDesignStyles(styles.navigation_menu);
121
+ const styles_navigation_menu_item = useDesignStyles(styles.navigation_menu_item);
113
122
  const viewService = useInjectable(NavigationBarViewService) as NavigationBarViewService;
114
123
 
115
124
  const scrollToCurrent = useCallback(() => {
@@ -127,7 +136,7 @@ export const NavigationMenu = observer(({ model }: { model: NavigationMenuModel
127
136
 
128
137
  return (
129
138
  <div
130
- className={styles.navigation_menu}
139
+ className={styles_navigation_menu}
131
140
  style={{
132
141
  left: model.x + 'px',
133
142
  top: top + 'px',
@@ -170,7 +179,7 @@ export const NavigationMenu = observer(({ model }: { model: NavigationMenuModel
170
179
  <div
171
180
  onClick={clickToNavigate || clickToGetChild}
172
181
  ref={(el) => (itemRef = el)}
173
- className={cls(styles.navigation_menu_item, {
182
+ className={cls(styles_navigation_menu_item, {
174
183
  [styles.navigation_menu_item_current]: i === model.initialIndex,
175
184
  })}
176
185
  key={'menu-' + p.name}
@@ -1,4 +1,4 @@
1
- import { PreferenceContribution, Domain } from '@opensumi/ide-core-browser';
1
+ import { Domain, PreferenceContribution } from '@opensumi/ide-core-browser';
2
2
 
3
3
  import { editorPreferenceSchema } from './schema';
4
4
 
@@ -1,4 +1,4 @@
1
- import { objects, Uri } from '@opensumi/ide-core-browser';
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
 
@@ -728,6 +728,25 @@ export const editorOptionsConverters: Map<KaitianPreferenceKey, NoConverter | IM
728
728
  * Controls whether characters are highlighted that can be confused with basic ASCII characters
729
729
  */
730
730
  ['editor.unicodeHighlight', { monaco: 'unicodeHighlight' }],
731
+
732
+ /**
733
+ * Suggest options.
734
+ */
735
+ [
736
+ 'editor.inlineSuggest.showToolbar',
737
+ {
738
+ monaco: 'inlineSuggest',
739
+ convert: (value) => {
740
+ if (value) {
741
+ return {
742
+ showToolbar: value,
743
+ };
744
+ } else {
745
+ return undefined;
746
+ }
747
+ },
748
+ },
749
+ ],
731
750
  ]);
732
751
 
733
752
  export const textModelUpdateOptionsConverters: Map<KaitianPreferenceKey, NoConverter | IMonacoOptionsConverter> =