@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,110 +1,110 @@
1
- // *****************************************************************************
2
- // Copyright (C) 2018 Ericsson
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 { DisposableCollection, nls } from '@theia/core';
19
- import { FrontendApplicationContribution, FrontendApplication, StatusBar, StatusBarAlignment } from '@theia/core/lib/browser';
20
- import { EditorCommands, EditorManager, EditorWidget } from '@theia/editor/lib/browser';
21
- import { MonacoEditor } from './monaco-editor';
22
- import * as monaco from '@theia/monaco-editor-core';
23
-
24
- @injectable()
25
- export class MonacoStatusBarContribution implements FrontendApplicationContribution {
26
-
27
- protected readonly toDispose = new DisposableCollection();
28
-
29
- constructor(
30
- @inject(EditorManager) protected readonly editorManager: EditorManager,
31
- @inject(StatusBar) protected readonly statusBar: StatusBar
32
- ) { }
33
-
34
- onStart(app: FrontendApplication): void {
35
- this.updateStatusBar();
36
- this.editorManager.onCurrentEditorChanged(() => this.updateStatusBar());
37
- }
38
-
39
- protected updateStatusBar(): void {
40
- const editor = this.editorManager.currentEditor;
41
- const editorModel = this.getModel(editor);
42
- if (editor && editorModel) {
43
- this.setConfigTabSizeWidget();
44
- this.setLineEndingWidget();
45
-
46
- this.toDispose.dispose();
47
- this.toDispose.push(editorModel.onDidChangeOptions(() => {
48
- this.setConfigTabSizeWidget();
49
- this.setLineEndingWidget();
50
- }));
51
- let previous = editorModel.getEOL();
52
- this.toDispose.push(editorModel.onDidChangeContent(e => {
53
- if (previous !== e.eol) {
54
- previous = e.eol;
55
- this.setLineEndingWidget();
56
- }
57
- }));
58
- } else {
59
- this.removeConfigTabSizeWidget();
60
- this.removeLineEndingWidget();
61
- }
62
- }
63
-
64
- protected setConfigTabSizeWidget(): void {
65
- const editor = this.editorManager.currentEditor;
66
- const editorModel = this.getModel(editor);
67
- if (editor && editorModel) {
68
- const modelOptions = editorModel.getOptions();
69
- const tabSize = modelOptions.tabSize;
70
- const indentSize = modelOptions.indentSize;
71
- const spaceOrTabSizeMessage = modelOptions.insertSpaces
72
- ? nls.localizeByDefault('Spaces: {0}', indentSize)
73
- : nls.localizeByDefault('Tab Size: {0}', tabSize);
74
- this.statusBar.setElement('editor-status-tabbing-config', {
75
- text: spaceOrTabSizeMessage,
76
- alignment: StatusBarAlignment.RIGHT,
77
- priority: 10,
78
- command: EditorCommands.CONFIG_INDENTATION.id,
79
- tooltip: nls.localizeByDefault('Select Indentation')
80
- });
81
- }
82
- }
83
- protected removeConfigTabSizeWidget(): void {
84
- this.statusBar.removeElement('editor-status-tabbing-config');
85
- }
86
-
87
- protected setLineEndingWidget(): void {
88
- const editor = this.editorManager.currentEditor;
89
- const editorModel = this.getModel(editor);
90
- if (editor && editorModel) {
91
- const eol = editorModel.getEOL();
92
- const text = eol === '\n' ? 'LF' : 'CRLF';
93
- this.statusBar.setElement('editor-status-eol', {
94
- text: `${text}`,
95
- alignment: StatusBarAlignment.RIGHT,
96
- priority: 11,
97
- command: EditorCommands.CONFIG_EOL.id,
98
- tooltip: nls.localizeByDefault('Select End of Line Sequence')
99
- });
100
- }
101
- }
102
- protected removeLineEndingWidget(): void {
103
- this.statusBar.removeElement('editor-status-eol');
104
- }
105
-
106
- protected getModel(editor: EditorWidget | undefined): monaco.editor.ITextModel | undefined {
107
- const monacoEditor = MonacoEditor.get(editor);
108
- return monacoEditor && monacoEditor.getControl().getModel() || undefined;
109
- }
110
- }
1
+ // *****************************************************************************
2
+ // Copyright (C) 2018 Ericsson
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 { DisposableCollection, nls } from '@theia/core';
19
+ import { FrontendApplicationContribution, FrontendApplication, StatusBar, StatusBarAlignment } from '@theia/core/lib/browser';
20
+ import { EditorCommands, EditorManager, EditorWidget } from '@theia/editor/lib/browser';
21
+ import { MonacoEditor } from './monaco-editor';
22
+ import * as monaco from '@theia/monaco-editor-core';
23
+
24
+ @injectable()
25
+ export class MonacoStatusBarContribution implements FrontendApplicationContribution {
26
+
27
+ protected readonly toDispose = new DisposableCollection();
28
+
29
+ constructor(
30
+ @inject(EditorManager) protected readonly editorManager: EditorManager,
31
+ @inject(StatusBar) protected readonly statusBar: StatusBar
32
+ ) { }
33
+
34
+ onStart(app: FrontendApplication): void {
35
+ this.updateStatusBar();
36
+ this.editorManager.onCurrentEditorChanged(() => this.updateStatusBar());
37
+ }
38
+
39
+ protected updateStatusBar(): void {
40
+ const editor = this.editorManager.currentEditor;
41
+ const editorModel = this.getModel(editor);
42
+ if (editor && editorModel) {
43
+ this.setConfigTabSizeWidget();
44
+ this.setLineEndingWidget();
45
+
46
+ this.toDispose.dispose();
47
+ this.toDispose.push(editorModel.onDidChangeOptions(() => {
48
+ this.setConfigTabSizeWidget();
49
+ this.setLineEndingWidget();
50
+ }));
51
+ let previous = editorModel.getEOL();
52
+ this.toDispose.push(editorModel.onDidChangeContent(e => {
53
+ if (previous !== e.eol) {
54
+ previous = e.eol;
55
+ this.setLineEndingWidget();
56
+ }
57
+ }));
58
+ } else {
59
+ this.removeConfigTabSizeWidget();
60
+ this.removeLineEndingWidget();
61
+ }
62
+ }
63
+
64
+ protected setConfigTabSizeWidget(): void {
65
+ const editor = this.editorManager.currentEditor;
66
+ const editorModel = this.getModel(editor);
67
+ if (editor && editorModel) {
68
+ const modelOptions = editorModel.getOptions();
69
+ const tabSize = modelOptions.tabSize;
70
+ const indentSize = modelOptions.indentSize;
71
+ const spaceOrTabSizeMessage = modelOptions.insertSpaces
72
+ ? nls.localizeByDefault('Spaces: {0}', indentSize)
73
+ : nls.localizeByDefault('Tab Size: {0}', tabSize);
74
+ this.statusBar.setElement('editor-status-tabbing-config', {
75
+ text: spaceOrTabSizeMessage,
76
+ alignment: StatusBarAlignment.RIGHT,
77
+ priority: 10,
78
+ command: EditorCommands.CONFIG_INDENTATION.id,
79
+ tooltip: nls.localizeByDefault('Select Indentation')
80
+ });
81
+ }
82
+ }
83
+ protected removeConfigTabSizeWidget(): void {
84
+ this.statusBar.removeElement('editor-status-tabbing-config');
85
+ }
86
+
87
+ protected setLineEndingWidget(): void {
88
+ const editor = this.editorManager.currentEditor;
89
+ const editorModel = this.getModel(editor);
90
+ if (editor && editorModel) {
91
+ const eol = editorModel.getEOL();
92
+ const text = eol === '\n' ? 'LF' : 'CRLF';
93
+ this.statusBar.setElement('editor-status-eol', {
94
+ text: `${text}`,
95
+ alignment: StatusBarAlignment.RIGHT,
96
+ priority: 11,
97
+ command: EditorCommands.CONFIG_EOL.id,
98
+ tooltip: nls.localizeByDefault('Select End of Line Sequence')
99
+ });
100
+ }
101
+ }
102
+ protected removeLineEndingWidget(): void {
103
+ this.statusBar.removeElement('editor-status-eol');
104
+ }
105
+
106
+ protected getModel(editor: EditorWidget | undefined): monaco.editor.ITextModel | undefined {
107
+ const monacoEditor = MonacoEditor.get(editor);
108
+ return monacoEditor && monacoEditor.getControl().getModel() || undefined;
109
+ }
110
+ }
@@ -1,199 +1,199 @@
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 { inject, injectable, named, postConstruct } from '@theia/core/shared/inversify';
18
- import URI from '@theia/core/lib/common/uri';
19
- import { ResourceProvider, ReferenceCollection, Event, MaybePromise, Resource, ContributionProvider, OS } from '@theia/core';
20
- import { EditorPreferences, EditorPreferenceChange } from '@theia/editor/lib/browser';
21
- import { MonacoEditorModel } from './monaco-editor-model';
22
- import { IDisposable, IReference } from '@theia/monaco-editor-core/esm/vs/base/common/lifecycle';
23
- import { MonacoToProtocolConverter } from './monaco-to-protocol-converter';
24
- import { ProtocolToMonacoConverter } from './protocol-to-monaco-converter';
25
- import { ILogger } from '@theia/core/lib/common/logger';
26
- import * as monaco from '@theia/monaco-editor-core';
27
- import { ITextModelService, ITextModelContentProvider } from '@theia/monaco-editor-core/esm/vs/editor/common/services/resolverService';
28
- import { ITextModelUpdateOptions } from '@theia/monaco-editor-core/esm/vs/editor/common/model';
29
- import { FileService } from '@theia/filesystem/lib/browser/file-service';
30
- import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
31
- import { ITextResourcePropertiesService } from '@theia/monaco-editor-core/esm/vs/editor/common/services/textResourceConfiguration';
32
-
33
- export const MonacoEditorModelFactory = Symbol('MonacoEditorModelFactory');
34
- export interface MonacoEditorModelFactory {
35
-
36
- readonly scheme: string;
37
-
38
- createModel(
39
- resource: Resource
40
- ): MaybePromise<MonacoEditorModel>;
41
-
42
- }
43
-
44
- @injectable()
45
- export class MonacoTextModelService implements ITextModelService {
46
- declare readonly _serviceBrand: undefined;
47
-
48
- /**
49
- * This component does some asynchronous work before being fully initialized.
50
- *
51
- * @deprecated since 1.25.0. Is instantly resolved.
52
- */
53
- readonly ready: Promise<void> = Promise.resolve();
54
-
55
- protected readonly _models = new ReferenceCollection<string, MonacoEditorModel>(
56
- uri => this.loadModel(new URI(uri))
57
- );
58
-
59
- @inject(ResourceProvider)
60
- protected readonly resourceProvider: ResourceProvider;
61
-
62
- @inject(EditorPreferences)
63
- protected readonly editorPreferences: EditorPreferences;
64
-
65
- @inject(MonacoToProtocolConverter)
66
- protected readonly m2p: MonacoToProtocolConverter;
67
-
68
- @inject(ProtocolToMonacoConverter)
69
- protected readonly p2m: ProtocolToMonacoConverter;
70
-
71
- @inject(ContributionProvider)
72
- @named(MonacoEditorModelFactory)
73
- protected readonly factories: ContributionProvider<MonacoEditorModelFactory>;
74
-
75
- @inject(ILogger)
76
- protected readonly logger: ILogger;
77
-
78
- @inject(FileService)
79
- protected readonly fileService: FileService;
80
-
81
- @postConstruct()
82
- protected init(): void {
83
- const resourcePropertiesService = StandaloneServices.get(ITextResourcePropertiesService);
84
-
85
- if (resourcePropertiesService) {
86
- resourcePropertiesService.getEOL = () => {
87
- const eol = this.editorPreferences['files.eol'];
88
- if (eol && eol !== 'auto') {
89
- return eol;
90
- }
91
- return OS.backend.EOL;
92
- };
93
- }
94
- }
95
-
96
- get models(): MonacoEditorModel[] {
97
- return this._models.values();
98
- }
99
-
100
- get(uri: string): MonacoEditorModel | undefined {
101
- return this._models.get(uri);
102
- }
103
-
104
- get onDidCreate(): Event<MonacoEditorModel> {
105
- return this._models.onDidCreate;
106
- }
107
-
108
- createModelReference(raw: monaco.Uri | URI): Promise<IReference<MonacoEditorModel>> {
109
- return this._models.acquire(raw.toString());
110
- }
111
-
112
- protected async loadModel(uri: URI): Promise<MonacoEditorModel> {
113
- await this.editorPreferences.ready;
114
- const resource = await this.resourceProvider(uri);
115
- const model = await (await this.createModel(resource)).load();
116
- this.updateModel(model);
117
- model.textEditorModel.onDidChangeLanguage(() => this.updateModel(model));
118
- const disposable = this.editorPreferences.onPreferenceChanged(change => this.updateModel(model, change));
119
- model.onDispose(() => disposable.dispose());
120
- return model;
121
- }
122
-
123
- protected createModel(resource: Resource): MaybePromise<MonacoEditorModel> {
124
- const factory = this.factories.getContributions().find(({ scheme }) => resource.uri.scheme === scheme);
125
- return factory ? factory.createModel(resource) : new MonacoEditorModel(resource, this.m2p, this.p2m, this.logger, this.editorPreferences);
126
- }
127
-
128
- protected readonly modelOptions: { [name: string]: (keyof ITextModelUpdateOptions | undefined) } = {
129
- 'editor.tabSize': 'tabSize',
130
- 'editor.insertSpaces': 'insertSpaces',
131
- 'editor.indentSize': 'indentSize'
132
- };
133
-
134
- protected toModelOption(editorPreference: EditorPreferenceChange['preferenceName']): keyof ITextModelUpdateOptions | undefined {
135
- switch (editorPreference) {
136
- case 'editor.tabSize': return 'tabSize';
137
- // @monaco-uplift: uncomment this line once 'editor.indentSize' preference is available
138
- // case 'editor.indentSize': return 'indentSize';
139
- case 'editor.insertSpaces': return 'insertSpaces';
140
- case 'editor.bracketPairColorization.enabled':
141
- case 'editor.bracketPairColorization.independentColorPoolPerBracketType':
142
- return 'bracketColorizationOptions';
143
- case 'editor.trimAutoWhitespace': return 'trimAutoWhitespace';
144
-
145
- }
146
- return undefined;
147
- }
148
-
149
- protected updateModel(model: MonacoEditorModel, change?: EditorPreferenceChange): void {
150
- if (!change) {
151
- model.autoSave = this.editorPreferences.get('files.autoSave', undefined, model.uri);
152
- model.autoSaveDelay = this.editorPreferences.get('files.autoSaveDelay', undefined, model.uri);
153
- model.textEditorModel.updateOptions(this.getModelOptions(model));
154
- } else if (change.affects(model.uri, model.languageId)) {
155
- if (change.preferenceName === 'files.autoSave') {
156
- model.autoSave = this.editorPreferences.get('files.autoSave', undefined, model.uri);
157
- }
158
- if (change.preferenceName === 'files.autoSaveDelay') {
159
- model.autoSaveDelay = this.editorPreferences.get('files.autoSaveDelay', undefined, model.uri);
160
- }
161
- const modelOption = this.toModelOption(change.preferenceName);
162
- if (modelOption) {
163
- model.textEditorModel.updateOptions(this.getModelOptions(model));
164
- }
165
- }
166
- }
167
-
168
- /** @deprecated pass MonacoEditorModel instead */
169
- protected getModelOptions(uri: string): ITextModelUpdateOptions;
170
- protected getModelOptions(model: MonacoEditorModel): ITextModelUpdateOptions;
171
- protected getModelOptions(arg: string | MonacoEditorModel): ITextModelUpdateOptions {
172
- const uri = typeof arg === 'string' ? arg : arg.uri;
173
- const overrideIdentifier = typeof arg === 'string' ? undefined : arg.languageId;
174
- return {
175
- tabSize: this.editorPreferences.get({ preferenceName: 'editor.tabSize', overrideIdentifier }, undefined, uri),
176
- // @monaco-uplift: when available, switch to 'editor.indentSize' preference.
177
- indentSize: this.editorPreferences.get({ preferenceName: 'editor.tabSize', overrideIdentifier }, undefined, uri),
178
- insertSpaces: this.editorPreferences.get({ preferenceName: 'editor.insertSpaces', overrideIdentifier }, undefined, uri),
179
- bracketColorizationOptions: {
180
- enabled: this.editorPreferences.get({ preferenceName: 'editor.bracketPairColorization.enabled', overrideIdentifier }, undefined, uri),
181
- independentColorPoolPerBracketType: this.editorPreferences.get(
182
- { preferenceName: 'editor.bracketPairColorization.independentColorPoolPerBracketType', overrideIdentifier }, undefined, uri),
183
- },
184
- trimAutoWhitespace: this.editorPreferences.get({ preferenceName: 'editor.trimAutoWhitespace', overrideIdentifier }, undefined, uri),
185
- };
186
- }
187
-
188
- registerTextModelContentProvider(scheme: string, provider: ITextModelContentProvider): IDisposable {
189
- return {
190
- dispose(): void {
191
- // no-op
192
- }
193
- };
194
- }
195
-
196
- canHandleResource(resource: monaco.Uri): boolean {
197
- return this.fileService.canHandleResource(new URI(resource));
198
- }
199
- }
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 { inject, injectable, named, postConstruct } from '@theia/core/shared/inversify';
18
+ import URI from '@theia/core/lib/common/uri';
19
+ import { ResourceProvider, ReferenceCollection, Event, MaybePromise, Resource, ContributionProvider, OS } from '@theia/core';
20
+ import { EditorPreferences, EditorPreferenceChange } from '@theia/editor/lib/browser';
21
+ import { MonacoEditorModel } from './monaco-editor-model';
22
+ import { IDisposable, IReference } from '@theia/monaco-editor-core/esm/vs/base/common/lifecycle';
23
+ import { MonacoToProtocolConverter } from './monaco-to-protocol-converter';
24
+ import { ProtocolToMonacoConverter } from './protocol-to-monaco-converter';
25
+ import { ILogger } from '@theia/core/lib/common/logger';
26
+ import * as monaco from '@theia/monaco-editor-core';
27
+ import { ITextModelService, ITextModelContentProvider } from '@theia/monaco-editor-core/esm/vs/editor/common/services/resolverService';
28
+ import { ITextModelUpdateOptions } from '@theia/monaco-editor-core/esm/vs/editor/common/model';
29
+ import { FileService } from '@theia/filesystem/lib/browser/file-service';
30
+ import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
31
+ import { ITextResourcePropertiesService } from '@theia/monaco-editor-core/esm/vs/editor/common/services/textResourceConfiguration';
32
+
33
+ export const MonacoEditorModelFactory = Symbol('MonacoEditorModelFactory');
34
+ export interface MonacoEditorModelFactory {
35
+
36
+ readonly scheme: string;
37
+
38
+ createModel(
39
+ resource: Resource
40
+ ): MaybePromise<MonacoEditorModel>;
41
+
42
+ }
43
+
44
+ @injectable()
45
+ export class MonacoTextModelService implements ITextModelService {
46
+ declare readonly _serviceBrand: undefined;
47
+
48
+ /**
49
+ * This component does some asynchronous work before being fully initialized.
50
+ *
51
+ * @deprecated since 1.25.0. Is instantly resolved.
52
+ */
53
+ readonly ready: Promise<void> = Promise.resolve();
54
+
55
+ protected readonly _models = new ReferenceCollection<string, MonacoEditorModel>(
56
+ uri => this.loadModel(new URI(uri))
57
+ );
58
+
59
+ @inject(ResourceProvider)
60
+ protected readonly resourceProvider: ResourceProvider;
61
+
62
+ @inject(EditorPreferences)
63
+ protected readonly editorPreferences: EditorPreferences;
64
+
65
+ @inject(MonacoToProtocolConverter)
66
+ protected readonly m2p: MonacoToProtocolConverter;
67
+
68
+ @inject(ProtocolToMonacoConverter)
69
+ protected readonly p2m: ProtocolToMonacoConverter;
70
+
71
+ @inject(ContributionProvider)
72
+ @named(MonacoEditorModelFactory)
73
+ protected readonly factories: ContributionProvider<MonacoEditorModelFactory>;
74
+
75
+ @inject(ILogger)
76
+ protected readonly logger: ILogger;
77
+
78
+ @inject(FileService)
79
+ protected readonly fileService: FileService;
80
+
81
+ @postConstruct()
82
+ protected init(): void {
83
+ const resourcePropertiesService = StandaloneServices.get(ITextResourcePropertiesService);
84
+
85
+ if (resourcePropertiesService) {
86
+ resourcePropertiesService.getEOL = () => {
87
+ const eol = this.editorPreferences['files.eol'];
88
+ if (eol && eol !== 'auto') {
89
+ return eol;
90
+ }
91
+ return OS.backend.EOL;
92
+ };
93
+ }
94
+ }
95
+
96
+ get models(): MonacoEditorModel[] {
97
+ return this._models.values();
98
+ }
99
+
100
+ get(uri: string): MonacoEditorModel | undefined {
101
+ return this._models.get(uri);
102
+ }
103
+
104
+ get onDidCreate(): Event<MonacoEditorModel> {
105
+ return this._models.onDidCreate;
106
+ }
107
+
108
+ createModelReference(raw: monaco.Uri | URI): Promise<IReference<MonacoEditorModel>> {
109
+ return this._models.acquire(raw.toString());
110
+ }
111
+
112
+ protected async loadModel(uri: URI): Promise<MonacoEditorModel> {
113
+ await this.editorPreferences.ready;
114
+ const resource = await this.resourceProvider(uri);
115
+ const model = await (await this.createModel(resource)).load();
116
+ this.updateModel(model);
117
+ model.textEditorModel.onDidChangeLanguage(() => this.updateModel(model));
118
+ const disposable = this.editorPreferences.onPreferenceChanged(change => this.updateModel(model, change));
119
+ model.onDispose(() => disposable.dispose());
120
+ return model;
121
+ }
122
+
123
+ protected createModel(resource: Resource): MaybePromise<MonacoEditorModel> {
124
+ const factory = this.factories.getContributions().find(({ scheme }) => resource.uri.scheme === scheme);
125
+ return factory ? factory.createModel(resource) : new MonacoEditorModel(resource, this.m2p, this.p2m, this.logger, this.editorPreferences);
126
+ }
127
+
128
+ protected readonly modelOptions: { [name: string]: (keyof ITextModelUpdateOptions | undefined) } = {
129
+ 'editor.tabSize': 'tabSize',
130
+ 'editor.insertSpaces': 'insertSpaces',
131
+ 'editor.indentSize': 'indentSize'
132
+ };
133
+
134
+ protected toModelOption(editorPreference: EditorPreferenceChange['preferenceName']): keyof ITextModelUpdateOptions | undefined {
135
+ switch (editorPreference) {
136
+ case 'editor.tabSize': return 'tabSize';
137
+ // @monaco-uplift: uncomment this line once 'editor.indentSize' preference is available
138
+ // case 'editor.indentSize': return 'indentSize';
139
+ case 'editor.insertSpaces': return 'insertSpaces';
140
+ case 'editor.bracketPairColorization.enabled':
141
+ case 'editor.bracketPairColorization.independentColorPoolPerBracketType':
142
+ return 'bracketColorizationOptions';
143
+ case 'editor.trimAutoWhitespace': return 'trimAutoWhitespace';
144
+
145
+ }
146
+ return undefined;
147
+ }
148
+
149
+ protected updateModel(model: MonacoEditorModel, change?: EditorPreferenceChange): void {
150
+ if (!change) {
151
+ model.autoSave = this.editorPreferences.get('files.autoSave', undefined, model.uri);
152
+ model.autoSaveDelay = this.editorPreferences.get('files.autoSaveDelay', undefined, model.uri);
153
+ model.textEditorModel.updateOptions(this.getModelOptions(model));
154
+ } else if (change.affects(model.uri, model.languageId)) {
155
+ if (change.preferenceName === 'files.autoSave') {
156
+ model.autoSave = this.editorPreferences.get('files.autoSave', undefined, model.uri);
157
+ }
158
+ if (change.preferenceName === 'files.autoSaveDelay') {
159
+ model.autoSaveDelay = this.editorPreferences.get('files.autoSaveDelay', undefined, model.uri);
160
+ }
161
+ const modelOption = this.toModelOption(change.preferenceName);
162
+ if (modelOption) {
163
+ model.textEditorModel.updateOptions(this.getModelOptions(model));
164
+ }
165
+ }
166
+ }
167
+
168
+ /** @deprecated pass MonacoEditorModel instead */
169
+ protected getModelOptions(uri: string): ITextModelUpdateOptions;
170
+ protected getModelOptions(model: MonacoEditorModel): ITextModelUpdateOptions;
171
+ protected getModelOptions(arg: string | MonacoEditorModel): ITextModelUpdateOptions {
172
+ const uri = typeof arg === 'string' ? arg : arg.uri;
173
+ const overrideIdentifier = typeof arg === 'string' ? undefined : arg.languageId;
174
+ return {
175
+ tabSize: this.editorPreferences.get({ preferenceName: 'editor.tabSize', overrideIdentifier }, undefined, uri),
176
+ // @monaco-uplift: when available, switch to 'editor.indentSize' preference.
177
+ indentSize: this.editorPreferences.get({ preferenceName: 'editor.tabSize', overrideIdentifier }, undefined, uri),
178
+ insertSpaces: this.editorPreferences.get({ preferenceName: 'editor.insertSpaces', overrideIdentifier }, undefined, uri),
179
+ bracketColorizationOptions: {
180
+ enabled: this.editorPreferences.get({ preferenceName: 'editor.bracketPairColorization.enabled', overrideIdentifier }, undefined, uri),
181
+ independentColorPoolPerBracketType: this.editorPreferences.get(
182
+ { preferenceName: 'editor.bracketPairColorization.independentColorPoolPerBracketType', overrideIdentifier }, undefined, uri),
183
+ },
184
+ trimAutoWhitespace: this.editorPreferences.get({ preferenceName: 'editor.trimAutoWhitespace', overrideIdentifier }, undefined, uri),
185
+ };
186
+ }
187
+
188
+ registerTextModelContentProvider(scheme: string, provider: ITextModelContentProvider): IDisposable {
189
+ return {
190
+ dispose(): void {
191
+ // no-op
192
+ }
193
+ };
194
+ }
195
+
196
+ canHandleResource(resource: monaco.Uri): boolean {
197
+ return this.fileService.canHandleResource(URI.fromComponents(resource));
198
+ }
199
+ }