@theia/monaco 1.45.1 → 1.46.0-next.72

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 (222) hide show
  1. package/README.md +100 -100
  2. package/data/monaco-nls.json +1379 -1379
  3. package/data/monaco-themes/vscode/dark_plus.json +201 -201
  4. package/data/monaco-themes/vscode/dark_theia.json +5 -5
  5. package/data/monaco-themes/vscode/dark_vs.json +393 -393
  6. package/data/monaco-themes/vscode/hc_black.json +457 -457
  7. package/data/monaco-themes/vscode/hc_light.json +590 -590
  8. package/data/monaco-themes/vscode/hc_theia.json +5 -5
  9. package/data/monaco-themes/vscode/hc_theia_light.json +5 -5
  10. package/data/monaco-themes/vscode/light_plus.json +202 -202
  11. package/data/monaco-themes/vscode/light_theia.json +10 -10
  12. package/data/monaco-themes/vscode/light_vs.json +421 -421
  13. package/lib/browser/index.d.ts +1 -1
  14. package/lib/browser/index.js +28 -28
  15. package/lib/browser/markdown-renderer/monaco-markdown-renderer.d.ts +20 -24
  16. package/lib/browser/markdown-renderer/monaco-markdown-renderer.d.ts.map +1 -1
  17. package/lib/browser/markdown-renderer/monaco-markdown-renderer.js +122 -137
  18. package/lib/browser/markdown-renderer/monaco-markdown-renderer.js.map +1 -1
  19. package/lib/browser/monaco-bulk-edit-service.d.ts +12 -14
  20. package/lib/browser/monaco-bulk-edit-service.d.ts.map +1 -1
  21. package/lib/browser/monaco-bulk-edit-service.js +66 -66
  22. package/lib/browser/monaco-bulk-edit-service.js.map +1 -1
  23. package/lib/browser/monaco-color-registry.d.ts +16 -16
  24. package/lib/browser/monaco-color-registry.js +82 -82
  25. package/lib/browser/monaco-command-registry.d.ts +19 -19
  26. package/lib/browser/monaco-command-registry.d.ts.map +1 -1
  27. package/lib/browser/monaco-command-registry.js +88 -85
  28. package/lib/browser/monaco-command-registry.js.map +1 -1
  29. package/lib/browser/monaco-command-service.d.ts +21 -26
  30. package/lib/browser/monaco-command-service.d.ts.map +1 -1
  31. package/lib/browser/monaco-command-service.js +93 -92
  32. package/lib/browser/monaco-command-service.js.map +1 -1
  33. package/lib/browser/monaco-command.d.ts +88 -94
  34. package/lib/browser/monaco-command.d.ts.map +1 -1
  35. package/lib/browser/monaco-command.js +294 -307
  36. package/lib/browser/monaco-command.js.map +1 -1
  37. package/lib/browser/monaco-context-key-service.d.ts +22 -22
  38. package/lib/browser/monaco-context-key-service.d.ts.map +1 -1
  39. package/lib/browser/monaco-context-key-service.js +146 -147
  40. package/lib/browser/monaco-context-key-service.js.map +1 -1
  41. package/lib/browser/monaco-context-menu.d.ts +17 -16
  42. package/lib/browser/monaco-context-menu.d.ts.map +1 -1
  43. package/lib/browser/monaco-context-menu.js +112 -102
  44. package/lib/browser/monaco-context-menu.js.map +1 -1
  45. package/lib/browser/monaco-diff-editor.d.ts +29 -29
  46. package/lib/browser/monaco-diff-editor.d.ts.map +1 -1
  47. package/lib/browser/monaco-diff-editor.js +74 -74
  48. package/lib/browser/monaco-diff-editor.js.map +1 -1
  49. package/lib/browser/monaco-diff-navigator-factory.d.ts +6 -7
  50. package/lib/browser/monaco-diff-navigator-factory.d.ts.map +1 -1
  51. package/lib/browser/monaco-diff-navigator-factory.js +45 -66
  52. package/lib/browser/monaco-diff-navigator-factory.js.map +1 -1
  53. package/lib/browser/monaco-editor-model.d.ts +158 -156
  54. package/lib/browser/monaco-editor-model.d.ts.map +1 -1
  55. package/lib/browser/monaco-editor-model.js +562 -559
  56. package/lib/browser/monaco-editor-model.js.map +1 -1
  57. package/lib/browser/monaco-editor-provider.d.ts +70 -89
  58. package/lib/browser/monaco-editor-provider.d.ts.map +1 -1
  59. package/lib/browser/monaco-editor-provider.js +386 -440
  60. package/lib/browser/monaco-editor-provider.js.map +1 -1
  61. package/lib/browser/monaco-editor-service.d.ts +32 -27
  62. package/lib/browser/monaco-editor-service.d.ts.map +1 -1
  63. package/lib/browser/monaco-editor-service.js +158 -155
  64. package/lib/browser/monaco-editor-service.js.map +1 -1
  65. package/lib/browser/monaco-editor-zone-widget.d.ts +43 -43
  66. package/lib/browser/monaco-editor-zone-widget.js +194 -194
  67. package/lib/browser/monaco-editor.d.ts +154 -151
  68. package/lib/browser/monaco-editor.d.ts.map +1 -1
  69. package/lib/browser/monaco-editor.js +542 -524
  70. package/lib/browser/monaco-editor.js.map +1 -1
  71. package/lib/browser/monaco-formatting-conflicts.d.ts +13 -13
  72. package/lib/browser/monaco-formatting-conflicts.js +111 -111
  73. package/lib/browser/monaco-formatting-conflicts.js.map +1 -1
  74. package/lib/browser/monaco-frontend-application-contribution.d.ts +22 -28
  75. package/lib/browser/monaco-frontend-application-contribution.d.ts.map +1 -1
  76. package/lib/browser/monaco-frontend-application-contribution.js +178 -215
  77. package/lib/browser/monaco-frontend-application-contribution.js.map +1 -1
  78. package/lib/browser/monaco-frontend-module.d.ts +7 -7
  79. package/lib/browser/monaco-frontend-module.d.ts.map +1 -1
  80. package/lib/browser/monaco-frontend-module.js +280 -271
  81. package/lib/browser/monaco-frontend-module.js.map +1 -1
  82. package/lib/browser/monaco-gotoline-quick-access.d.ts +11 -11
  83. package/lib/browser/monaco-gotoline-quick-access.js +64 -64
  84. package/lib/browser/monaco-gotosymbol-quick-access.d.ts +16 -16
  85. package/lib/browser/monaco-gotosymbol-quick-access.js +70 -70
  86. package/lib/browser/monaco-icon-registry.d.ts +10 -11
  87. package/lib/browser/monaco-icon-registry.d.ts.map +1 -1
  88. package/lib/browser/monaco-icon-registry.js +52 -50
  89. package/lib/browser/monaco-icon-registry.js.map +1 -1
  90. package/lib/browser/monaco-indexed-db.d.ts +28 -28
  91. package/lib/browser/monaco-indexed-db.js +131 -131
  92. package/lib/browser/monaco-init.d.ts +5 -0
  93. package/lib/browser/monaco-init.d.ts.map +1 -0
  94. package/lib/browser/monaco-init.js +125 -0
  95. package/lib/browser/monaco-init.js.map +1 -0
  96. package/lib/browser/monaco-keybinding.d.ts +16 -16
  97. package/lib/browser/monaco-keybinding.js +134 -134
  98. package/lib/browser/monaco-keybinding.js.map +1 -1
  99. package/lib/browser/monaco-keycode-map.d.ts +2 -2
  100. package/lib/browser/monaco-keycode-map.js +163 -163
  101. package/lib/browser/monaco-keycode-map.js.map +1 -1
  102. package/lib/browser/monaco-languages.d.ts +35 -35
  103. package/lib/browser/monaco-languages.js +180 -180
  104. package/lib/browser/monaco-marker-collection.d.ts +18 -18
  105. package/lib/browser/monaco-marker-collection.js +70 -70
  106. package/lib/browser/monaco-menu.d.ts +20 -20
  107. package/lib/browser/monaco-menu.js +145 -145
  108. package/lib/browser/monaco-mime-service.d.ts +10 -10
  109. package/lib/browser/monaco-mime-service.js +78 -78
  110. package/lib/browser/monaco-outline-contribution.d.ts +78 -78
  111. package/lib/browser/monaco-outline-contribution.js +384 -384
  112. package/lib/browser/monaco-outline-decorator.d.ts +12 -12
  113. package/lib/browser/monaco-outline-decorator.js +67 -67
  114. package/lib/browser/monaco-quick-access-registry.d.ts +11 -11
  115. package/lib/browser/monaco-quick-access-registry.js +99 -99
  116. package/lib/browser/monaco-quick-input-service.d.ts +99 -101
  117. package/lib/browser/monaco-quick-input-service.d.ts.map +1 -1
  118. package/lib/browser/monaco-quick-input-service.js +529 -568
  119. package/lib/browser/monaco-quick-input-service.js.map +1 -1
  120. package/lib/browser/monaco-resolved-keybinding.d.ts +23 -23
  121. package/lib/browser/monaco-resolved-keybinding.d.ts.map +1 -1
  122. package/lib/browser/monaco-resolved-keybinding.js +131 -131
  123. package/lib/browser/monaco-resolved-keybinding.js.map +1 -1
  124. package/lib/browser/monaco-snippet-suggest-provider.d.ts +66 -66
  125. package/lib/browser/monaco-snippet-suggest-provider.js +273 -273
  126. package/lib/browser/monaco-status-bar-contribution.d.ts +17 -17
  127. package/lib/browser/monaco-status-bar-contribution.js +121 -121
  128. package/lib/browser/monaco-text-model-service.d.ts +51 -51
  129. package/lib/browser/monaco-text-model-service.js +189 -189
  130. package/lib/browser/monaco-text-model-service.js.map +1 -1
  131. package/lib/browser/monaco-theming-service.d.ts +67 -67
  132. package/lib/browser/monaco-theming-service.js +171 -171
  133. package/lib/browser/monaco-to-protocol-converter.d.ts +26 -26
  134. package/lib/browser/monaco-to-protocol-converter.js +61 -61
  135. package/lib/browser/monaco-workspace.d.ts +83 -85
  136. package/lib/browser/monaco-workspace.d.ts.map +1 -1
  137. package/lib/browser/monaco-workspace.js +384 -384
  138. package/lib/browser/monaco-workspace.js.map +1 -1
  139. package/lib/browser/protocol-to-monaco-converter.d.ts +31 -31
  140. package/lib/browser/protocol-to-monaco-converter.js +133 -133
  141. package/lib/browser/simple-monaco-editor.d.ts +45 -44
  142. package/lib/browser/simple-monaco-editor.d.ts.map +1 -1
  143. package/lib/browser/simple-monaco-editor.js +184 -176
  144. package/lib/browser/simple-monaco-editor.js.map +1 -1
  145. package/lib/browser/textmate/index.d.ts +4 -4
  146. package/lib/browser/textmate/index.js +31 -31
  147. package/lib/browser/textmate/monaco-textmate-frontend-bindings.d.ts +11 -11
  148. package/lib/browser/textmate/monaco-textmate-frontend-bindings.js +91 -91
  149. package/lib/browser/textmate/monaco-textmate-service.d.ts +30 -30
  150. package/lib/browser/textmate/monaco-textmate-service.js +185 -185
  151. package/lib/browser/textmate/monaco-textmate-service.js.map +1 -1
  152. package/lib/browser/textmate/monaco-theme-registry.d.ts +27 -27
  153. package/lib/browser/textmate/monaco-theme-registry.js +173 -173
  154. package/lib/browser/textmate/monaco-theme-types.d.ts +20 -20
  155. package/lib/browser/textmate/monaco-theme-types.js +21 -21
  156. package/lib/browser/textmate/textmate-contribution.d.ts +9 -9
  157. package/lib/browser/textmate/textmate-contribution.js +27 -27
  158. package/lib/browser/textmate/textmate-registry.d.ts +31 -31
  159. package/lib/browser/textmate/textmate-registry.js +109 -109
  160. package/lib/browser/textmate/textmate-snippet-completion-provider.d.ts +26 -26
  161. package/lib/browser/textmate/textmate-snippet-completion-provider.js +53 -53
  162. package/lib/browser/textmate/textmate-tokenizer.d.ts +22 -22
  163. package/lib/browser/textmate/textmate-tokenizer.js +65 -65
  164. package/lib/browser/workspace-symbol-command.d.ts +55 -55
  165. package/lib/browser/workspace-symbol-command.js +215 -215
  166. package/lib/package.spec.js +25 -25
  167. package/package.json +10 -10
  168. package/src/browser/index.ts +17 -17
  169. package/src/browser/markdown-renderer/monaco-markdown-renderer.ts +109 -117
  170. package/src/browser/monaco-bulk-edit-service.ts +64 -64
  171. package/src/browser/monaco-color-registry.ts +73 -73
  172. package/src/browser/monaco-command-registry.ts +85 -82
  173. package/src/browser/monaco-command-service.ts +90 -99
  174. package/src/browser/monaco-command.ts +303 -313
  175. package/src/browser/monaco-context-key-service.ts +144 -143
  176. package/src/browser/monaco-context-menu.ts +100 -90
  177. package/src/browser/monaco-diff-editor.ts +100 -101
  178. package/src/browser/monaco-diff-navigator-factory.ts +39 -61
  179. package/src/browser/monaco-editor-model.ts +684 -681
  180. package/src/browser/monaco-editor-provider.ts +409 -452
  181. package/src/browser/monaco-editor-service.ts +149 -144
  182. package/src/browser/monaco-editor-zone-widget.ts +250 -250
  183. package/src/browser/monaco-editor.ts +663 -644
  184. package/src/browser/monaco-formatting-conflicts.ts +116 -116
  185. package/src/browser/monaco-frontend-application-contribution.ts +165 -200
  186. package/src/browser/monaco-frontend-module.ts +328 -320
  187. package/src/browser/monaco-gotoline-quick-access.ts +47 -47
  188. package/src/browser/monaco-gotosymbol-quick-access.ts +53 -53
  189. package/src/browser/monaco-icon-registry.ts +49 -47
  190. package/src/browser/monaco-indexed-db.ts +130 -130
  191. package/src/browser/monaco-init.ts +114 -0
  192. package/src/browser/monaco-keybinding.ts +111 -111
  193. package/src/browser/monaco-keycode-map.ts +171 -171
  194. package/src/browser/monaco-languages.ts +177 -177
  195. package/src/browser/monaco-marker-collection.ts +83 -83
  196. package/src/browser/monaco-menu.ts +142 -142
  197. package/src/browser/monaco-mime-service.ts +71 -71
  198. package/src/browser/monaco-outline-contribution.ts +404 -404
  199. package/src/browser/monaco-outline-decorator.ts +66 -66
  200. package/src/browser/monaco-quick-access-registry.ts +112 -112
  201. package/src/browser/monaco-quick-input-service.ts +647 -676
  202. package/src/browser/monaco-resolved-keybinding.ts +162 -162
  203. package/src/browser/monaco-snippet-suggest-provider.ts +306 -306
  204. package/src/browser/monaco-status-bar-contribution.ts +110 -110
  205. package/src/browser/monaco-text-model-service.ts +199 -199
  206. package/src/browser/monaco-theming-service.ts +204 -204
  207. package/src/browser/monaco-to-protocol-converter.ts +71 -71
  208. package/src/browser/monaco-workspace.ts +412 -412
  209. package/src/browser/protocol-to-monaco-converter.ts +158 -158
  210. package/src/browser/simple-monaco-editor.ts +217 -210
  211. package/src/browser/style/index.css +263 -263
  212. package/src/browser/textmate/index.ts +20 -20
  213. package/src/browser/textmate/monaco-textmate-frontend-bindings.ts +90 -90
  214. package/src/browser/textmate/monaco-textmate-service.ts +187 -187
  215. package/src/browser/textmate/monaco-theme-registry.ts +176 -176
  216. package/src/browser/textmate/monaco-theme-types.ts +37 -37
  217. package/src/browser/textmate/textmate-contribution.ts +29 -29
  218. package/src/browser/textmate/textmate-registry.ts +129 -129
  219. package/src/browser/textmate/textmate-snippet-completion-provider.ts +73 -73
  220. package/src/browser/textmate/textmate-tokenizer.ts +84 -84
  221. package/src/browser/workspace-symbol-command.ts +196 -196
  222. package/src/package.spec.ts +28 -28
@@ -1,17 +1,17 @@
1
- // *****************************************************************************
2
- // Copyright (C) 2017 TypeFox and others.
3
- //
4
- // This program and the accompanying materials are made available under the
5
- // terms of the Eclipse Public License v. 2.0 which is available at
6
- // http://www.eclipse.org/legal/epl-2.0.
7
- //
8
- // This Source Code may also be made available under the following Secondary
9
- // Licenses when the conditions for such availability set forth in the Eclipse
10
- // Public License v. 2.0 are satisfied: GNU General Public License, version 2
11
- // with the GNU Classpath Exception which is available at
12
- // https://www.gnu.org/software/classpath/license.html.
13
- //
14
- // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
15
- // *****************************************************************************
16
-
17
- export * from './monaco-frontend-module';
1
+ // *****************************************************************************
2
+ // Copyright (C) 2017 TypeFox and others.
3
+ //
4
+ // This program and the accompanying materials are made available under the
5
+ // terms of the Eclipse Public License v. 2.0 which is available at
6
+ // http://www.eclipse.org/legal/epl-2.0.
7
+ //
8
+ // This Source Code may also be made available under the following Secondary
9
+ // Licenses when the conditions for such availability set forth in the Eclipse
10
+ // Public License v. 2.0 are satisfied: GNU General Public License, version 2
11
+ // with the GNU Classpath Exception which is available at
12
+ // https://www.gnu.org/software/classpath/license.html.
13
+ //
14
+ // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
15
+ // *****************************************************************************
16
+
17
+ export * from './monaco-frontend-module';
@@ -1,117 +1,109 @@
1
- // *****************************************************************************
2
- // Copyright (C) 2022 Ericsson and others.
3
- //
4
- // This program and the accompanying materials are made available under the
5
- // terms of the Eclipse Public License v. 2.0 which is available at
6
- // http://www.eclipse.org/legal/epl-2.0.
7
- //
8
- // This Source Code may also be made available under the following Secondary
9
- // Licenses when the conditions for such availability set forth in the Eclipse
10
- // Public License v. 2.0 are satisfied: GNU General Public License, version 2
11
- // with the GNU Classpath Exception which is available at
12
- // https://www.gnu.org/software/classpath/license.html.
13
- //
14
- // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
15
- // *****************************************************************************
16
-
17
- import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
18
- import { ILanguageService } from '@theia/monaco-editor-core/esm/vs/editor/common/languages/language';
19
- import { MarkdownRenderer as CodeMarkdownRenderer } from '@theia/monaco-editor-core/esm/vs/editor/contrib/markdownRenderer/browser/markdownRenderer';
20
- import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
21
- import { MonacoCommandServiceFactory } from '../monaco-command-service';
22
- import { MonacoEditorService } from '../monaco-editor-service';
23
- import * as monaco from '@theia/monaco-editor-core';
24
- import { OpenerService as MonacoOpenerService } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/openerService';
25
- import { OpenerService, PreferenceService, WidgetOpenerOptions, open } from '@theia/core/lib/browser';
26
- import { OpenExternalOptions, OpenInternalOptions } from '@theia/monaco-editor-core/esm/vs/platform/opener/common/opener';
27
- import { HttpOpenHandlerOptions } from '@theia/core/lib/browser/http-open-handler';
28
- import { URI } from '@theia/core/lib/common/uri';
29
- import { MarkdownRenderer, MarkdownRenderOptions, MarkdownRenderResult } from '@theia/core/lib/browser/markdown-rendering/markdown-renderer';
30
- import { MarkedOptions, MarkdownRenderOptions as MonacoMarkdownRenderOptions } from '@theia/monaco-editor-core/esm/vs/base/browser/markdownRenderer';
31
- import { MarkdownString } from '@theia/core/lib/common/markdown-rendering';
32
- import { DisposableStore } from '@theia/monaco-editor-core/esm/vs/base/common/lifecycle';
33
- import { DisposableCollection, DisposableGroup } from '@theia/core';
34
-
35
- @injectable()
36
- export class MonacoMarkdownRenderer implements MarkdownRenderer {
37
- @inject(MonacoEditorService) protected readonly codeEditorService: MonacoEditorService;
38
- @inject(MonacoCommandServiceFactory) protected readonly commandServiceFactory: MonacoCommandServiceFactory;
39
- @inject(OpenerService) protected readonly openerService: OpenerService;
40
- @inject(PreferenceService) protected readonly preferences: PreferenceService;
41
-
42
- protected delegate: CodeMarkdownRenderer;
43
- protected _openerService: OpenerService | undefined;
44
-
45
- render(markdown: MarkdownString | undefined, options?: MarkdownRenderOptions, markedOptions?: MarkedOptions): MarkdownRenderResult {
46
- return this.delegate.render(markdown, this.transformOptions(options), markedOptions);
47
- }
48
-
49
- protected transformOptions(options?: MarkdownRenderOptions): MonacoMarkdownRenderOptions | undefined {
50
- if (!options?.actionHandler) {
51
- return options as MarkdownRenderOptions & { actionHandler: undefined } | undefined;
52
- }
53
- const monacoActionHandler: MonacoMarkdownRenderOptions['actionHandler'] = {
54
- disposables: this.toDisposableStore(options.actionHandler.disposables),
55
- callback: (content, e) => options.actionHandler!.callback(content, e?.browserEvent)
56
- };
57
- return { ...options, actionHandler: monacoActionHandler };
58
- }
59
-
60
- protected toDisposableStore(current: DisposableGroup): DisposableStore {
61
- if (current instanceof DisposableStore) {
62
- return current;
63
- } else if (current instanceof DisposableCollection) {
64
- const store = new DisposableStore();
65
- current['disposables'].forEach(disposable => store.add(disposable));
66
- return store;
67
- } else {
68
- return new DisposableStore();
69
- }
70
- }
71
-
72
- @postConstruct()
73
- protected init(): void {
74
- const languages = StandaloneServices.get(ILanguageService);
75
- const openerService = new MonacoOpenerService(this.codeEditorService, this.commandServiceFactory());
76
- openerService.registerOpener({
77
- open: (u, options) => this.interceptOpen(u, options)
78
- });
79
- const getPreference = () => this.preferences.get<string>('editor.fontFamily');
80
- const rendererOptions = new Proxy(Object.create(null), { // eslint-disable-line no-null/no-null
81
- get(_, field): string | undefined {
82
- if (field === 'codeBlockFontFamily') {
83
- return getPreference();
84
- } else {
85
- return undefined;
86
- }
87
- }
88
- });
89
- this.delegate = new CodeMarkdownRenderer(rendererOptions, languages, openerService);
90
- }
91
-
92
- protected async interceptOpen(monacoUri: monaco.Uri | string, monacoOptions?: OpenInternalOptions | OpenExternalOptions): Promise<boolean> {
93
- let options = undefined;
94
- if (monacoOptions) {
95
- if ('openToSide' in monacoOptions && monacoOptions.openToSide) {
96
- options = Object.assign(options || {}, <WidgetOpenerOptions>{
97
- widgetOptions: {
98
- mode: 'split-right'
99
- }
100
- });
101
- }
102
- if ('openExternal' in monacoOptions && monacoOptions.openExternal) {
103
- options = Object.assign(options || {}, <HttpOpenHandlerOptions>{
104
- openExternal: true
105
- });
106
- }
107
- }
108
- const uri = new URI(monacoUri.toString());
109
- try {
110
- await open(this.openerService, uri, options);
111
- return true;
112
- } catch (e) {
113
- console.error(`Fail to open '${uri.toString()}':`, e);
114
- return false;
115
- }
116
- }
117
- }
1
+ // *****************************************************************************
2
+ // Copyright (C) 2022 Ericsson and others.
3
+ //
4
+ // This program and the accompanying materials are made available under the
5
+ // terms of the Eclipse Public License v. 2.0 which is available at
6
+ // http://www.eclipse.org/legal/epl-2.0.
7
+ //
8
+ // This Source Code may also be made available under the following Secondary
9
+ // Licenses when the conditions for such availability set forth in the Eclipse
10
+ // Public License v. 2.0 are satisfied: GNU General Public License, version 2
11
+ // with the GNU Classpath Exception which is available at
12
+ // https://www.gnu.org/software/classpath/license.html.
13
+ //
14
+ // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
15
+ // *****************************************************************************
16
+
17
+ import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
18
+ import { ILanguageService } from '@theia/monaco-editor-core/esm/vs/editor/common/languages/language';
19
+ import { MarkdownRenderer as CodeMarkdownRenderer, IMarkdownRendererOptions } from '@theia/monaco-editor-core/esm/vs/editor/contrib/markdownRenderer/browser/markdownRenderer';
20
+ import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
21
+ import * as monaco from '@theia/monaco-editor-core';
22
+ import { OpenerService, PreferenceService, WidgetOpenerOptions, open } from '@theia/core/lib/browser';
23
+ import { IOpenerService, OpenExternalOptions, OpenInternalOptions } from '@theia/monaco-editor-core/esm/vs/platform/opener/common/opener';
24
+ import { HttpOpenHandlerOptions } from '@theia/core/lib/browser/http-open-handler';
25
+ import { URI } from '@theia/core/lib/common/uri';
26
+ import { MarkdownRenderer, MarkdownRenderOptions, MarkdownRenderResult } from '@theia/core/lib/browser/markdown-rendering/markdown-renderer';
27
+ import { MarkedOptions, MarkdownRenderOptions as MonacoMarkdownRenderOptions } from '@theia/monaco-editor-core/esm/vs/base/browser/markdownRenderer';
28
+ import { MarkdownString } from '@theia/core/lib/common/markdown-rendering';
29
+ import { DisposableStore } from '@theia/monaco-editor-core/esm/vs/base/common/lifecycle';
30
+ import { DisposableCollection, DisposableGroup } from '@theia/core';
31
+
32
+ @injectable()
33
+ export class MonacoMarkdownRenderer implements MarkdownRenderer {
34
+ @inject(OpenerService) protected readonly openerService: OpenerService;
35
+ @inject(PreferenceService) protected readonly preferences: PreferenceService;
36
+
37
+ protected delegate: CodeMarkdownRenderer;
38
+ protected _openerService: OpenerService | undefined;
39
+
40
+ render(markdown: MarkdownString | undefined, options?: MarkdownRenderOptions, markedOptions?: MarkedOptions): MarkdownRenderResult {
41
+ return this.delegate.render(markdown, this.transformOptions(options), markedOptions);
42
+ }
43
+
44
+ protected transformOptions(options?: MarkdownRenderOptions): MonacoMarkdownRenderOptions | undefined {
45
+ if (!options?.actionHandler) {
46
+ return options as MarkdownRenderOptions & { actionHandler: undefined } | undefined;
47
+ }
48
+ const monacoActionHandler: MonacoMarkdownRenderOptions['actionHandler'] = {
49
+ disposables: this.toDisposableStore(options.actionHandler.disposables),
50
+ callback: (content, e) => options.actionHandler!.callback(content, e?.browserEvent)
51
+ };
52
+ return { ...options, actionHandler: monacoActionHandler };
53
+ }
54
+
55
+ protected toDisposableStore(current: DisposableGroup): DisposableStore {
56
+ if (current instanceof DisposableStore) {
57
+ return current;
58
+ } else if (current instanceof DisposableCollection) {
59
+ const store = new DisposableStore();
60
+ current['disposables'].forEach(disposable => store.add(disposable));
61
+ return store;
62
+ } else {
63
+ return new DisposableStore();
64
+ }
65
+ }
66
+
67
+ @postConstruct()
68
+ protected init(): void {
69
+ const languages = StandaloneServices.get(ILanguageService);
70
+ const openerService = StandaloneServices.get(IOpenerService);
71
+ openerService.registerOpener({
72
+ open: (u, options) => this.interceptOpen(u, options)
73
+ });
74
+ const that = this;
75
+ const prefs = new class implements IMarkdownRendererOptions {
76
+ get codeBlockFontFamily(): string | undefined {
77
+ return that.preferences.get<string>('editor.fontFamily');
78
+ }
79
+ };
80
+
81
+ this.delegate = new CodeMarkdownRenderer(prefs, languages, openerService);
82
+ }
83
+
84
+ protected async interceptOpen(monacoUri: monaco.Uri | string, monacoOptions?: OpenInternalOptions | OpenExternalOptions): Promise<boolean> {
85
+ let options = undefined;
86
+ if (monacoOptions) {
87
+ if ('openToSide' in monacoOptions && monacoOptions.openToSide) {
88
+ options = Object.assign(options || {}, <WidgetOpenerOptions>{
89
+ widgetOptions: {
90
+ mode: 'split-right'
91
+ }
92
+ });
93
+ }
94
+ if ('openExternal' in monacoOptions && monacoOptions.openExternal) {
95
+ options = Object.assign(options || {}, <HttpOpenHandlerOptions>{
96
+ openExternal: true
97
+ });
98
+ }
99
+ }
100
+ const uri = new URI(monacoUri.toString());
101
+ try {
102
+ await open(this.openerService, uri, options);
103
+ return true;
104
+ } catch (e) {
105
+ console.error(`Fail to open '${uri.toString()}':`, e);
106
+ return false;
107
+ }
108
+ }
109
+ }
@@ -1,64 +1,64 @@
1
- // *****************************************************************************
2
- // Copyright (C) 2018 TypeFox and others.
3
- //
4
- // This program and the accompanying materials are made available under the
5
- // terms of the Eclipse Public License v. 2.0 which is available at
6
- // http://www.eclipse.org/legal/epl-2.0.
7
- //
8
- // This Source Code may also be made available under the following Secondary
9
- // Licenses when the conditions for such availability set forth in the Eclipse
10
- // Public License v. 2.0 are satisfied: GNU General Public License, version 2
11
- // with the GNU Classpath Exception which is available at
12
- // https://www.gnu.org/software/classpath/license.html.
13
- //
14
- // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
15
- // *****************************************************************************
16
-
17
- import { injectable, inject } from '@theia/core/shared/inversify';
18
- import { MonacoWorkspace } from './monaco-workspace';
19
- import {
20
- IBulkEditOptions, IBulkEditPreviewHandler, IBulkEditResult, IBulkEditService, ResourceEdit
21
- } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/bulkEditService';
22
- import { IDisposable } from '@theia/monaco-editor-core/esm/vs/base/common/lifecycle';
23
- import { WorkspaceEdit } from '@theia/monaco-editor-core/esm/vs/editor/common/languages';
24
-
25
- @injectable()
26
- export class MonacoBulkEditService implements IBulkEditService {
27
- declare readonly _serviceBrand: undefined;
28
-
29
- @inject(MonacoWorkspace)
30
- protected readonly workspace: MonacoWorkspace;
31
-
32
- private _previewHandler?: IBulkEditPreviewHandler;
33
-
34
- async apply(editsIn: ResourceEdit[] | WorkspaceEdit, options?: IBulkEditOptions): Promise<IBulkEditResult & { success: boolean }> {
35
- const edits = Array.isArray(editsIn) ? editsIn : ResourceEdit.convert(editsIn);
36
-
37
- if (this._previewHandler && (options?.showPreview || edits.some(value => value.metadata?.needsConfirmation))) {
38
- editsIn = await this._previewHandler(edits, options);
39
- return { ariaSummary: '', success: true };
40
- } else {
41
- return this.workspace.applyBulkEdit(edits, options);
42
- }
43
- }
44
-
45
- hasPreviewHandler(): boolean {
46
- return Boolean(this._previewHandler);
47
- }
48
-
49
- setPreviewHandler(handler: IBulkEditPreviewHandler): IDisposable {
50
- this._previewHandler = handler;
51
-
52
- const disposePreviewHandler = () => {
53
- if (this._previewHandler === handler) {
54
- this._previewHandler = undefined;
55
- }
56
- };
57
-
58
- return {
59
- dispose(): void {
60
- disposePreviewHandler();
61
- }
62
- };
63
- }
64
- }
1
+ // *****************************************************************************
2
+ // Copyright (C) 2018 TypeFox and others.
3
+ //
4
+ // This program and the accompanying materials are made available under the
5
+ // terms of the Eclipse Public License v. 2.0 which is available at
6
+ // http://www.eclipse.org/legal/epl-2.0.
7
+ //
8
+ // This Source Code may also be made available under the following Secondary
9
+ // Licenses when the conditions for such availability set forth in the Eclipse
10
+ // Public License v. 2.0 are satisfied: GNU General Public License, version 2
11
+ // with the GNU Classpath Exception which is available at
12
+ // https://www.gnu.org/software/classpath/license.html.
13
+ //
14
+ // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
15
+ // *****************************************************************************
16
+
17
+ import { injectable, inject } from '@theia/core/shared/inversify';
18
+ import { MonacoWorkspace } from './monaco-workspace';
19
+ import {
20
+ IBulkEditOptions, IBulkEditPreviewHandler, IBulkEditResult, IBulkEditService, ResourceEdit
21
+ } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/bulkEditService';
22
+ import { IDisposable } from '@theia/monaco-editor-core/esm/vs/base/common/lifecycle';
23
+ import { WorkspaceEdit } from '@theia/monaco-editor-core/esm/vs/editor/common/languages';
24
+
25
+ @injectable()
26
+ export class MonacoBulkEditService implements IBulkEditService {
27
+ declare readonly _serviceBrand: undefined;
28
+
29
+ @inject(MonacoWorkspace)
30
+ protected readonly workspace: MonacoWorkspace;
31
+
32
+ private _previewHandler?: IBulkEditPreviewHandler;
33
+
34
+ async apply(editsIn: ResourceEdit[] | WorkspaceEdit, options?: IBulkEditOptions): Promise<IBulkEditResult> {
35
+ const edits = Array.isArray(editsIn) ? editsIn : ResourceEdit.convert(editsIn);
36
+
37
+ if (this._previewHandler && (options?.showPreview || edits.some(value => value.metadata?.needsConfirmation))) {
38
+ editsIn = await this._previewHandler(edits, options);
39
+ return { ariaSummary: '', isApplied: true };
40
+ } else {
41
+ return this.workspace.applyBulkEdit(edits, options);
42
+ }
43
+ }
44
+
45
+ hasPreviewHandler(): boolean {
46
+ return Boolean(this._previewHandler);
47
+ }
48
+
49
+ setPreviewHandler(handler: IBulkEditPreviewHandler): IDisposable {
50
+ this._previewHandler = handler;
51
+
52
+ const disposePreviewHandler = () => {
53
+ if (this._previewHandler === handler) {
54
+ this._previewHandler = undefined;
55
+ }
56
+ };
57
+
58
+ return {
59
+ dispose(): void {
60
+ disposePreviewHandler();
61
+ }
62
+ };
63
+ }
64
+ }
@@ -1,73 +1,73 @@
1
- // *****************************************************************************
2
- // Copyright (C) 2019 TypeFox and others.
3
- //
4
- // This program and the accompanying materials are made available under the
5
- // terms of the Eclipse Public License v. 2.0 which is available at
6
- // http://www.eclipse.org/legal/epl-2.0.
7
- //
8
- // This Source Code may also be made available under the following Secondary
9
- // Licenses when the conditions for such availability set forth in the Eclipse
10
- // Public License v. 2.0 are satisfied: GNU General Public License, version 2
11
- // with the GNU Classpath Exception which is available at
12
- // https://www.gnu.org/software/classpath/license.html.
13
- //
14
- // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
15
- // *****************************************************************************
16
-
17
- import { injectable } from '@theia/core/shared/inversify';
18
- import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
19
- import { Color, ColorDefinition } from '@theia/core/lib/common/color';
20
- import { Disposable } from '@theia/core/lib/common/disposable';
21
- import { ColorDefaults, ColorValue, getColorRegistry } from '@theia/monaco-editor-core/esm/vs/platform/theme/common/colorRegistry';
22
- import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
23
- import { IStandaloneThemeService } from '@theia/monaco-editor-core/esm/vs/editor/standalone/common/standaloneTheme';
24
- import { Color as MonacoColor, HSLA, RGBA } from '@theia/monaco-editor-core/esm/vs/base/common/color';
25
- import * as Colors from '@theia/monaco-editor-core/esm/vs/platform/theme/common/colorRegistry';
26
-
27
- @injectable()
28
- export class MonacoColorRegistry extends ColorRegistry {
29
-
30
- protected readonly monacoThemeService = StandaloneServices.get(IStandaloneThemeService);
31
- protected readonly monacoColorRegistry = getColorRegistry();
32
-
33
- override *getColors(): IterableIterator<string> {
34
- for (const { id } of this.monacoColorRegistry.getColors()) {
35
- yield id;
36
- }
37
- }
38
-
39
- override getCurrentColor(id: string): string | undefined {
40
- return this.monacoThemeService.getColorTheme().getColor(id)?.toString();
41
- }
42
-
43
- getColor(id: string): MonacoColor | undefined {
44
- return this.monacoThemeService.getColorTheme().getColor(id);
45
- }
46
-
47
- protected override doRegister(definition: ColorDefinition): Disposable {
48
- const defaults: ColorDefaults = {
49
- dark: this.toColor(definition.defaults?.dark),
50
- light: this.toColor(definition.defaults?.light),
51
- hcDark: this.toColor(definition.defaults?.hcDark ?? definition.defaults?.hc),
52
- hcLight: this.toColor(definition.defaults?.hcLight),
53
- };
54
- const identifier = this.monacoColorRegistry.registerColor(definition.id, defaults, definition.description);
55
- return Disposable.create(() => this.monacoColorRegistry.deregisterColor(identifier));
56
- }
57
-
58
- protected toColor(value: Color | undefined): ColorValue | null {
59
- if (!value || typeof value === 'string') {
60
- return value ?? null; // eslint-disable-line no-null/no-null
61
- }
62
- if ('kind' in value) {
63
- return Colors[value.kind](value.v, value.f);
64
- } else if ('r' in value) {
65
- const { r, g, b, a } = value;
66
- return new MonacoColor(new RGBA(r, g, b, a));
67
- } else {
68
- const { h, s, l, a } = value;
69
- return new MonacoColor(new HSLA(h, s, l, a));
70
- }
71
- }
72
-
73
- }
1
+ // *****************************************************************************
2
+ // Copyright (C) 2019 TypeFox and others.
3
+ //
4
+ // This program and the accompanying materials are made available under the
5
+ // terms of the Eclipse Public License v. 2.0 which is available at
6
+ // http://www.eclipse.org/legal/epl-2.0.
7
+ //
8
+ // This Source Code may also be made available under the following Secondary
9
+ // Licenses when the conditions for such availability set forth in the Eclipse
10
+ // Public License v. 2.0 are satisfied: GNU General Public License, version 2
11
+ // with the GNU Classpath Exception which is available at
12
+ // https://www.gnu.org/software/classpath/license.html.
13
+ //
14
+ // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
15
+ // *****************************************************************************
16
+
17
+ import { injectable } from '@theia/core/shared/inversify';
18
+ import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
19
+ import { Color, ColorDefinition } from '@theia/core/lib/common/color';
20
+ import { Disposable } from '@theia/core/lib/common/disposable';
21
+ import { ColorDefaults, ColorValue, getColorRegistry } from '@theia/monaco-editor-core/esm/vs/platform/theme/common/colorRegistry';
22
+ import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
23
+ import { IStandaloneThemeService } from '@theia/monaco-editor-core/esm/vs/editor/standalone/common/standaloneTheme';
24
+ import { Color as MonacoColor, HSLA, RGBA } from '@theia/monaco-editor-core/esm/vs/base/common/color';
25
+ import * as Colors from '@theia/monaco-editor-core/esm/vs/platform/theme/common/colorRegistry';
26
+
27
+ @injectable()
28
+ export class MonacoColorRegistry extends ColorRegistry {
29
+
30
+ protected readonly monacoThemeService = StandaloneServices.get(IStandaloneThemeService);
31
+ protected readonly monacoColorRegistry = getColorRegistry();
32
+
33
+ override *getColors(): IterableIterator<string> {
34
+ for (const { id } of this.monacoColorRegistry.getColors()) {
35
+ yield id;
36
+ }
37
+ }
38
+
39
+ override getCurrentColor(id: string): string | undefined {
40
+ return this.monacoThemeService.getColorTheme().getColor(id)?.toString();
41
+ }
42
+
43
+ getColor(id: string): MonacoColor | undefined {
44
+ return this.monacoThemeService.getColorTheme().getColor(id);
45
+ }
46
+
47
+ protected override doRegister(definition: ColorDefinition): Disposable {
48
+ const defaults: ColorDefaults = {
49
+ dark: this.toColor(definition.defaults?.dark),
50
+ light: this.toColor(definition.defaults?.light),
51
+ hcDark: this.toColor(definition.defaults?.hcDark ?? definition.defaults?.hc),
52
+ hcLight: this.toColor(definition.defaults?.hcLight),
53
+ };
54
+ const identifier = this.monacoColorRegistry.registerColor(definition.id, defaults, definition.description);
55
+ return Disposable.create(() => this.monacoColorRegistry.deregisterColor(identifier));
56
+ }
57
+
58
+ protected toColor(value: Color | undefined): ColorValue | null {
59
+ if (!value || typeof value === 'string') {
60
+ return value ?? null; // eslint-disable-line no-null/no-null
61
+ }
62
+ if ('kind' in value) {
63
+ return Colors[value.kind](value.v, value.f);
64
+ } else if ('r' in value) {
65
+ const { r, g, b, a } = value;
66
+ return new MonacoColor(new RGBA(r, g, b, a));
67
+ } else {
68
+ const { h, s, l, a } = value;
69
+ return new MonacoColor(new HSLA(h, s, l, a));
70
+ }
71
+ }
72
+
73
+ }