@theia/monaco 1.75.0-next.8 → 1.75.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/browser/markdown-renderer/monaco-markdown-renderer.d.ts.map +1 -1
- package/lib/browser/markdown-renderer/monaco-markdown-renderer.js +7 -1
- package/lib/browser/markdown-renderer/monaco-markdown-renderer.js.map +1 -1
- package/lib/browser/monaco-indexed-db.js +1 -1
- package/lib/browser/monaco-indexed-db.js.map +1 -1
- package/lib/browser/monaco-init.js +3 -3
- package/lib/browser/monaco-init.js.map +1 -1
- package/lib/browser/monaco-keybinding.d.ts +2 -1
- package/lib/browser/monaco-keybinding.d.ts.map +1 -1
- package/lib/browser/monaco-keybinding.js +6 -1
- package/lib/browser/monaco-keybinding.js.map +1 -1
- package/lib/browser/monaco-nls.d.ts +4 -7
- package/lib/browser/monaco-nls.d.ts.map +1 -1
- package/lib/browser/monaco-nls.js +4 -7
- package/lib/browser/monaco-nls.js.map +1 -1
- package/lib/browser/monaco-text-model-service.js +1 -0
- package/lib/browser/monaco-text-model-service.js.map +1 -1
- package/lib/browser/monaco-theming-service.js +1 -1
- package/lib/browser/monaco-theming-service.js.map +1 -1
- package/lib/browser/textmate/monaco-textmate-service.d.ts.map +1 -1
- package/lib/browser/textmate/monaco-textmate-service.js +2 -1
- package/lib/browser/textmate/monaco-textmate-service.js.map +1 -1
- package/lib/browser/textmate/monaco-theme-registry.d.ts +6 -0
- package/lib/browser/textmate/monaco-theme-registry.d.ts.map +1 -1
- package/lib/browser/textmate/monaco-theme-registry.js +31 -4
- package/lib/browser/textmate/monaco-theme-registry.js.map +1 -1
- package/lib/browser/textmate/monaco-theme-types.d.ts +6 -0
- package/lib/browser/textmate/monaco-theme-types.d.ts.map +1 -1
- package/lib/browser/textmate/monaco-theme-types.js +16 -1
- package/lib/browser/textmate/monaco-theme-types.js.map +1 -1
- package/lib/browser/textmate/monaco-theme-types.spec.d.ts +2 -0
- package/lib/browser/textmate/monaco-theme-types.spec.d.ts.map +1 -0
- package/lib/browser/textmate/monaco-theme-types.spec.js +38 -0
- package/lib/browser/textmate/monaco-theme-types.spec.js.map +1 -0
- package/lib/browser/textmate/textmate-registry.d.ts +2 -0
- package/lib/browser/textmate/textmate-registry.d.ts.map +1 -1
- package/lib/browser/textmate/textmate-registry.js +9 -3
- package/lib/browser/textmate/textmate-registry.js.map +1 -1
- package/package.json +9 -9
- package/src/browser/markdown-renderer/monaco-markdown-renderer.ts +7 -1
- package/src/browser/monaco-indexed-db.ts +1 -1
- package/src/browser/monaco-init.ts +3 -3
- package/src/browser/monaco-keybinding.ts +6 -3
- package/src/browser/monaco-nls.ts +4 -7
- package/src/browser/monaco-text-model-service.ts +1 -1
- package/src/browser/monaco-theming-service.ts +1 -1
- package/src/browser/textmate/monaco-textmate-service.ts +2 -1
- package/src/browser/textmate/monaco-theme-registry.ts +32 -5
- package/src/browser/textmate/monaco-theme-types.spec.ts +39 -0
- package/src/browser/textmate/monaco-theme-types.ts +12 -0
- package/src/browser/textmate/textmate-registry.ts +8 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-markdown-renderer.d.ts","sourceRoot":"","sources":["../../../src/browser/markdown-renderer/monaco-markdown-renderer.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,uBAAuB,IAAI,oBAAoB,EAAE,MACjD,6EAA6E,CAAC;AAEvF,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAE,aAAa,EAA6B,MAAM,yBAAyB,CAAC;AACnF,OAAO,EAAkB,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,gEAAgE,CAAC;AAG1I,OAAO,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,8DAA8D,CAAC;
|
|
1
|
+
{"version":3,"file":"monaco-markdown-renderer.d.ts","sourceRoot":"","sources":["../../../src/browser/markdown-renderer/monaco-markdown-renderer.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,uBAAuB,IAAI,oBAAoB,EAAE,MACjD,6EAA6E,CAAC;AAEvF,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAE,aAAa,EAA6B,MAAM,yBAAyB,CAAC;AACnF,OAAO,EAAkB,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,gEAAgE,CAAC;AAG1I,OAAO,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,MAAM,8DAA8D,CAAC;AAE7I,OAAO,EAAE,qBAAqB,IAAI,2BAA2B,EAAE,MAAM,gEAAgE,CAAC;AACtI,OAAO,EAAE,cAAc,EAAE,MAAM,2CAA2C,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,wDAAwD,CAAC;AACzF,OAAO,EAAwB,eAAe,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAE7E,qBACa,sBAAuB,YAAW,gBAAgB;IACpC,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAEvE,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEnC,SAAS,CAAC,QAAQ,EAAE,oBAAoB,CAAC;IACzC,SAAS,CAAC,cAAc,EAAE,aAAa,GAAG,SAAS,CAAC;IAEpD,MAAM,CAAC,QAAQ,EAAE,cAAc,EAAE,OAAO,CAAC,EAAE,qBAAqB,GAAG,oBAAoB;IASvF,SAAS,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,qBAAqB,GAAG,2BAA2B,GAAG,SAAS;IAcpG,SAAS,CAAC,iBAAiB,CAAC,OAAO,EAAE,eAAe,GAAG,eAAe;IAatE,SAAS,CAAC,IAAI,IAAI,IAAI;cASN,aAAa,CAAC,SAAS,EAAE,MAAM,CAAC,GAAG,GAAG,MAAM,EAAE,aAAa,CAAC,EAAE,mBAAmB,GAAG,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC;CAyB7I"}
|
|
@@ -23,11 +23,17 @@ const standaloneServices_1 = require("@theia/monaco-editor-core/esm/vs/editor/st
|
|
|
23
23
|
const browser_1 = require("@theia/core/lib/browser");
|
|
24
24
|
const opener_1 = require("@theia/monaco-editor-core/esm/vs/platform/opener/common/opener");
|
|
25
25
|
const uri_1 = require("@theia/core/lib/common/uri");
|
|
26
|
+
const markdown_link_handler_1 = require("@theia/core/lib/browser/markdown-rendering/markdown-link-handler");
|
|
26
27
|
const lifecycle_1 = require("@theia/monaco-editor-core/esm/vs/base/common/lifecycle");
|
|
27
28
|
const core_1 = require("@theia/core");
|
|
28
29
|
let MonacoMarkdownRenderer = class MonacoMarkdownRenderer {
|
|
29
30
|
render(markdown, options) {
|
|
30
|
-
|
|
31
|
+
const rendered = this.delegate.render(markdown, this.transformOptions(options));
|
|
32
|
+
// The delegate activates links through its own opener service, which `interceptOpen`
|
|
33
|
+
// routes to Theia's. Declaring that keeps callers from wiring a second handler, which
|
|
34
|
+
// would open every link twice.
|
|
35
|
+
(0, markdown_link_handler_1.markMarkdownLinksWired)(rendered.element);
|
|
36
|
+
return rendered;
|
|
31
37
|
}
|
|
32
38
|
transformOptions(options) {
|
|
33
39
|
if (!options) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-markdown-renderer.js","sourceRoot":"","sources":["../../../src/browser/markdown-renderer/monaco-markdown-renderer.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,4DAAwF;AACxF,kHACuF;AACvF,sHAAmH;AAEnH,qDAAmF;AACnF,2FAA0I;AAE1I,oDAAiD;
|
|
1
|
+
{"version":3,"file":"monaco-markdown-renderer.js","sourceRoot":"","sources":["../../../src/browser/markdown-renderer/monaco-markdown-renderer.ts"],"names":[],"mappings":"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"}
|
|
@@ -82,7 +82,7 @@ async function deleteTheme(id) {
|
|
|
82
82
|
}
|
|
83
83
|
function stateToTheme(state) {
|
|
84
84
|
const { id, label, description, uiTheme, data } = state;
|
|
85
|
-
const type = uiTheme === 'vs' ? 'light' : uiTheme === 'vs-dark' ? 'dark' : 'hc';
|
|
85
|
+
const type = uiTheme === 'vs' ? 'light' : uiTheme === 'vs-dark' ? 'dark' : uiTheme === 'hc-light' ? 'hcLight' : 'hc';
|
|
86
86
|
return {
|
|
87
87
|
type,
|
|
88
88
|
id,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-indexed-db.js","sourceRoot":"","sources":["../../src/browser/monaco-indexed-db.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"monaco-indexed-db.js","sourceRoot":"","sources":["../../src/browser/monaco-indexed-db.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,9 +29,9 @@ const tslib_1 = require("tslib");
|
|
|
29
29
|
* The inversify-constructed services must not call StandaloneServices.get() or StandaloneServices.initialize() from their constructors. Calling `get`()` in postConstruct methods
|
|
30
30
|
* is allowed.
|
|
31
31
|
*/
|
|
32
|
-
// Monaco's localization override is handled
|
|
33
|
-
// @theia/monaco-editor-core/esm/vs/nls with
|
|
34
|
-
//
|
|
32
|
+
// Monaco's localization override is handled at bundling time by the `monacoNlsPlugin` of
|
|
33
|
+
// @theia/bundle-plugin, which replaces @theia/monaco-editor-core/esm/vs/nls with
|
|
34
|
+
// packages/monaco/src/browser/monaco-nls.ts.
|
|
35
35
|
const inversify_1 = require("@theia/core/shared/inversify");
|
|
36
36
|
const codeEditorService_1 = require("@theia/monaco-editor-core/esm/vs/editor/browser/services/codeEditorService");
|
|
37
37
|
const standaloneServices_1 = require("@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-init.js","sourceRoot":"","sources":["../../src/browser/monaco-init.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,oDAAoD;AACpD,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF;;;;;;;;;;;GAWG;AAEH,
|
|
1
|
+
{"version":3,"file":"monaco-init.js","sourceRoot":"","sources":["../../src/browser/monaco-init.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { KeybindingContribution, KeybindingRegistry, KeyCode } from '@theia/core/lib/browser';
|
|
2
2
|
import { MonacoCommandRegistry } from './monaco-command-registry';
|
|
3
|
-
import { CommandRegistry, DisposableCollection } from '@theia/core';
|
|
3
|
+
import { CommandRegistry, DisposableCollection, ILogger } from '@theia/core';
|
|
4
4
|
import { MonacoContextKeyService } from './monaco-context-key-service';
|
|
5
5
|
export declare class MonacoKeybindingContribution implements KeybindingContribution {
|
|
6
6
|
protected toDisposeOnKeybindingChange: DisposableCollection;
|
|
@@ -8,6 +8,7 @@ export declare class MonacoKeybindingContribution implements KeybindingContribut
|
|
|
8
8
|
protected readonly keybindings: KeybindingRegistry;
|
|
9
9
|
protected readonly theiaCommandRegistry: CommandRegistry;
|
|
10
10
|
protected readonly contextKeyService: MonacoContextKeyService;
|
|
11
|
+
protected readonly logger: ILogger;
|
|
11
12
|
protected init(): void;
|
|
12
13
|
registerKeybindings(registry: KeybindingRegistry): void;
|
|
13
14
|
protected updateMonacoKeybindings(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-keybinding.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-keybinding.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,sBAAsB,EAAE,kBAAkB,EAAmB,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAE/G,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAsB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"monaco-keybinding.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-keybinding.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,sBAAsB,EAAE,kBAAkB,EAAmB,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAE/G,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAsB,OAAO,EAAE,MAAM,aAAa,CAAC;AAKjG,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAIvE,qBACa,4BAA6B,YAAW,sBAAsB;IAEvE,SAAS,CAAC,2BAA2B,uBAA8B;IAEpC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,qBAAqB,CAAC;IACtD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,kBAAkB,CAAC;IACtD,SAAS,CAAC,QAAQ,CAAC,oBAAoB,EAAE,eAAe,CAAC;IACjD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,uBAAuB,CAAC;IAG/F,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAGnC,SAAS,CAAC,IAAI,IAAI,IAAI;IAItB,mBAAmB,CAAC,QAAQ,EAAE,kBAAkB,GAAG,IAAI;IAiBvD,SAAS,CAAC,uBAAuB,IAAI,IAAI;IAsBzC,SAAS,CAAC,wBAAwB,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,MAAM;IAU5D,SAAS,CAAC,8BAA8B,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM;CAiBlE"}
|
|
@@ -72,7 +72,7 @@ let MonacoKeybindingContribution = class MonacoKeybindingContribution {
|
|
|
72
72
|
toMonacoKeybindingNumber(codes) {
|
|
73
73
|
const [firstPart, secondPart] = codes;
|
|
74
74
|
if (codes.length > 2) {
|
|
75
|
-
|
|
75
|
+
this.logger.warn('Key chords should not consist of more than two parts; got ', codes);
|
|
76
76
|
}
|
|
77
77
|
const encodedFirstPart = this.toSingleMonacoKeybindingNumber(firstPart);
|
|
78
78
|
const encodedSecondPart = secondPart ? this.toSingleMonacoKeybindingNumber(secondPart) << 16 : 0;
|
|
@@ -113,6 +113,11 @@ tslib_1.__decorate([
|
|
|
113
113
|
(0, inversify_1.inject)(monaco_context_key_service_1.MonacoContextKeyService),
|
|
114
114
|
tslib_1.__metadata("design:type", monaco_context_key_service_1.MonacoContextKeyService)
|
|
115
115
|
], MonacoKeybindingContribution.prototype, "contextKeyService", void 0);
|
|
116
|
+
tslib_1.__decorate([
|
|
117
|
+
(0, inversify_1.inject)(core_1.ILogger),
|
|
118
|
+
(0, inversify_1.named)('monaco:MonacoKeybindingContribution'),
|
|
119
|
+
tslib_1.__metadata("design:type", Object)
|
|
120
|
+
], MonacoKeybindingContribution.prototype, "logger", void 0);
|
|
116
121
|
tslib_1.__decorate([
|
|
117
122
|
(0, inversify_1.postConstruct)(),
|
|
118
123
|
tslib_1.__metadata("design:type", Function),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-keybinding.js","sourceRoot":"","sources":["../../src/browser/monaco-keybinding.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,
|
|
1
|
+
{"version":3,"file":"monaco-keybinding.js","sourceRoot":"","sources":["../../src/browser/monaco-keybinding.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,13 +2,10 @@
|
|
|
2
2
|
* Drop-in replacement for `@theia/monaco-editor-core/esm/vs/nls` that plugs
|
|
3
3
|
* Theia's localization system into every Monaco `localize` / `localize2` call.
|
|
4
4
|
*
|
|
5
|
-
*
|
|
6
|
-
*
|
|
7
|
-
*
|
|
8
|
-
*
|
|
9
|
-
* The Monaco editor web worker (`editor.worker.js`) is built in a separate
|
|
10
|
-
* webpack config without this alias, so it continues to use the original
|
|
11
|
-
* `nls.js` module and is not affected.
|
|
5
|
+
* The bundler resolves the original module to this file via the `monacoNlsPlugin` of
|
|
6
|
+
* `@theia/bundle-plugin`, which the generated esbuild configuration registers for the
|
|
7
|
+
* browser build (see `bundler-generator.ts`). We import from `nls.messages` directly so
|
|
8
|
+
* the redirect does not create a circular reference.
|
|
12
9
|
*/
|
|
13
10
|
export { getNLSLanguage, getNLSMessages } from '@theia/monaco-editor-core/esm/vs/nls.messages';
|
|
14
11
|
import { FormatType } from '@theia/core/lib/common/i18n/localization';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-nls.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-nls.ts"],"names":[],"mappings":"AAgBA
|
|
1
|
+
{"version":3,"file":"monaco-nls.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-nls.ts"],"names":[],"mappings":"AAgBA;;;;;;;;GAQG;AAGH,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,+CAA+C,CAAC;AAG/F,OAAO,EAAE,UAAU,EAAgB,MAAM,0CAA0C,CAAC;AAIpF,MAAM,WAAW,aAAa;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,EAAE,CAAC;CACrB;AAED,MAAM,WAAW,gBAAgB;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACjB;AAmBD,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,UAAU,EAAE,GAAG,MAAM,CAEnF;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,UAAU,EAAE,GAAG,gBAAgB,CAE9F"}
|
|
@@ -22,13 +22,10 @@ exports.localize2 = localize2;
|
|
|
22
22
|
* Drop-in replacement for `@theia/monaco-editor-core/esm/vs/nls` that plugs
|
|
23
23
|
* Theia's localization system into every Monaco `localize` / `localize2` call.
|
|
24
24
|
*
|
|
25
|
-
*
|
|
26
|
-
*
|
|
27
|
-
*
|
|
28
|
-
*
|
|
29
|
-
* The Monaco editor web worker (`editor.worker.js`) is built in a separate
|
|
30
|
-
* webpack config without this alias, so it continues to use the original
|
|
31
|
-
* `nls.js` module and is not affected.
|
|
25
|
+
* The bundler resolves the original module to this file via the `monacoNlsPlugin` of
|
|
26
|
+
* `@theia/bundle-plugin`, which the generated esbuild configuration registers for the
|
|
27
|
+
* browser build (see `bundler-generator.ts`). We import from `nls.messages` directly so
|
|
28
|
+
* the redirect does not create a circular reference.
|
|
32
29
|
*/
|
|
33
30
|
// Re-export the message store — imported via a path that is NOT aliased.
|
|
34
31
|
var nls_messages_1 = require("@theia/monaco-editor-core/esm/vs/nls.messages");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-nls.js","sourceRoot":"","sources":["../../src/browser/monaco-nls.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,oDAAoD;AACpD,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;
|
|
1
|
+
{"version":3,"file":"monaco-nls.js","sourceRoot":"","sources":["../../src/browser/monaco-nls.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,oDAAoD;AACpD,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AA+ChF,4BAEC;AAED,8BAEC;AAnDD;;;;;;;;GAQG;AAEH,yEAAyE;AACzE,8EAA+F;AAAtF,8GAAA,cAAc,OAAA;AAAE,8GAAA,cAAc,OAAA;AAEvC,oDAAiD;AACjD,2EAAoF;AAcpF,SAAS,aAAa,CAAC,KAAa,EAAE,GAAG,IAAkB;IACvD,MAAM,QAAQ,GAAG,2BAAY,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAClD,IAAI,SAAG,CAAC,MAAM,EAAE,CAAC;QACb,MAAM,UAAU,GAAG,SAAG,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC5C,IAAI,UAAU,EAAE,CAAC;YACb,OAAO;gBACH,QAAQ;gBACR,KAAK,EAAE,SAAG,CAAC,QAAQ,CAAC,UAAU,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;aAClD,CAAC;QACN,CAAC;IACL,CAAC;IACD,OAAO;QACH,QAAQ;QACR,KAAK,EAAE,QAAQ;KAClB,CAAC;AACN,CAAC;AAED,SAAgB,QAAQ,CAAC,IAAY,EAAE,KAAa,EAAE,GAAG,IAAkB;IACvE,OAAO,aAAa,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,CAAC,KAAK,CAAC;AAC/C,CAAC;AAED,SAAgB,SAAS,CAAC,IAAY,EAAE,KAAa,EAAE,GAAG,IAAkB;IACxE,OAAO,aAAa,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,CAAC;AACzC,CAAC"}
|
|
@@ -139,6 +139,7 @@ tslib_1.__decorate([
|
|
|
139
139
|
], MonacoTextModelService.prototype, "filters", void 0);
|
|
140
140
|
tslib_1.__decorate([
|
|
141
141
|
(0, inversify_1.inject)(logger_1.ILogger),
|
|
142
|
+
(0, inversify_1.named)('monaco:MonacoTextModelService'),
|
|
142
143
|
tslib_1.__metadata("design:type", Object)
|
|
143
144
|
], MonacoTextModelService.prototype, "logger", void 0);
|
|
144
145
|
tslib_1.__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-text-model-service.js","sourceRoot":"","sources":["../../src/browser/monaco-text-model-service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"monaco-text-model-service.js","sourceRoot":"","sources":["../../src/browser/monaco-text-model-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -110,7 +110,7 @@ let MonacoThemingService = MonacoThemingService_1 = class MonacoThemingService {
|
|
|
110
110
|
updateBodyUiTheme() {
|
|
111
111
|
this.toUpdateUiTheme.dispose();
|
|
112
112
|
const type = this.themeService.getCurrentTheme().type;
|
|
113
|
-
const uiTheme = type === 'hc' ? 'hc-black' : type === 'light' ? 'vs' : 'vs-dark';
|
|
113
|
+
const uiTheme = type === 'hc' ? 'hc-black' : type === 'hcLight' ? 'hc-light' : type === 'light' ? 'vs' : 'vs-dark';
|
|
114
114
|
document.body.classList.add(uiTheme);
|
|
115
115
|
this.toUpdateUiTheme.push(disposable_1.Disposable.create(() => document.body.classList.remove(uiTheme)));
|
|
116
116
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-theming-service.js","sourceRoot":"","sources":["../../src/browser/monaco-theming-service.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;;AAEhF,uDAAuD;AAEvD,4DAAyE;AACzE,4CAA4C;AAC5C,0CAA0C;AAC1C,oDAA6C;AAC7C,kEAAqF;AACrF,4EAAuE;AACvE,2DAA8G;AAC9G,6EAAyE;AAEzE,sCAAsC;AAgC/B,IAAM,oBAAoB,4BAA1B,MAAM,oBAAoB;IAA1B;QAsGO,oBAAe,GAAG,IAAI,iCAAoB,EAAE,CAAC;IA6C3D,CAAC;IA3IG,6DAA6D;IAC7D,QAAQ,CAAC,KAAkB,EAAE,UAA2C,EAAE;QACtE,MAAM,SAAS,GAAG,IAAI,iCAAoB,CAAC,uBAAU,CAAC,MAAM,CAAC,GAAG,EAAE,GAA8B,CAAC,CAAC,CAAC,CAAC;QACpG,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;QAC3C,OAAO,SAAS,CAAC;IACrB,CAAC;IAES,KAAK,CAAC,UAAU,CAAC,KAAkB,EACzC,OAAwC,EACxC,SAA+B;QAE/B,IAAI,CAAC;YACD,MAAM,QAAQ,GAAG,EAAE,CAAC;YACpB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;YAC3E,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC;gBACrB,OAAO;YACX,CAAC;YACD,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,IAAI,IAAI,aAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;YAC1D,MAAM,EAAE,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;YAC3C,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;QAC3G,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,4BAA4B,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QACnE,CAAC;IACL,CAAC;IAES,KAAK,CAAC,SAAS,CACrB,GAAW,EACX,QAAoC,EACpC,OAAwC,EACxC,SAA+B;QAE/B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,aAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QACzD,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC;QAC7B,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC;YACrB,OAAO;QACX,CAAC;QACD,MAAM,QAAQ,GAAG,IAAI,aAAG,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,QAAQ,CAAC,IAAI,CAAC,GAAG,KAAK,OAAO,EAAE,CAAC;YAChC,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACzC,IAAI,KAAK,IAAI,UAAU,IAAI,KAAK,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,CAAC;gBAChE,OAAO,EAAE,WAAW,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC;YAC3C,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,iCAAiC,GAAG,4BAA4B,CAAC,CAAC;QACtF,CAAC;QACD,MAAM,IAAI,GAAG,WAAW,CAAC,KAAK,CAAC,OAAO,EAAE,SAAS,EAAE,EAAE,gBAAgB,EAAE,KAAK,EAAE,CAAC,CAAC;QAChF,IAAI,aAAa,IAAI,IAAI,IAAI,OAAO,IAAI,CAAC,WAAW,KAAK,QAAQ,EAAE,CAAC;YAChE,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,IAAI,CAAC,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;YAC/F,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC;gBACrB,OAAO;YACX,CAAC;YACD,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;QACzC,CAAC;QACD,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;YACtG,IAAI,SAAS,CAAC,QAAQ,EAAE,CAAC;gBACrB,OAAO;YACX,CAAC;QACL,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACxB,OAAO,IAAI,CAAC;IAChB,CAAC;IAES,WAAW,CACjB,QAAa,EACb,cAAsB,EACtB,QAAoC,EACpC,OAAwC,EACxC,SAA+B;QAE/B,MAAM,aAAa,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,QAAQ,EAAE,CAAC;QACzE,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;YAC1B,OAAO,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;QACzF,CAAC;QACD,OAAO,OAAO,CAAC,aAAa,CAAC,CAAC;IAClC,CAAC;IAED,UAAU;QACN,IAAI,CAAC,mBAAmB,CAAC,uBAAuB,EAAE,CAAC;QACnD,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACzB,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;QACxE,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,sBAAoB,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3I,IAAI,CAAC,OAAO,EAAE,CAAC;IACnB,CAAC;IAED,mEAAmE;IACnE,mBAAmB,CAAC,KAAsB;QACtC,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,IAAI,SAAS,CAAC;QAC3C,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;QACrD,MAAM,EAAE,GAAG,KAAK,CAAC,EAAE,IAAI,KAAK,CAAC;QAC7B,MAAM,WAAW,GAAG,sBAAoB,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;QAC3D,MAAM,IAAI,GAAG,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QACrF,OAAO,IAAI,CAAC,qBAAqB,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IACjF,CAAC;IAGS,iBAAiB;QACvB,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC;QAC/B,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,eAAe,EAAE,CAAC,IAAI,CAAC;QACtD,MAAM,OAAO,GAA+B,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"monaco-theming-service.js","sourceRoot":"","sources":["../../src/browser/monaco-theming-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-textmate-service.d.ts","sourceRoot":"","sources":["../../../src/browser/textmate/monaco-textmate-service.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9F,OAAO,EAAE,+BAA+B,EAAwB,MAAM,yBAAyB,CAAC;AAChG,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,qCAAqC,EAAwB,MAAM,yBAAyB,CAAC;AACtG,OAAO,EAA2B,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAQhF,OAAO,EAAE,eAAe,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAEhF,qBACa,qBAAsB,YAAW,+BAA+B;IAEzE,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAEjD;IAEF,SAAS,CAAC,QAAQ,CAAC,mBAAmB,cAAqB;IAE3D,SAAS,CAAC,eAAe,EAAE,QAAQ,CAAC;IAGpC,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,oBAAoB,CAAC,qCAAqC,CAAC,CAAC;IAGjG,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAGtD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAGnC,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAGpD,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IAG9C,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IAG5D,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,iBAAiB,CAAC;IAGlD,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,uBAAuB,CAAC;IAE5D,UAAU,IAAI,IAAI;IA+BlB,SAAS,CAAC,QAAQ,CAAC,sBAAsB,uBAA8B;IAEvE,SAAS,CAAC,WAAW,IAAI,IAAI;IAiB7B,SAAS,KAAK,kBAAkB,IAAI,MAAM,
|
|
1
|
+
{"version":3,"file":"monaco-textmate-service.d.ts","sourceRoot":"","sources":["../../../src/browser/textmate/monaco-textmate-service.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9F,OAAO,EAAE,+BAA+B,EAAwB,MAAM,yBAAyB,CAAC;AAChG,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,qCAAqC,EAAwB,MAAM,yBAAyB,CAAC;AACtG,OAAO,EAA2B,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAQhF,OAAO,EAAE,eAAe,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAEhF,qBACa,qBAAsB,YAAW,+BAA+B;IAEzE,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAEjD;IAEF,SAAS,CAAC,QAAQ,CAAC,mBAAmB,cAAqB;IAE3D,SAAS,CAAC,eAAe,EAAE,QAAQ,CAAC;IAGpC,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,oBAAoB,CAAC,qCAAqC,CAAC,CAAC;IAGjG,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAGtD,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAGnC,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;IAGpD,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IAG9C,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IAG5D,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,iBAAiB,CAAC;IAGlD,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,uBAAuB,CAAC;IAE5D,UAAU,IAAI,IAAI;IA+BlB,SAAS,CAAC,QAAQ,CAAC,sBAAsB,uBAA8B;IAEvE,SAAS,CAAC,WAAW,IAAI,IAAI;IAiB7B,SAAS,KAAK,kBAAkB,IAAI,MAAM,CAGzC;IAED,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU;cAU9B,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;IA4CtG,SAAS,CAAC,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,UAAU;CAQxE"}
|
|
@@ -81,7 +81,8 @@ let MonacoTextmateService = class MonacoTextmateService {
|
|
|
81
81
|
monaco.editor.setTheme(currentEditorTheme);
|
|
82
82
|
}
|
|
83
83
|
get currentEditorTheme() {
|
|
84
|
-
|
|
84
|
+
const theme = this.themeService.getCurrentTheme();
|
|
85
|
+
return theme.editorTheme || monaco_theme_registry_1.MonacoThemeRegistry.getDefaultTheme(theme.type);
|
|
85
86
|
}
|
|
86
87
|
activateLanguage(language) {
|
|
87
88
|
const toDispose = new core_1.DisposableCollection(core_1.Disposable.create(() => { }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-textmate-service.js","sourceRoot":"","sources":["../../../src/browser/textmate/monaco-textmate-service.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,kDAAkD;AAClD,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,4DAAyE;AAEzE,sCAA8F;AAC9F,qDAAgG;AAChG,6DAA+D;AAC/D,mEAAsG;AACtG,6DAAgF;AAChF,2DAAuD;AACvD,mEAA8D;AAC9D,oFAAgF;AAChF,oDAAoD;AACpD,wFAAgG;AAChG,+GAAoH;AACpH,sHAAmH;AACnH,gGAAqG;AACrG,wHAA4H;AAE5H,6DAAgF;AAGzE,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAA3B;QAEgB,oBAAe,GAAoB;YAClD,SAAS,EAAE,GAAG;SACjB,CAAC;QAEiB,wBAAmB,GAAG,IAAI,GAAG,EAAU,CAAC;QA2DxC,2BAAsB,GAAG,IAAI,2BAAoB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"monaco-textmate-service.js","sourceRoot":"","sources":["../../../src/browser/textmate/monaco-textmate-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import * as monaco from '@theia/monaco-editor-core';
|
|
|
2
2
|
import { Color } from '@theia/monaco-editor-core/esm/vs/base/common/color';
|
|
3
3
|
import { MixStandaloneTheme, TextmateRegistryFactory, ThemeMix } from './monaco-theme-types';
|
|
4
4
|
import { ILogger } from '@theia/core';
|
|
5
|
+
import { ThemeType } from '@theia/core/lib/common/theme';
|
|
5
6
|
export declare class MonacoThemeRegistry {
|
|
6
7
|
protected readonly registryFactory: TextmateRegistryFactory;
|
|
7
8
|
protected readonly logger: ILogger;
|
|
@@ -26,5 +27,10 @@ export declare namespace MonacoThemeRegistry {
|
|
|
26
27
|
const LIGHT_DEFAULT_THEME = "light-theia";
|
|
27
28
|
const HC_DEFAULT_THEME = "hc-theia";
|
|
28
29
|
const HC_LIGHT_THEME = "hc-theia-light";
|
|
30
|
+
/**
|
|
31
|
+
* The default editor theme for a color theme that does not provide one of its own.
|
|
32
|
+
* It has to match the type, otherwise e.g. a light theme is rendered on a dark base.
|
|
33
|
+
*/
|
|
34
|
+
function getDefaultTheme(type: ThemeType): string;
|
|
29
35
|
}
|
|
30
36
|
//# sourceMappingURL=monaco-theme-registry.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-theme-registry.d.ts","sourceRoot":"","sources":["../../../src/browser/textmate/monaco-theme-registry.ts"],"names":[],"mappings":"AAqBA,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AAIpD,OAAO,EAAE,KAAK,EAAE,MAAM,oDAAoD,CAAC;AAC3E,OAAO,EAAE,kBAAkB,
|
|
1
|
+
{"version":3,"file":"monaco-theme-registry.d.ts","sourceRoot":"","sources":["../../../src/browser/textmate/monaco-theme-registry.ts"],"names":[],"mappings":"AAqBA,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AAIpD,OAAO,EAAE,KAAK,EAAE,MAAM,oDAAoD,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAoB,uBAAuB,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAC/G,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAEzD,qBACa,mBAAmB;IAEK,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,uBAAuB,CAAC;IAG7F,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEnC,uBAAuB,IAAI,IAAI;IAiB/B,YAAY,IAAI,QAAQ;IACxB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS;IAMhD,QAAQ,IAAI,kBAAkB;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,kBAAkB,GAAG,SAAS;IAKtD,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,kBAAkB,GAAG,SAAS;IAM9E,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,GAAG,IAAI;IAiB5C;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,QAAQ,CAAC,EAAE;QAAE,CAAC,WAAW,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,GAAG,QAAQ;IAiErI,SAAS,CAAC,SAAS,CAAC,UAAU,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,eAAe,KAAK,IAAI,GAAG,IAAI;IAcnG,SAAS,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS;CAalF;AAED,yBAAiB,mBAAmB,CAAC;IAC1B,MAAM,kBAAkB,eAAe,CAAC;IACxC,MAAM,mBAAmB,gBAAgB,CAAC;IAC1C,MAAM,gBAAgB,aAAa,CAAC;IACpC,MAAM,cAAc,mBAAmB,CAAC;IAE/C;;;OAGG;IACH,SAAgB,eAAe,CAAC,IAAI,EAAE,SAAS,GAAG,MAAM,CAOvD;CACJ"}
|
|
@@ -54,6 +54,19 @@ let MonacoThemeRegistry = class MonacoThemeRegistry {
|
|
|
54
54
|
return theme;
|
|
55
55
|
}
|
|
56
56
|
setTheme(name, data) {
|
|
57
|
+
// monaco lifts these two into token rules and throws on anything else, keeping the previous editor theme.
|
|
58
|
+
// all other colors are read via monaco's `Color.fromHex`, which accepts shorthand hex as is.
|
|
59
|
+
for (const key of ['editor.foreground', 'editor.background']) {
|
|
60
|
+
if (key in data.colors) {
|
|
61
|
+
const normalized = this.normalizeColor(data.colors[key]);
|
|
62
|
+
if (normalized) {
|
|
63
|
+
data.colors[key] = normalized;
|
|
64
|
+
}
|
|
65
|
+
else {
|
|
66
|
+
delete data.colors[key];
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
}
|
|
57
70
|
// monaco auto refreshes a theme with new data
|
|
58
71
|
monaco.editor.defineTheme(name, data);
|
|
59
72
|
}
|
|
@@ -140,13 +153,14 @@ let MonacoThemeRegistry = class MonacoThemeRegistry {
|
|
|
140
153
|
if (!color) {
|
|
141
154
|
return undefined;
|
|
142
155
|
}
|
|
143
|
-
const
|
|
144
|
-
if (
|
|
156
|
+
const expanded = monaco_theme_types_1.MonacoThemeColor.expandShorthandHex(String(color));
|
|
157
|
+
if (!monaco_theme_types_1.MonacoThemeColor.isTokenColor(expanded)) {
|
|
145
158
|
// ignoring not normalized colors to avoid breaking token color indexes between monaco and vscode-textmate
|
|
146
|
-
this.logger.error(`Color '${
|
|
159
|
+
this.logger.error(`Color '${expanded}' is NOT normalized, it must be a 6 or 8 digit hex value.`);
|
|
147
160
|
return undefined;
|
|
148
161
|
}
|
|
149
|
-
|
|
162
|
+
// monaco discards alpha for token colors, drop it here so that its color map stays aligned with vscode-textmate's
|
|
163
|
+
return expanded.slice(0, 7);
|
|
150
164
|
}
|
|
151
165
|
};
|
|
152
166
|
exports.MonacoThemeRegistry = MonacoThemeRegistry;
|
|
@@ -167,5 +181,18 @@ exports.MonacoThemeRegistry = MonacoThemeRegistry = tslib_1.__decorate([
|
|
|
167
181
|
MonacoThemeRegistry.LIGHT_DEFAULT_THEME = 'light-theia';
|
|
168
182
|
MonacoThemeRegistry.HC_DEFAULT_THEME = 'hc-theia';
|
|
169
183
|
MonacoThemeRegistry.HC_LIGHT_THEME = 'hc-theia-light';
|
|
184
|
+
/**
|
|
185
|
+
* The default editor theme for a color theme that does not provide one of its own.
|
|
186
|
+
* It has to match the type, otherwise e.g. a light theme is rendered on a dark base.
|
|
187
|
+
*/
|
|
188
|
+
function getDefaultTheme(type) {
|
|
189
|
+
switch (type) {
|
|
190
|
+
case 'light': return MonacoThemeRegistry.LIGHT_DEFAULT_THEME;
|
|
191
|
+
case 'hc': return MonacoThemeRegistry.HC_DEFAULT_THEME;
|
|
192
|
+
case 'hcLight': return MonacoThemeRegistry.HC_LIGHT_THEME;
|
|
193
|
+
default: return MonacoThemeRegistry.DARK_DEFAULT_THEME;
|
|
194
|
+
}
|
|
195
|
+
}
|
|
196
|
+
MonacoThemeRegistry.getDefaultTheme = getDefaultTheme;
|
|
170
197
|
})(MonacoThemeRegistry || (exports.MonacoThemeRegistry = MonacoThemeRegistry = {}));
|
|
171
198
|
//# sourceMappingURL=monaco-theme-registry.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-theme-registry.js","sourceRoot":"","sources":["../../../src/browser/textmate/monaco-theme-registry.ts"],"names":[],"mappings":";AACA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,uDAAuD;AAEvD,4DAAyE;AAEzE,oDAAoD;AACpD,+GAAoH;AACpH,sHAAmH;AAGnH,
|
|
1
|
+
{"version":3,"file":"monaco-theme-registry.js","sourceRoot":"","sources":["../../../src/browser/textmate/monaco-theme-registry.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,12 @@ export type OnigasmProvider = () => Promise<IOnigLib>;
|
|
|
11
11
|
export declare const TextmateRegistryFactory: unique symbol;
|
|
12
12
|
export type TextmateRegistryFactory = (currentTheme?: ThemeMix) => Registry;
|
|
13
13
|
export type MonacoThemeColor = monaco.editor.IColors;
|
|
14
|
+
export declare namespace MonacoThemeColor {
|
|
15
|
+
/** Expands shorthand hex (`#RGB`, `#RGBA`) to long form; other values pass through. */
|
|
16
|
+
function expandShorthandHex(color: string): string;
|
|
17
|
+
/** Whether monaco accepts `color` as a token color, i.e. 6/8-digit hex (see monaco's `ColorMap.getId`). */
|
|
18
|
+
function isTokenColor(color: string): boolean;
|
|
19
|
+
}
|
|
14
20
|
export interface MonacoTokenRule extends monaco.editor.ITokenThemeRule {
|
|
15
21
|
}
|
|
16
22
|
export type MonacoBuiltinTheme = monaco.editor.BuiltinTheme;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-theme-types.d.ts","sourceRoot":"","sources":["../../../src/browser/textmate/monaco-theme-types.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2EAA2E,CAAC;AAC7G,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAEhE,MAAM,WAAW,QAAS,SAAQ,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,oBAAoB;CAAI;AACnF,MAAM,WAAW,kBAAmB,SAAQ,gBAAgB;IACxD,SAAS,EAAE,QAAQ,CAAA;CACtB;AAED,eAAO,MAAM,eAAe,eAA4B,CAAC;AACzD,MAAM,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,CAAC;AACtD,eAAO,MAAM,uBAAuB,eAAoC,CAAC;AACzE,MAAM,MAAM,uBAAuB,GAAG,CAAC,YAAY,CAAC,EAAE,QAAQ,KAAK,QAAQ,CAAC;AAE5E,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC;AACrD,MAAM,WAAW,eAAgB,SAAQ,MAAM,CAAC,MAAM,CAAC,eAAe;CAAI;AAC1E,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;AAC5D,MAAM,WAAW,WAAY,SAAQ,MAAM,CAAC,MAAM,CAAC,oBAAoB;IACnE,IAAI,EAAE,MAAM,CAAC;CAChB"}
|
|
1
|
+
{"version":3,"file":"monaco-theme-types.d.ts","sourceRoot":"","sources":["../../../src/browser/textmate/monaco-theme-types.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2EAA2E,CAAC;AAC7G,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAEhE,MAAM,WAAW,QAAS,SAAQ,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,oBAAoB;CAAI;AACnF,MAAM,WAAW,kBAAmB,SAAQ,gBAAgB;IACxD,SAAS,EAAE,QAAQ,CAAA;CACtB;AAED,eAAO,MAAM,eAAe,eAA4B,CAAC;AACzD,MAAM,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,CAAC;AACtD,eAAO,MAAM,uBAAuB,eAAoC,CAAC;AACzE,MAAM,MAAM,uBAAuB,GAAG,CAAC,YAAY,CAAC,EAAE,QAAQ,KAAK,QAAQ,CAAC;AAE5E,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC;AACrD,yBAAiB,gBAAgB,CAAC;IAC9B,uFAAuF;IACvF,SAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAIxD;IACD,2GAA2G;IAC3G,SAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAEnD;CACJ;AACD,MAAM,WAAW,eAAgB,SAAQ,MAAM,CAAC,MAAM,CAAC,eAAe;CAAI;AAC1E,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;AAC5D,MAAM,WAAW,WAAY,SAAQ,MAAM,CAAC,MAAM,CAAC,oBAAoB;IACnE,IAAI,EAAE,MAAM,CAAC;CAChB"}
|
|
@@ -15,8 +15,23 @@
|
|
|
15
15
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
16
|
// *****************************************************************************
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
-
exports.TextmateRegistryFactory = exports.OnigasmProvider = void 0;
|
|
18
|
+
exports.MonacoThemeColor = exports.TextmateRegistryFactory = exports.OnigasmProvider = void 0;
|
|
19
19
|
exports.OnigasmProvider = Symbol('OnigasmProvider');
|
|
20
20
|
exports.TextmateRegistryFactory = Symbol('TextmateRegistryFactory');
|
|
21
|
+
var MonacoThemeColor;
|
|
22
|
+
(function (MonacoThemeColor) {
|
|
23
|
+
/** Expands shorthand hex (`#RGB`, `#RGBA`) to long form; other values pass through. */
|
|
24
|
+
function expandShorthandHex(color) {
|
|
25
|
+
return /^#[0-9a-fA-F]{3,4}$/.test(color)
|
|
26
|
+
? '#' + [...color.slice(1)].map(digit => digit + digit).join('')
|
|
27
|
+
: color;
|
|
28
|
+
}
|
|
29
|
+
MonacoThemeColor.expandShorthandHex = expandShorthandHex;
|
|
30
|
+
/** Whether monaco accepts `color` as a token color, i.e. 6/8-digit hex (see monaco's `ColorMap.getId`). */
|
|
31
|
+
function isTokenColor(color) {
|
|
32
|
+
return /^#[0-9a-fA-F]{6}([0-9a-fA-F]{2})?$/.test(color);
|
|
33
|
+
}
|
|
34
|
+
MonacoThemeColor.isTokenColor = isTokenColor;
|
|
35
|
+
})(MonacoThemeColor || (exports.MonacoThemeColor = MonacoThemeColor = {}));
|
|
21
36
|
;
|
|
22
37
|
//# sourceMappingURL=monaco-theme-types.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco-theme-types.js","sourceRoot":"","sources":["../../../src/browser/textmate/monaco-theme-types.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAWnE,QAAA,eAAe,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;AAE5C,QAAA,uBAAuB,GAAG,MAAM,CAAC,yBAAyB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"monaco-theme-types.js","sourceRoot":"","sources":["../../../src/browser/textmate/monaco-theme-types.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAWnE,QAAA,eAAe,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC;AAE5C,QAAA,uBAAuB,GAAG,MAAM,CAAC,yBAAyB,CAAC,CAAC;AAIzE,IAAiB,gBAAgB,CAWhC;AAXD,WAAiB,gBAAgB;IAC7B,uFAAuF;IACvF,SAAgB,kBAAkB,CAAC,KAAa;QAC5C,OAAO,qBAAqB,CAAC,IAAI,CAAC,KAAK,CAAC;YACpC,CAAC,CAAC,GAAG,GAAG,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;YAChE,CAAC,CAAC,KAAK,CAAC;IAChB,CAAC;IAJe,mCAAkB,qBAIjC,CAAA;IACD,2GAA2G;IAC3G,SAAgB,YAAY,CAAC,KAAa;QACtC,OAAO,oCAAoC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC5D,CAAC;IAFe,6BAAY,eAE3B,CAAA;AACL,CAAC,EAXgB,gBAAgB,gCAAhB,gBAAgB,QAWhC;AACyE,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"monaco-theme-types.spec.d.ts","sourceRoot":"","sources":["../../../src/browser/textmate/monaco-theme-types.spec.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// *****************************************************************************
|
|
3
|
+
// Copyright (C) 2026 Ehab Younes and others.
|
|
4
|
+
//
|
|
5
|
+
// This program and the accompanying materials are made available under the
|
|
6
|
+
// terms of the Eclipse Public License v. 2.0 which is available at
|
|
7
|
+
// http://www.eclipse.org/legal/epl-2.0.
|
|
8
|
+
//
|
|
9
|
+
// This Source Code may also be made available under the following Secondary
|
|
10
|
+
// Licenses when the conditions for such availability set forth in the Eclipse
|
|
11
|
+
// Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
12
|
+
// with the GNU Classpath Exception which is available at
|
|
13
|
+
// https://www.gnu.org/software/classpath/license.html.
|
|
14
|
+
//
|
|
15
|
+
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
|
+
// *****************************************************************************
|
|
17
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
+
const chai_1 = require("chai");
|
|
19
|
+
const monaco_theme_types_1 = require("./monaco-theme-types");
|
|
20
|
+
describe('MonacoThemeColor', () => {
|
|
21
|
+
// Themes may use shorthand hex, e.g. Alabaster sets 'editor.foreground': '#000', which
|
|
22
|
+
// monaco rejects with 'Illegal value for token color', keeping the previous editor theme.
|
|
23
|
+
it('should expand shorthand hex colors', () => {
|
|
24
|
+
(0, chai_1.expect)(monaco_theme_types_1.MonacoThemeColor.expandShorthandHex('#000')).to.equal('#000000');
|
|
25
|
+
(0, chai_1.expect)(monaco_theme_types_1.MonacoThemeColor.expandShorthandHex('#a1B2')).to.equal('#aa11BB22');
|
|
26
|
+
(0, chai_1.expect)(monaco_theme_types_1.MonacoThemeColor.expandShorthandHex('#123456')).to.equal('#123456');
|
|
27
|
+
(0, chai_1.expect)(monaco_theme_types_1.MonacoThemeColor.expandShorthandHex('#12345678')).to.equal('#12345678');
|
|
28
|
+
(0, chai_1.expect)(monaco_theme_types_1.MonacoThemeColor.expandShorthandHex('red')).to.equal('red');
|
|
29
|
+
});
|
|
30
|
+
it('should accept only colors monaco allows as token colors', () => {
|
|
31
|
+
(0, chai_1.expect)(monaco_theme_types_1.MonacoThemeColor.isTokenColor('#123456')).to.equal(true);
|
|
32
|
+
(0, chai_1.expect)(monaco_theme_types_1.MonacoThemeColor.isTokenColor('#12345678')).to.equal(true);
|
|
33
|
+
(0, chai_1.expect)(monaco_theme_types_1.MonacoThemeColor.isTokenColor(monaco_theme_types_1.MonacoThemeColor.expandShorthandHex('#000'))).to.equal(true);
|
|
34
|
+
(0, chai_1.expect)(monaco_theme_types_1.MonacoThemeColor.isTokenColor('#123')).to.equal(false);
|
|
35
|
+
(0, chai_1.expect)(monaco_theme_types_1.MonacoThemeColor.isTokenColor('red')).to.equal(false);
|
|
36
|
+
});
|
|
37
|
+
});
|
|
38
|
+
//# sourceMappingURL=monaco-theme-types.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"monaco-theme-types.spec.js","sourceRoot":"","sources":["../../../src/browser/textmate/monaco-theme-types.spec.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,6CAA6C;AAC7C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;AAEhF,+BAA8B;AAC9B,6DAAwD;AAExD,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;IAE9B,uFAAuF;IACvF,0FAA0F;IAC1F,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;QAC1C,IAAA,aAAM,EAAC,qCAAgB,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACxE,IAAA,aAAM,EAAC,qCAAgB,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAC3E,IAAA,aAAM,EAAC,qCAAgB,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAC3E,IAAA,aAAM,EAAC,qCAAgB,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAC/E,IAAA,aAAM,EAAC,qCAAgB,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACvE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yDAAyD,EAAE,GAAG,EAAE;QAC/D,IAAA,aAAM,EAAC,qCAAgB,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAChE,IAAA,aAAM,EAAC,qCAAgB,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAClE,IAAA,aAAM,EAAC,qCAAgB,CAAC,YAAY,CAAC,qCAAgB,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAClG,IAAA,aAAM,EAAC,qCAAgB,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC9D,IAAA,aAAM,EAAC,qCAAgB,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACjE,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { IGrammarConfiguration } from 'vscode-textmate';
|
|
2
2
|
import { TokenizerOption } from './textmate-tokenizer';
|
|
3
3
|
import { Disposable } from '@theia/core/lib/common/disposable';
|
|
4
|
+
import { ILogger } from '@theia/core';
|
|
4
5
|
export interface TextmateGrammarConfiguration extends IGrammarConfiguration {
|
|
5
6
|
/**
|
|
6
7
|
* Optional options to further refine the tokenization of the grammar.
|
|
@@ -17,6 +18,7 @@ export interface GrammarDefinition {
|
|
|
17
18
|
location?: string;
|
|
18
19
|
}
|
|
19
20
|
export declare class TextmateRegistry {
|
|
21
|
+
protected readonly logger: ILogger;
|
|
20
22
|
protected readonly scopeToProvider: Map<string, GrammarDefinitionProvider[]>;
|
|
21
23
|
protected readonly languageToConfig: Map<string, TextmateGrammarConfiguration[]>;
|
|
22
24
|
protected readonly languageIdToScope: Map<string, string[]>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"textmate-registry.d.ts","sourceRoot":"","sources":["../../../src/browser/textmate/textmate-registry.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"textmate-registry.d.ts","sourceRoot":"","sources":["../../../src/browser/textmate/textmate-registry.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,MAAM,WAAW,4BAA6B,SAAQ,qBAAqB;IAEvE;;OAEG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,eAAe,CAAC;CAE9C;AAED,MAAM,WAAW,yBAAyB;IACtC,oBAAoB,IAAI,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACnD,aAAa,CAAC,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CAC/C;AAED,MAAM,WAAW,iBAAiB;IAC9B,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;IACzB,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBACa,gBAAgB;IAGzB,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IAEnC,SAAS,CAAC,QAAQ,CAAC,eAAe,2CAAkD;IACpF,SAAS,CAAC,QAAQ,CAAC,gBAAgB,8CAAqD;IACxF,SAAS,CAAC,QAAQ,CAAC,iBAAiB,wBAA+B;IAEnE,IAAI,SAAS,IAAI,gBAAgB,CAAC,MAAM,CAAC,CAExC;IAED,4BAA4B,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,yBAAyB,GAAG,UAAU;IAoB5F,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,yBAAyB,GAAG,SAAS;IAKjE,8BAA8B,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,UAAU;IAgB7E,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAKhD,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAShD,4BAA4B,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,4BAA4B,GAAG,UAAU;IAgBlG,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,4BAA4B;CAK5E"}
|
|
@@ -19,6 +19,7 @@ exports.TextmateRegistry = void 0;
|
|
|
19
19
|
const tslib_1 = require("tslib");
|
|
20
20
|
const inversify_1 = require("@theia/core/shared/inversify");
|
|
21
21
|
const disposable_1 = require("@theia/core/lib/common/disposable");
|
|
22
|
+
const core_1 = require("@theia/core");
|
|
22
23
|
let TextmateRegistry = class TextmateRegistry {
|
|
23
24
|
constructor() {
|
|
24
25
|
this.scopeToProvider = new Map();
|
|
@@ -34,7 +35,7 @@ let TextmateRegistry = class TextmateRegistry {
|
|
|
34
35
|
if (existingProvider) {
|
|
35
36
|
Promise.all([existingProvider.getGrammarDefinition(), provider.getGrammarDefinition()]).then(([a, b]) => {
|
|
36
37
|
if (a.location !== b.location || !a.location && !b.location) {
|
|
37
|
-
|
|
38
|
+
this.logger.warn(`a registered grammar provider for '${scope}' scope is overridden`);
|
|
38
39
|
}
|
|
39
40
|
});
|
|
40
41
|
}
|
|
@@ -55,7 +56,7 @@ let TextmateRegistry = class TextmateRegistry {
|
|
|
55
56
|
const scopes = this.languageIdToScope.get(languageId) || [];
|
|
56
57
|
const existingScope = scopes[0];
|
|
57
58
|
if (typeof existingScope === 'string') {
|
|
58
|
-
|
|
59
|
+
this.logger.warn(`'${languageId}' language is remapped from '${existingScope}' to '${scope}' scope`);
|
|
59
60
|
}
|
|
60
61
|
scopes.unshift(scope);
|
|
61
62
|
this.languageIdToScope.set(languageId, scopes);
|
|
@@ -82,7 +83,7 @@ let TextmateRegistry = class TextmateRegistry {
|
|
|
82
83
|
const configs = this.languageToConfig.get(languageId) || [];
|
|
83
84
|
const existingConfig = configs[0];
|
|
84
85
|
if (existingConfig) {
|
|
85
|
-
|
|
86
|
+
this.logger.warn(`a registered grammar configuration for '${languageId}' language is overridden`);
|
|
86
87
|
}
|
|
87
88
|
configs.unshift(config);
|
|
88
89
|
this.languageToConfig.set(languageId, configs);
|
|
@@ -99,6 +100,11 @@ let TextmateRegistry = class TextmateRegistry {
|
|
|
99
100
|
}
|
|
100
101
|
};
|
|
101
102
|
exports.TextmateRegistry = TextmateRegistry;
|
|
103
|
+
tslib_1.__decorate([
|
|
104
|
+
(0, inversify_1.inject)(core_1.ILogger),
|
|
105
|
+
(0, inversify_1.named)('monaco:TextmateRegistry'),
|
|
106
|
+
tslib_1.__metadata("design:type", Object)
|
|
107
|
+
], TextmateRegistry.prototype, "logger", void 0);
|
|
102
108
|
exports.TextmateRegistry = TextmateRegistry = tslib_1.__decorate([
|
|
103
109
|
(0, inversify_1.injectable)()
|
|
104
110
|
], TextmateRegistry);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"textmate-registry.js","sourceRoot":"","sources":["../../../src/browser/textmate/textmate-registry.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,
|
|
1
|
+
{"version":3,"file":"textmate-registry.js","sourceRoot":"","sources":["../../../src/browser/textmate/textmate-registry.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,4DAAyE;AAGzE,kEAA+D;AAC/D,sCAAsC;AAuB/B,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAAtB;QAKgB,oBAAe,GAAG,IAAI,GAAG,EAAuC,CAAC;QACjE,qBAAgB,GAAG,IAAI,GAAG,EAA0C,CAAC;QACrE,sBAAiB,GAAG,IAAI,GAAG,EAAoB,CAAC;IAkFvE,CAAC;IAhFG,IAAI,SAAS;QACT,OAAO,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC;IACzC,CAAC;IAED,4BAA4B,CAAC,KAAa,EAAE,QAAmC;QAC3E,MAAM,SAAS,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;QACxD,MAAM,gBAAgB,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;QACtC,IAAI,gBAAgB,EAAE,CAAC;YACnB,OAAO,CAAC,GAAG,CAAC,CAAC,gBAAgB,CAAC,oBAAoB,EAAE,EAAE,QAAQ,CAAC,oBAAoB,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;gBACpG,IAAI,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;oBAC1D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,sCAAsC,KAAK,uBAAuB,CAAC,CAAC;gBACzF,CAAC;YACL,CAAC,CAAC,CAAC;QACP,CAAC;QACD,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC5B,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAC3C,OAAO,uBAAU,CAAC,MAAM,CAAC,GAAG,EAAE;YAC1B,MAAM,KAAK,GAAG,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAC1C,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;gBACf,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YAC/B,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAED,WAAW,CAAC,KAAa;QACrB,MAAM,SAAS,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAClD,OAAO,SAAS,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC;IACrC,CAAC;IAED,8BAA8B,CAAC,UAAkB,EAAE,KAAa;QAC5D,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;QAC5D,MAAM,aAAa,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QAChC,IAAI,OAAO,aAAa,KAAK,QAAQ,EAAE,CAAC;YACpC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,UAAU,gCAAgC,aAAa,SAAS,KAAK,SAAS,CAAC,CAAC;QACzG,CAAC;QACD,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACtB,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QAC/C,OAAO,uBAAU,CAAC,MAAM,CAAC,GAAG,EAAE;YAC1B,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YACpC,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;gBACf,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YAC5B,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAED,QAAQ,CAAC,UAAkB;QACvB,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACtD,OAAO,MAAM,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC;IAC/B,CAAC;IAED,aAAa,CAAC,KAAa;QACvB,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,EAAE,CAAC;YACrD,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,KAAK,KAAK,EAAE,CAAC;gBACtC,OAAO,UAAU,CAAC;YACtB,CAAC;QACL,CAAC;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,4BAA4B,CAAC,UAAkB,EAAE,MAAoC;QACjF,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;QAC5D,MAAM,cAAc,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;QAClC,IAAI,cAAc,EAAE,CAAC;YACjB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,2CAA2C,UAAU,0BAA0B,CAAC,CAAC;QACtG,CAAC;QACD,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACxB,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAC/C,OAAO,uBAAU,CAAC,MAAM,CAAC,GAAG,EAAE;YAC1B,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACtC,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC;gBACf,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YAC7B,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAED,uBAAuB,CAAC,UAAkB;QACtC,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACtD,OAAO,OAAO,IAAI,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IACvC,CAAC;CAEJ,CAAA;AAzFY,4CAAgB;AAGN;IADlB,IAAA,kBAAM,EAAC,cAAO,CAAC;IAAE,IAAA,iBAAK,EAAC,yBAAyB,CAAC;;gDACf;2BAH1B,gBAAgB;IAD5B,IAAA,sBAAU,GAAE;GACA,gBAAgB,CAyF5B"}
|
package/package.json
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/monaco",
|
|
3
|
-
"version": "1.75.0
|
|
3
|
+
"version": "1.75.0",
|
|
4
4
|
"description": "Theia - Monaco Extension",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.75.0
|
|
7
|
-
"@theia/editor": "1.75.0
|
|
8
|
-
"@theia/filesystem": "1.75.0
|
|
9
|
-
"@theia/markers": "1.75.0
|
|
6
|
+
"@theia/core": "1.75.0",
|
|
7
|
+
"@theia/editor": "1.75.0",
|
|
8
|
+
"@theia/filesystem": "1.75.0",
|
|
9
|
+
"@theia/markers": "1.75.0",
|
|
10
10
|
"@theia/monaco-editor-core": "1.108.201",
|
|
11
|
-
"@theia/outline-view": "1.75.0
|
|
12
|
-
"@theia/workspace": "1.75.0
|
|
11
|
+
"@theia/outline-view": "1.75.0",
|
|
12
|
+
"@theia/workspace": "1.75.0",
|
|
13
13
|
"fast-plist": "^0.1.3",
|
|
14
14
|
"idb": "^4.0.5",
|
|
15
15
|
"jsonc-parser": "^3.3.1",
|
|
@@ -52,10 +52,10 @@
|
|
|
52
52
|
"watch": "theiaext watch"
|
|
53
53
|
},
|
|
54
54
|
"devDependencies": {
|
|
55
|
-
"@theia/ext-scripts": "1.
|
|
55
|
+
"@theia/ext-scripts": "1.75.0"
|
|
56
56
|
},
|
|
57
57
|
"nyc": {
|
|
58
58
|
"extends": "../../configs/nyc.json"
|
|
59
59
|
},
|
|
60
|
-
"gitHead": "
|
|
60
|
+
"gitHead": "6d8e911f05f0fd9a13d76797e79b21ee3f038bc2"
|
|
61
61
|
}
|
|
@@ -24,6 +24,7 @@ import { IOpenerService, OpenExternalOptions, OpenInternalOptions } from '@theia
|
|
|
24
24
|
import { HttpOpenHandlerOptions } from '@theia/core/lib/browser/http-open-handler';
|
|
25
25
|
import { URI } from '@theia/core/lib/common/uri';
|
|
26
26
|
import { MarkdownRenderer, MarkdownRenderOptions, MarkdownRenderResult } from '@theia/core/lib/browser/markdown-rendering/markdown-renderer';
|
|
27
|
+
import { markMarkdownLinksWired } from '@theia/core/lib/browser/markdown-rendering/markdown-link-handler';
|
|
27
28
|
import { MarkdownRenderOptions as MonacoMarkdownRenderOptions } from '@theia/monaco-editor-core/esm/vs/base/browser/markdownRenderer';
|
|
28
29
|
import { MarkdownString } from '@theia/core/lib/common/markdown-rendering';
|
|
29
30
|
import { DisposableStore } from '@theia/monaco-editor-core/esm/vs/base/common/lifecycle';
|
|
@@ -39,7 +40,12 @@ export class MonacoMarkdownRenderer implements MarkdownRenderer {
|
|
|
39
40
|
protected _openerService: OpenerService | undefined;
|
|
40
41
|
|
|
41
42
|
render(markdown: MarkdownString, options?: MarkdownRenderOptions): MarkdownRenderResult {
|
|
42
|
-
|
|
43
|
+
const rendered = this.delegate.render(markdown, this.transformOptions(options));
|
|
44
|
+
// The delegate activates links through its own opener service, which `interceptOpen`
|
|
45
|
+
// routes to Theia's. Declaring that keeps callers from wiring a second handler, which
|
|
46
|
+
// would open every link twice.
|
|
47
|
+
markMarkdownLinksWired(rendered.element);
|
|
48
|
+
return rendered;
|
|
43
49
|
}
|
|
44
50
|
|
|
45
51
|
protected transformOptions(options?: MarkdownRenderOptions): MonacoMarkdownRenderOptions | undefined {
|
|
@@ -90,7 +90,7 @@ export async function deleteTheme(id: string): Promise<void> {
|
|
|
90
90
|
|
|
91
91
|
export function stateToTheme(state: MonacoThemeState): Theme {
|
|
92
92
|
const { id, label, description, uiTheme, data } = state;
|
|
93
|
-
const type = uiTheme === 'vs' ? 'light' : uiTheme === 'vs-dark' ? 'dark' : 'hc';
|
|
93
|
+
const type = uiTheme === 'vs' ? 'light' : uiTheme === 'vs-dark' ? 'dark' : uiTheme === 'hc-light' ? 'hcLight' : 'hc';
|
|
94
94
|
return {
|
|
95
95
|
type,
|
|
96
96
|
id,
|
|
@@ -27,9 +27,9 @@
|
|
|
27
27
|
* is allowed.
|
|
28
28
|
*/
|
|
29
29
|
|
|
30
|
-
// Monaco's localization override is handled
|
|
31
|
-
// @theia/monaco-editor-core/esm/vs/nls with
|
|
32
|
-
//
|
|
30
|
+
// Monaco's localization override is handled at bundling time by the `monacoNlsPlugin` of
|
|
31
|
+
// @theia/bundle-plugin, which replaces @theia/monaco-editor-core/esm/vs/nls with
|
|
32
|
+
// packages/monaco/src/browser/monaco-nls.ts.
|
|
33
33
|
|
|
34
34
|
import { Container } from '@theia/core/shared/inversify';
|
|
35
35
|
import { ICodeEditorService } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/codeEditorService';
|
|
@@ -14,11 +14,11 @@
|
|
|
14
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
|
-
import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
|
|
17
|
+
import { injectable, inject, postConstruct, named } from '@theia/core/shared/inversify';
|
|
18
18
|
import { KeybindingContribution, KeybindingRegistry, KeybindingScope, KeyCode } from '@theia/core/lib/browser';
|
|
19
19
|
import { MonacoCommands } from './monaco-command';
|
|
20
20
|
import { MonacoCommandRegistry } from './monaco-command-registry';
|
|
21
|
-
import { CommandRegistry, DisposableCollection, environment, isOSX } from '@theia/core';
|
|
21
|
+
import { CommandRegistry, DisposableCollection, environment, isOSX, ILogger } from '@theia/core';
|
|
22
22
|
import { MonacoResolvedKeybinding } from './monaco-resolved-keybinding';
|
|
23
23
|
import { KeybindingsRegistry } from '@theia/monaco-editor-core/esm/vs/platform/keybinding/common/keybindingsRegistry';
|
|
24
24
|
import { StandaloneKeybindingService, StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
|
|
@@ -37,6 +37,9 @@ export class MonacoKeybindingContribution implements KeybindingContribution {
|
|
|
37
37
|
@inject(CommandRegistry) protected readonly theiaCommandRegistry: CommandRegistry;
|
|
38
38
|
@inject(MonacoContextKeyService) protected readonly contextKeyService: MonacoContextKeyService;
|
|
39
39
|
|
|
40
|
+
@inject(ILogger) @named('monaco:MonacoKeybindingContribution')
|
|
41
|
+
protected readonly logger: ILogger;
|
|
42
|
+
|
|
40
43
|
@postConstruct()
|
|
41
44
|
protected init(): void {
|
|
42
45
|
this.keybindings.onKeybindingsChanged(() => this.updateMonacoKeybindings());
|
|
@@ -84,7 +87,7 @@ export class MonacoKeybindingContribution implements KeybindingContribution {
|
|
|
84
87
|
protected toMonacoKeybindingNumber(codes: KeyCode[]): number {
|
|
85
88
|
const [firstPart, secondPart] = codes;
|
|
86
89
|
if (codes.length > 2) {
|
|
87
|
-
|
|
90
|
+
this.logger.warn('Key chords should not consist of more than two parts; got ', codes);
|
|
88
91
|
}
|
|
89
92
|
const encodedFirstPart = this.toSingleMonacoKeybindingNumber(firstPart);
|
|
90
93
|
const encodedSecondPart = secondPart ? this.toSingleMonacoKeybindingNumber(secondPart) << 16 : 0;
|
|
@@ -18,13 +18,10 @@
|
|
|
18
18
|
* Drop-in replacement for `@theia/monaco-editor-core/esm/vs/nls` that plugs
|
|
19
19
|
* Theia's localization system into every Monaco `localize` / `localize2` call.
|
|
20
20
|
*
|
|
21
|
-
*
|
|
22
|
-
*
|
|
23
|
-
*
|
|
24
|
-
*
|
|
25
|
-
* The Monaco editor web worker (`editor.worker.js`) is built in a separate
|
|
26
|
-
* webpack config without this alias, so it continues to use the original
|
|
27
|
-
* `nls.js` module and is not affected.
|
|
21
|
+
* The bundler resolves the original module to this file via the `monacoNlsPlugin` of
|
|
22
|
+
* `@theia/bundle-plugin`, which the generated esbuild configuration registers for the
|
|
23
|
+
* browser build (see `bundler-generator.ts`). We import from `nls.messages` directly so
|
|
24
|
+
* the redirect does not create a circular reference.
|
|
28
25
|
*/
|
|
29
26
|
|
|
30
27
|
// Re-export the message store — imported via a path that is NOT aliased.
|
|
@@ -88,7 +88,7 @@ export class MonacoTextModelService implements ITextModelService {
|
|
|
88
88
|
@named(MonacoEditorModelFilter)
|
|
89
89
|
protected readonly filters: ContributionProvider<MonacoEditorModelFilter>;
|
|
90
90
|
|
|
91
|
-
@inject(ILogger)
|
|
91
|
+
@inject(ILogger) @named('monaco:MonacoTextModelService')
|
|
92
92
|
protected readonly logger: ILogger;
|
|
93
93
|
|
|
94
94
|
@inject(FileService)
|
|
@@ -163,7 +163,7 @@ export class MonacoThemingService {
|
|
|
163
163
|
protected updateBodyUiTheme(): void {
|
|
164
164
|
this.toUpdateUiTheme.dispose();
|
|
165
165
|
const type = this.themeService.getCurrentTheme().type;
|
|
166
|
-
const uiTheme: monaco.editor.BuiltinTheme = type === 'hc' ? 'hc-black' : type === 'light' ? 'vs' : 'vs-dark';
|
|
166
|
+
const uiTheme: monaco.editor.BuiltinTheme = type === 'hc' ? 'hc-black' : type === 'hcLight' ? 'hc-light' : type === 'light' ? 'vs' : 'vs-dark';
|
|
167
167
|
document.body.classList.add(uiTheme);
|
|
168
168
|
this.toUpdateUiTheme.push(Disposable.create(() => document.body.classList.remove(uiTheme)));
|
|
169
169
|
}
|
|
@@ -119,7 +119,8 @@ export class MonacoTextmateService implements FrontendApplicationContribution {
|
|
|
119
119
|
}
|
|
120
120
|
|
|
121
121
|
protected get currentEditorTheme(): string {
|
|
122
|
-
|
|
122
|
+
const theme = this.themeService.getCurrentTheme();
|
|
123
|
+
return theme.editorTheme || MonacoThemeRegistry.getDefaultTheme(theme.type);
|
|
123
124
|
}
|
|
124
125
|
|
|
125
126
|
activateLanguage(language: string): Disposable {
|
|
@@ -24,8 +24,9 @@ import { IStandaloneThemeService } from '@theia/monaco-editor-core/esm/vs/editor
|
|
|
24
24
|
import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
|
|
25
25
|
import { StandaloneThemeService } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneThemeService';
|
|
26
26
|
import { Color } from '@theia/monaco-editor-core/esm/vs/base/common/color';
|
|
27
|
-
import { MixStandaloneTheme, TextmateRegistryFactory, ThemeMix } from './monaco-theme-types';
|
|
27
|
+
import { MixStandaloneTheme, MonacoThemeColor, TextmateRegistryFactory, ThemeMix } from './monaco-theme-types';
|
|
28
28
|
import { ILogger } from '@theia/core';
|
|
29
|
+
import { ThemeType } from '@theia/core/lib/common/theme';
|
|
29
30
|
|
|
30
31
|
@injectable()
|
|
31
32
|
export class MonacoThemeRegistry {
|
|
@@ -72,6 +73,18 @@ export class MonacoThemeRegistry {
|
|
|
72
73
|
}
|
|
73
74
|
|
|
74
75
|
setTheme(name: string, data: ThemeMix): void {
|
|
76
|
+
// monaco lifts these two into token rules and throws on anything else, keeping the previous editor theme.
|
|
77
|
+
// all other colors are read via monaco's `Color.fromHex`, which accepts shorthand hex as is.
|
|
78
|
+
for (const key of ['editor.foreground', 'editor.background']) {
|
|
79
|
+
if (key in data.colors) {
|
|
80
|
+
const normalized = this.normalizeColor(data.colors[key]);
|
|
81
|
+
if (normalized) {
|
|
82
|
+
data.colors[key] = normalized;
|
|
83
|
+
} else {
|
|
84
|
+
delete data.colors[key];
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
}
|
|
75
88
|
// monaco auto refreshes a theme with new data
|
|
76
89
|
monaco.editor.defineTheme(name, data);
|
|
77
90
|
}
|
|
@@ -162,13 +175,14 @@ export class MonacoThemeRegistry {
|
|
|
162
175
|
if (!color) {
|
|
163
176
|
return undefined;
|
|
164
177
|
}
|
|
165
|
-
const
|
|
166
|
-
if (
|
|
178
|
+
const expanded = MonacoThemeColor.expandShorthandHex(String(color));
|
|
179
|
+
if (!MonacoThemeColor.isTokenColor(expanded)) {
|
|
167
180
|
// ignoring not normalized colors to avoid breaking token color indexes between monaco and vscode-textmate
|
|
168
|
-
this.logger.error(`Color '${
|
|
181
|
+
this.logger.error(`Color '${expanded}' is NOT normalized, it must be a 6 or 8 digit hex value.`);
|
|
169
182
|
return undefined;
|
|
170
183
|
}
|
|
171
|
-
|
|
184
|
+
// monaco discards alpha for token colors, drop it here so that its color map stays aligned with vscode-textmate's
|
|
185
|
+
return expanded.slice(0, 7);
|
|
172
186
|
}
|
|
173
187
|
}
|
|
174
188
|
|
|
@@ -177,4 +191,17 @@ export namespace MonacoThemeRegistry {
|
|
|
177
191
|
export const LIGHT_DEFAULT_THEME = 'light-theia';
|
|
178
192
|
export const HC_DEFAULT_THEME = 'hc-theia';
|
|
179
193
|
export const HC_LIGHT_THEME = 'hc-theia-light';
|
|
194
|
+
|
|
195
|
+
/**
|
|
196
|
+
* The default editor theme for a color theme that does not provide one of its own.
|
|
197
|
+
* It has to match the type, otherwise e.g. a light theme is rendered on a dark base.
|
|
198
|
+
*/
|
|
199
|
+
export function getDefaultTheme(type: ThemeType): string {
|
|
200
|
+
switch (type) {
|
|
201
|
+
case 'light': return LIGHT_DEFAULT_THEME;
|
|
202
|
+
case 'hc': return HC_DEFAULT_THEME;
|
|
203
|
+
case 'hcLight': return HC_LIGHT_THEME;
|
|
204
|
+
default: return DARK_DEFAULT_THEME;
|
|
205
|
+
}
|
|
206
|
+
}
|
|
180
207
|
}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
// *****************************************************************************
|
|
2
|
+
// Copyright (C) 2026 Ehab Younes 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 { expect } from 'chai';
|
|
18
|
+
import { MonacoThemeColor } from './monaco-theme-types';
|
|
19
|
+
|
|
20
|
+
describe('MonacoThemeColor', () => {
|
|
21
|
+
|
|
22
|
+
// Themes may use shorthand hex, e.g. Alabaster sets 'editor.foreground': '#000', which
|
|
23
|
+
// monaco rejects with 'Illegal value for token color', keeping the previous editor theme.
|
|
24
|
+
it('should expand shorthand hex colors', () => {
|
|
25
|
+
expect(MonacoThemeColor.expandShorthandHex('#000')).to.equal('#000000');
|
|
26
|
+
expect(MonacoThemeColor.expandShorthandHex('#a1B2')).to.equal('#aa11BB22');
|
|
27
|
+
expect(MonacoThemeColor.expandShorthandHex('#123456')).to.equal('#123456');
|
|
28
|
+
expect(MonacoThemeColor.expandShorthandHex('#12345678')).to.equal('#12345678');
|
|
29
|
+
expect(MonacoThemeColor.expandShorthandHex('red')).to.equal('red');
|
|
30
|
+
});
|
|
31
|
+
|
|
32
|
+
it('should accept only colors monaco allows as token colors', () => {
|
|
33
|
+
expect(MonacoThemeColor.isTokenColor('#123456')).to.equal(true);
|
|
34
|
+
expect(MonacoThemeColor.isTokenColor('#12345678')).to.equal(true);
|
|
35
|
+
expect(MonacoThemeColor.isTokenColor(MonacoThemeColor.expandShorthandHex('#000'))).to.equal(true);
|
|
36
|
+
expect(MonacoThemeColor.isTokenColor('#123')).to.equal(false);
|
|
37
|
+
expect(MonacoThemeColor.isTokenColor('red')).to.equal(false);
|
|
38
|
+
});
|
|
39
|
+
});
|
|
@@ -29,6 +29,18 @@ export const TextmateRegistryFactory = Symbol('TextmateRegistryFactory');
|
|
|
29
29
|
export type TextmateRegistryFactory = (currentTheme?: ThemeMix) => Registry;
|
|
30
30
|
|
|
31
31
|
export type MonacoThemeColor = monaco.editor.IColors;
|
|
32
|
+
export namespace MonacoThemeColor {
|
|
33
|
+
/** Expands shorthand hex (`#RGB`, `#RGBA`) to long form; other values pass through. */
|
|
34
|
+
export function expandShorthandHex(color: string): string {
|
|
35
|
+
return /^#[0-9a-fA-F]{3,4}$/.test(color)
|
|
36
|
+
? '#' + [...color.slice(1)].map(digit => digit + digit).join('')
|
|
37
|
+
: color;
|
|
38
|
+
}
|
|
39
|
+
/** Whether monaco accepts `color` as a token color, i.e. 6/8-digit hex (see monaco's `ColorMap.getId`). */
|
|
40
|
+
export function isTokenColor(color: string): boolean {
|
|
41
|
+
return /^#[0-9a-fA-F]{6}([0-9a-fA-F]{2})?$/.test(color);
|
|
42
|
+
}
|
|
43
|
+
}
|
|
32
44
|
export interface MonacoTokenRule extends monaco.editor.ITokenThemeRule { };
|
|
33
45
|
export type MonacoBuiltinTheme = monaco.editor.BuiltinTheme;
|
|
34
46
|
export interface MonacoTheme extends monaco.editor.IStandaloneThemeData {
|
|
@@ -14,10 +14,11 @@
|
|
|
14
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
|
-
import { injectable } from '@theia/core/shared/inversify';
|
|
17
|
+
import { injectable, inject, named } from '@theia/core/shared/inversify';
|
|
18
18
|
import { IGrammarConfiguration } from 'vscode-textmate';
|
|
19
19
|
import { TokenizerOption } from './textmate-tokenizer';
|
|
20
20
|
import { Disposable } from '@theia/core/lib/common/disposable';
|
|
21
|
+
import { ILogger } from '@theia/core';
|
|
21
22
|
|
|
22
23
|
export interface TextmateGrammarConfiguration extends IGrammarConfiguration {
|
|
23
24
|
|
|
@@ -42,6 +43,9 @@ export interface GrammarDefinition {
|
|
|
42
43
|
@injectable()
|
|
43
44
|
export class TextmateRegistry {
|
|
44
45
|
|
|
46
|
+
@inject(ILogger) @named('monaco:TextmateRegistry')
|
|
47
|
+
protected readonly logger: ILogger;
|
|
48
|
+
|
|
45
49
|
protected readonly scopeToProvider = new Map<string, GrammarDefinitionProvider[]>();
|
|
46
50
|
protected readonly languageToConfig = new Map<string, TextmateGrammarConfiguration[]>();
|
|
47
51
|
protected readonly languageIdToScope = new Map<string, string[]>();
|
|
@@ -56,7 +60,7 @@ export class TextmateRegistry {
|
|
|
56
60
|
if (existingProvider) {
|
|
57
61
|
Promise.all([existingProvider.getGrammarDefinition(), provider.getGrammarDefinition()]).then(([a, b]) => {
|
|
58
62
|
if (a.location !== b.location || !a.location && !b.location) {
|
|
59
|
-
|
|
63
|
+
this.logger.warn(`a registered grammar provider for '${scope}' scope is overridden`);
|
|
60
64
|
}
|
|
61
65
|
});
|
|
62
66
|
}
|
|
@@ -79,7 +83,7 @@ export class TextmateRegistry {
|
|
|
79
83
|
const scopes = this.languageIdToScope.get(languageId) || [];
|
|
80
84
|
const existingScope = scopes[0];
|
|
81
85
|
if (typeof existingScope === 'string') {
|
|
82
|
-
|
|
86
|
+
this.logger.warn(`'${languageId}' language is remapped from '${existingScope}' to '${scope}' scope`);
|
|
83
87
|
}
|
|
84
88
|
scopes.unshift(scope);
|
|
85
89
|
this.languageIdToScope.set(languageId, scopes);
|
|
@@ -109,7 +113,7 @@ export class TextmateRegistry {
|
|
|
109
113
|
const configs = this.languageToConfig.get(languageId) || [];
|
|
110
114
|
const existingConfig = configs[0];
|
|
111
115
|
if (existingConfig) {
|
|
112
|
-
|
|
116
|
+
this.logger.warn(`a registered grammar configuration for '${languageId}' language is overridden`);
|
|
113
117
|
}
|
|
114
118
|
configs.unshift(config);
|
|
115
119
|
this.languageToConfig.set(languageId, configs);
|