@theia/monaco 1.27.0-next.4 → 1.27.0-next.43

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 (32) hide show
  1. package/lib/browser/monaco-color-registry.d.ts +2 -1
  2. package/lib/browser/monaco-color-registry.d.ts.map +1 -1
  3. package/lib/browser/monaco-color-registry.js.map +1 -1
  4. package/lib/browser/monaco-frontend-application-contribution.d.ts +4 -1
  5. package/lib/browser/monaco-frontend-application-contribution.d.ts.map +1 -1
  6. package/lib/browser/monaco-frontend-application-contribution.js +14 -1
  7. package/lib/browser/monaco-frontend-application-contribution.js.map +1 -1
  8. package/lib/browser/monaco-frontend-module.d.ts.map +1 -1
  9. package/lib/browser/monaco-frontend-module.js +4 -1
  10. package/lib/browser/monaco-frontend-module.js.map +1 -1
  11. package/lib/browser/monaco-indexed-db.d.ts +3 -4
  12. package/lib/browser/monaco-indexed-db.d.ts.map +1 -1
  13. package/lib/browser/monaco-indexed-db.js +17 -13
  14. package/lib/browser/monaco-indexed-db.js.map +1 -1
  15. package/lib/browser/monaco-theming-service.d.ts +12 -6
  16. package/lib/browser/monaco-theming-service.d.ts.map +1 -1
  17. package/lib/browser/monaco-theming-service.js +27 -14
  18. package/lib/browser/monaco-theming-service.js.map +1 -1
  19. package/lib/browser/textmate/monaco-textmate-frontend-bindings.js +1 -1
  20. package/lib/browser/textmate/monaco-textmate-frontend-bindings.js.map +1 -1
  21. package/lib/browser/textmate/monaco-theme-registry.d.ts +4 -4
  22. package/lib/browser/textmate/monaco-theme-registry.d.ts.map +1 -1
  23. package/lib/browser/textmate/monaco-theme-registry.js +16 -12
  24. package/lib/browser/textmate/monaco-theme-registry.js.map +1 -1
  25. package/package.json +7 -7
  26. package/src/browser/monaco-color-registry.ts +2 -1
  27. package/src/browser/monaco-frontend-application-contribution.ts +9 -2
  28. package/src/browser/monaco-frontend-module.ts +5 -2
  29. package/src/browser/monaco-indexed-db.ts +10 -15
  30. package/src/browser/monaco-theming-service.ts +20 -16
  31. package/src/browser/textmate/monaco-textmate-frontend-bindings.ts +1 -1
  32. package/src/browser/textmate/monaco-theme-registry.ts +17 -13
@@ -1,4 +1,5 @@
1
- import { ColorRegistry, ColorDefinition, Color } from '@theia/core/lib/browser/color-registry';
1
+ import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
2
+ import { Color, ColorDefinition } from '@theia/core/lib/common/color';
2
3
  import { Disposable } from '@theia/core/lib/common/disposable';
3
4
  import { ColorValue } from '@theia/monaco-editor-core/esm/vs/platform/theme/common/colorRegistry';
4
5
  import { IStandaloneThemeService } from '@theia/monaco-editor-core/esm/vs/editor/standalone/common/standaloneTheme';
@@ -1 +1 @@
1
- {"version":3,"file":"monaco-color-registry.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-color-registry.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,wCAAwC,CAAC;AAC/F,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,EAAiB,UAAU,EAAoB,MAAM,sEAAsE,CAAC;AAEnI,OAAO,EAAE,uBAAuB,EAAE,MAAM,2EAA2E,CAAC;AAEpH,OAAO,KAAK,MAAM,MAAM,sEAAsE,CAAC;AAE/F,qBACa,mBAAoB,SAAQ,aAAa;IAElD,SAAS,CAAC,QAAQ,CAAC,kBAAkB,0BAAmD;IACxF,SAAS,CAAC,QAAQ,CAAC,mBAAmB,wBAAsB;IAElD,SAAS,IAAI,gBAAgB,CAAC,MAAM,CAAC;IAMtC,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;cAKrC,UAAU,CAAC,UAAU,EAAE,eAAe,GAAG,UAAU;IAUtE,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,SAAS,GAAG,UAAU,GAAG,IAAI;CAejE"}
1
+ {"version":3,"file":"monaco-color-registry.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-color-registry.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAE,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,EAAiB,UAAU,EAAoB,MAAM,sEAAsE,CAAC;AAEnI,OAAO,EAAE,uBAAuB,EAAE,MAAM,2EAA2E,CAAC;AAEpH,OAAO,KAAK,MAAM,MAAM,sEAAsE,CAAC;AAE/F,qBACa,mBAAoB,SAAQ,aAAa;IAElD,SAAS,CAAC,QAAQ,CAAC,kBAAkB,0BAAmD;IACxF,SAAS,CAAC,QAAQ,CAAC,mBAAmB,wBAAsB;IAElD,SAAS,IAAI,gBAAgB,CAAC,MAAM,CAAC;IAMtC,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;cAKrC,UAAU,CAAC,UAAU,EAAE,eAAe,GAAG,UAAU;IAUtE,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,SAAS,GAAG,UAAU,GAAG,IAAI;CAejE"}
@@ -1 +1 @@
1
- {"version":3,"file":"monaco-color-registry.js","sourceRoot":"","sources":["../../src/browser/monaco-color-registry.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,2EAA2E;AAC3E,gFAAgF;;;;;;;;;AAEhF,4DAA0D;AAC1D,2EAA+F;AAC/F,kEAA+D;AAC/D,wGAAmI;AACnI,sHAAmH;AACnH,+GAAoH;AACpH,8EAAsG;AACtG,+FAA+F;AAG/F,IAAa,mBAAmB,GAAhC,MAAa,mBAAoB,SAAQ,8BAAa;IAAtD;;QAEuB,uBAAkB,GAAG,uCAAkB,CAAC,GAAG,CAAC,yCAAuB,CAAC,CAAC;QACrE,wBAAmB,GAAG,IAAA,gCAAgB,GAAE,CAAC;IAsChE,CAAC;IApCY,CAAC,SAAS;QACf,KAAK,MAAM,EAAE,EAAE,EAAE,IAAI,IAAI,CAAC,mBAAmB,CAAC,SAAS,EAAE,EAAE;YACvD,MAAM,EAAE,CAAC;SACZ;IACL,CAAC;IAEQ,eAAe,CAAC,EAAU;QAC/B,MAAM,KAAK,GAAG,IAAI,CAAC,kBAAkB,CAAC,aAAa,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QACnE,OAAO,KAAK,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;IACrC,CAAC;IAEkB,UAAU,CAAC,UAA2B;;QACrD,MAAM,QAAQ,GAAkB;YAC5B,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,MAAA,UAAU,CAAC,QAAQ,0CAAE,IAAI,CAAC;YAC7C,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,MAAA,UAAU,CAAC,QAAQ,0CAAE,KAAK,CAAC;YAC/C,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,MAAA,UAAU,CAAC,QAAQ,0CAAE,EAAE,CAAC;SAC5C,CAAC;QACF,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,EAAE,QAAQ,EAAE,UAAU,CAAC,WAAW,CAAC,CAAC;QAC3G,OAAO,uBAAU,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC;IACzF,CAAC;IAES,OAAO,CAAC,KAAwB;QACtC,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YACrC,OAAO,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,CAAC,CAAC,sCAAsC;SAC/D;QACD,IAAI,MAAM,IAAI,KAAK,EAAE;YACjB,OAAO,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;SAC/C;aAAM,IAAI,GAAG,IAAI,KAAK,EAAE;YACrB,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,KAAK,CAAC;YAC7B,OAAO,IAAI,aAAW,CAAC,IAAI,YAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;SAChD;aAAM;YACH,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,KAAK,CAAC;YAC7B,OAAO,IAAI,aAAW,CAAC,IAAI,YAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;SAChD;IACL,CAAC;CAEJ,CAAA;AAzCY,mBAAmB;IAD/B,IAAA,sBAAU,GAAE;GACA,mBAAmB,CAyC/B;AAzCY,kDAAmB"}
1
+ {"version":3,"file":"monaco-color-registry.js","sourceRoot":"","sources":["../../src/browser/monaco-color-registry.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,2EAA2E;AAC3E,gFAAgF;;;;;;;;;AAEhF,4DAA0D;AAC1D,2EAAuE;AAEvE,kEAA+D;AAC/D,wGAAmI;AACnI,sHAAmH;AACnH,+GAAoH;AACpH,8EAAsG;AACtG,+FAA+F;AAG/F,IAAa,mBAAmB,GAAhC,MAAa,mBAAoB,SAAQ,8BAAa;IAAtD;;QAEuB,uBAAkB,GAAG,uCAAkB,CAAC,GAAG,CAAC,yCAAuB,CAAC,CAAC;QACrE,wBAAmB,GAAG,IAAA,gCAAgB,GAAE,CAAC;IAsChE,CAAC;IApCY,CAAC,SAAS;QACf,KAAK,MAAM,EAAE,EAAE,EAAE,IAAI,IAAI,CAAC,mBAAmB,CAAC,SAAS,EAAE,EAAE;YACvD,MAAM,EAAE,CAAC;SACZ;IACL,CAAC;IAEQ,eAAe,CAAC,EAAU;QAC/B,MAAM,KAAK,GAAG,IAAI,CAAC,kBAAkB,CAAC,aAAa,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QACnE,OAAO,KAAK,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;IACrC,CAAC;IAEkB,UAAU,CAAC,UAA2B;;QACrD,MAAM,QAAQ,GAAkB;YAC5B,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,MAAA,UAAU,CAAC,QAAQ,0CAAE,IAAI,CAAC;YAC7C,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,MAAA,UAAU,CAAC,QAAQ,0CAAE,KAAK,CAAC;YAC/C,EAAE,EAAE,IAAI,CAAC,OAAO,CAAC,MAAA,UAAU,CAAC,QAAQ,0CAAE,EAAE,CAAC;SAC5C,CAAC;QACF,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE,EAAE,QAAQ,EAAE,UAAU,CAAC,WAAW,CAAC,CAAC;QAC3G,OAAO,uBAAU,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC;IACzF,CAAC;IAES,OAAO,CAAC,KAAwB;QACtC,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YACrC,OAAO,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,IAAI,CAAC,CAAC,sCAAsC;SAC/D;QACD,IAAI,MAAM,IAAI,KAAK,EAAE;YACjB,OAAO,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;SAC/C;aAAM,IAAI,GAAG,IAAI,KAAK,EAAE;YACrB,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,KAAK,CAAC;YAC7B,OAAO,IAAI,aAAW,CAAC,IAAI,YAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;SAChD;aAAM;YACH,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,GAAG,KAAK,CAAC;YAC7B,OAAO,IAAI,aAAW,CAAC,IAAI,YAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;SAChD;IACL,CAAC;CAEJ,CAAA;AAzCY,mBAAmB;IAD/B,IAAA,sBAAU,GAAE;GACA,mBAAmB,CAyC/B;AAzCY,kDAAmB"}
@@ -4,6 +4,7 @@ import { MonacoEditorService } from './monaco-editor-service';
4
4
  import { MonacoTextModelService } from './monaco-text-model-service';
5
5
  import { ContextKeyService as VSCodeContextKeyService } from '@theia/monaco-editor-core/esm/vs/platform/contextkey/browser/contextKeyService';
6
6
  import { MonacoContextMenuService } from './monaco-context-menu';
7
+ import { MonacoThemingService } from './monaco-theming-service';
7
8
  export declare class MonacoFrontendApplicationContribution implements FrontendApplicationContribution {
8
9
  protected readonly codeEditorService: MonacoEditorService;
9
10
  protected readonly textModelService: MonacoTextModelService;
@@ -12,6 +13,8 @@ export declare class MonacoFrontendApplicationContribution implements FrontendAp
12
13
  protected readonly preferenceSchema: PreferenceSchemaProvider;
13
14
  protected readonly quickAccessRegistry: QuickAccessRegistry;
14
15
  protected readonly contextMenuService: MonacoContextMenuService;
15
- initialize(): Promise<void>;
16
+ protected readonly monacoThemingService: MonacoThemingService;
17
+ protected init(): void;
18
+ initialize(): void;
16
19
  }
17
20
  //# sourceMappingURL=monaco-frontend-application-contribution.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"monaco-frontend-application-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-frontend-application-contribution.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,+BAA+B,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACzH,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AAIjF,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,iBAAiB,IAAI,uBAAuB,EAAE,MAAM,gFAAgF,CAAC;AAM9I,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAEjE,qBACa,qCAAsC,YAAW,+BAA+B;IAGzF,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,mBAAmB,CAAC;IAG1D,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,sBAAsB,CAAC;IAG5D,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,uBAAuB,CAAC;IAG9D,SAAS,CAAC,QAAQ,CAAC,sBAAsB,EAAE,4BAA4B,CAAC;IAGxE,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,wBAAwB,CAAC;IAG9D,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IAG5D,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,wBAAwB,CAAC;IAE1D,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;CAyBpC"}
1
+ {"version":3,"file":"monaco-frontend-application-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-frontend-application-contribution.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,+BAA+B,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACzH,OAAO,EAAE,4BAA4B,EAAE,MAAM,mCAAmC,CAAC;AAIjF,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,iBAAiB,IAAI,uBAAuB,EAAE,MAAM,gFAAgF,CAAC;AAM9I,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEhE,qBACa,qCAAsC,YAAW,+BAA+B;IAGzF,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,mBAAmB,CAAC;IAG1D,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,sBAAsB,CAAC;IAG5D,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,uBAAuB,CAAC;IAG9D,SAAS,CAAC,QAAQ,CAAC,sBAAsB,EAAE,4BAA4B,CAAC;IAGxE,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,wBAAwB,CAAC;IAG9D,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IAG5D,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,wBAAwB,CAAC;IAElC,SAAS,CAAC,QAAQ,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IAG5F,SAAS,CAAC,IAAI,IAAI,IAAI;IA2BtB,UAAU,IAAI,IAAI;CACrB"}
@@ -39,8 +39,9 @@ const resolverService_1 = require("@theia/monaco-editor-core/esm/vs/editor/commo
39
39
  const contextkey_1 = require("@theia/monaco-editor-core/esm/vs/platform/contextkey/common/contextkey");
40
40
  const contextView_1 = require("@theia/monaco-editor-core/esm/vs/platform/contextview/browser/contextView");
41
41
  const monaco_context_menu_1 = require("./monaco-context-menu");
42
+ const monaco_theming_service_1 = require("./monaco-theming-service");
42
43
  let MonacoFrontendApplicationContribution = class MonacoFrontendApplicationContribution {
43
- async initialize() {
44
+ init() {
44
45
  const { codeEditorService, textModelService, contextKeyService, contextMenuService } = this;
45
46
  standaloneServices_1.StandaloneServices.initialize({
46
47
  [codeEditorService_1.ICodeEditorService.toString()]: codeEditorService,
@@ -61,7 +62,9 @@ let MonacoFrontendApplicationContribution = class MonacoFrontendApplicationContr
61
62
  this.preferenceSchema.registerOverrideIdentifier(language.id);
62
63
  registerLanguage(language);
63
64
  };
65
+ this.monacoThemingService.initialize();
64
66
  }
67
+ initialize() { }
65
68
  };
66
69
  __decorate([
67
70
  (0, inversify_1.inject)(monaco_editor_service_1.MonacoEditorService),
@@ -91,6 +94,16 @@ __decorate([
91
94
  (0, inversify_1.inject)(monaco_context_menu_1.MonacoContextMenuService),
92
95
  __metadata("design:type", monaco_context_menu_1.MonacoContextMenuService)
93
96
  ], MonacoFrontendApplicationContribution.prototype, "contextMenuService", void 0);
97
+ __decorate([
98
+ (0, inversify_1.inject)(monaco_theming_service_1.MonacoThemingService),
99
+ __metadata("design:type", monaco_theming_service_1.MonacoThemingService)
100
+ ], MonacoFrontendApplicationContribution.prototype, "monacoThemingService", void 0);
101
+ __decorate([
102
+ (0, inversify_1.postConstruct)(),
103
+ __metadata("design:type", Function),
104
+ __metadata("design:paramtypes", []),
105
+ __metadata("design:returntype", void 0)
106
+ ], MonacoFrontendApplicationContribution.prototype, "init", null);
94
107
  MonacoFrontendApplicationContribution = __decorate([
95
108
  (0, inversify_1.injectable)()
96
109
  ], MonacoFrontendApplicationContribution);
@@ -1 +1 @@
1
- {"version":3,"file":"monaco-frontend-application-contribution.js","sourceRoot":"","sources":["../../src/browser/monaco-frontend-application-contribution.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,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;AAEhF,4DAAkE;AAClE,qDAAyH;AACzH,uFAAiF;AACjF,oDAAoD;AACpD,qGAAmH;AAEnH,mEAA8D;AAC9D,2EAAqE;AACrE,sHAA8I;AAC9I,sHAAmH;AACnH,kHAAgH;AAChH,6GAA4G;AAC5G,uGAA4G;AAC5G,2GAAgH;AAChH,+DAAiE;AAGjE,IAAa,qCAAqC,GAAlD,MAAa,qCAAqC;IAuB9C,KAAK,CAAC,UAAU;QACZ,MAAM,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,GAAG,IAAI,CAAC;QAC5F,uCAAkB,CAAC,UAAU,CAAC;YAC1B,CAAC,sCAAkB,CAAC,QAAQ,EAAE,CAAC,EAAE,iBAAiB;YAClD,CAAC,mCAAiB,CAAC,QAAQ,EAAE,CAAC,EAAE,gBAAgB;YAChD,CAAC,+BAAkB,CAAC,QAAQ,EAAE,CAAC,EAAE,iBAAiB;YAClD,CAAC,iCAAmB,CAAC,QAAQ,EAAE,CAAC,EAAE,kBAAkB;SACvD,CAAC,CAAC;QACH,wHAAwH;QACxH,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,CAAC;QAEjC,iEAAiE;QACjE,IAAA,kCAAwB,EAAC,IAAI,CAAC,sBAA2D,CAAC,CAAC;QAE3F,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,SAAS,CAAC,YAAY,EAAE,EAAE;YACpD,IAAI,CAAC,gBAAgB,CAAC,0BAA0B,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;SACjE;QACD,MAAM,gBAAgB,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAC1E,MAAM,CAAC,SAAS,CAAC,QAAQ,GAAG,QAAQ,CAAC,EAAE;YACnC,gJAAgJ;YAChJ,IAAI,CAAC,gBAAgB,CAAC,0BAA0B,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YAC9D,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QAC/B,CAAC,CAAC;IACN,CAAC;CAEJ,CAAA;AA7CG;IADC,IAAA,kBAAM,EAAC,2CAAmB,CAAC;8BACU,2CAAmB;gFAAC;AAG1D;IADC,IAAA,kBAAM,EAAC,kDAAsB,CAAC;8BACM,kDAAsB;+EAAC;AAG5D;IADC,IAAA,kBAAM,EAAC,qCAAuB,CAAC;8BACM,qCAAuB;gFAAC;AAG9D;IADC,IAAA,kBAAM,EAAC,8DAA4B,CAAC;8BACM,8DAA4B;qFAAC;AAGxE;IADC,IAAA,kBAAM,EAAC,kCAAwB,CAAC;8BACI,kCAAwB;+EAAC;AAG9D;IADC,IAAA,kBAAM,EAAC,6BAAmB,CAAC;;kFACgC;AAG5D;IADC,IAAA,kBAAM,EAAC,8CAAwB,CAAC;8BACM,8CAAwB;iFAAC;AArBvD,qCAAqC;IADjD,IAAA,sBAAU,GAAE;GACA,qCAAqC,CAgDjD;AAhDY,sFAAqC"}
1
+ {"version":3,"file":"monaco-frontend-application-contribution.js","sourceRoot":"","sources":["../../src/browser/monaco-frontend-application-contribution.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,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;AAEhF,4DAAiF;AACjF,qDAAyH;AACzH,uFAAiF;AACjF,oDAAoD;AACpD,qGAAmH;AAEnH,mEAA8D;AAC9D,2EAAqE;AACrE,sHAA8I;AAC9I,sHAAmH;AACnH,kHAAgH;AAChH,6GAA4G;AAC5G,uGAA4G;AAC5G,2GAAgH;AAChH,+DAAiE;AACjE,qEAAgE;AAGhE,IAAa,qCAAqC,GAAlD,MAAa,qCAAqC;IA0BpC,IAAI;QACV,MAAM,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,GAAG,IAAI,CAAC;QAC5F,uCAAkB,CAAC,UAAU,CAAC;YAC1B,CAAC,sCAAkB,CAAC,QAAQ,EAAE,CAAC,EAAE,iBAAiB;YAClD,CAAC,mCAAiB,CAAC,QAAQ,EAAE,CAAC,EAAE,gBAAgB;YAChD,CAAC,+BAAkB,CAAC,QAAQ,EAAE,CAAC,EAAE,iBAAiB;YAClD,CAAC,iCAAmB,CAAC,QAAQ,EAAE,CAAC,EAAE,kBAAkB;SACvD,CAAC,CAAC;QACH,wHAAwH;QACxH,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,CAAC;QAEjC,iEAAiE;QACjE,IAAA,kCAAwB,EAAC,IAAI,CAAC,sBAA2D,CAAC,CAAC;QAE3F,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,SAAS,CAAC,YAAY,EAAE,EAAE;YACpD,IAAI,CAAC,gBAAgB,CAAC,0BAA0B,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;SACjE;QACD,MAAM,gBAAgB,GAAG,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAC1E,MAAM,CAAC,SAAS,CAAC,QAAQ,GAAG,QAAQ,CAAC,EAAE;YACnC,gJAAgJ;YAChJ,IAAI,CAAC,gBAAgB,CAAC,0BAA0B,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YAC9D,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QAC/B,CAAC,CAAC;QAEF,IAAI,CAAC,oBAAoB,CAAC,UAAU,EAAE,CAAC;IAC3C,CAAC;IAED,UAAU,KAAW,CAAC;CACzB,CAAA;AAnDG;IADC,IAAA,kBAAM,EAAC,2CAAmB,CAAC;8BACU,2CAAmB;gFAAC;AAG1D;IADC,IAAA,kBAAM,EAAC,kDAAsB,CAAC;8BACM,kDAAsB;+EAAC;AAG5D;IADC,IAAA,kBAAM,EAAC,qCAAuB,CAAC;8BACM,qCAAuB;gFAAC;AAG9D;IADC,IAAA,kBAAM,EAAC,8DAA4B,CAAC;8BACM,8DAA4B;qFAAC;AAGxE;IADC,IAAA,kBAAM,EAAC,kCAAwB,CAAC;8BACI,kCAAwB;+EAAC;AAG9D;IADC,IAAA,kBAAM,EAAC,6BAAmB,CAAC;;kFACgC;AAG5D;IADC,IAAA,kBAAM,EAAC,8CAAwB,CAAC;8BACM,8CAAwB;iFAAC;AAElC;IAA7B,IAAA,kBAAM,EAAC,6CAAoB,CAAC;8BAA0C,6CAAoB;mFAAC;AAG5F;IADC,IAAA,yBAAa,GAAE;;;;iEA0Bf;AAnDQ,qCAAqC;IADjD,IAAA,sBAAU,GAAE;GACA,qCAAqC,CAsDjD;AAtDY,sFAAqC"}
@@ -1 +1 @@
1
- {"version":3,"file":"monaco-frontend-module.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-frontend-module.ts"],"names":[],"mappings":"AAgCA,OAAO,mCAAmC,CAAC;AAC3C,OAAO,2CAA2C,CAAC;AACnD,OAAO,0CAA0C,CAAC;AAClD,OAAO,EAAE,eAAe,EAAwB,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAkDjG,OAAO,EAAkD,qBAAqB,EAAE,MAAM,8EAA8E,CAAC;;AAUrK,wBA0FG;AAEH,eAAO,MAAM,0BAA0B,eAAuC,CAAC;AAC/E,wBAAgB,gCAAgC,CAAC,SAAS,EAAE,UAAU,CAAC,SAAS,GAAG,qBAAqB,CA0HvG"}
1
+ {"version":3,"file":"monaco-frontend-module.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-frontend-module.ts"],"names":[],"mappings":"AAgCA,OAAO,mCAAmC,CAAC;AAC3C,OAAO,2CAA2C,CAAC;AACnD,OAAO,0CAA0C,CAAC;AAClD,OAAO,EAAE,eAAe,EAAwB,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAkDjG,OAAO,EAAkD,qBAAqB,EAAE,MAAM,8EAA8E,CAAC;;AAUrK,wBA6FG;AAEH,eAAO,MAAM,0BAA0B,eAAuC,CAAC;AAC/E,wBAAgB,gCAAgC,CAAC,SAAS,EAAE,UAAU,CAAC,SAAS,GAAG,qBAAqB,CA0HvG"}
@@ -83,8 +83,9 @@ const configuration_1 = require("@theia/monaco-editor-core/esm/vs/platform/confi
83
83
  const standaloneServices_1 = require("@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices");
84
84
  const markdown_renderer_1 = require("@theia/core/lib/browser/markdown-rendering/markdown-renderer");
85
85
  const monaco_markdown_renderer_1 = require("./markdown-renderer/monaco-markdown-renderer");
86
+ const theming_1 = require("@theia/core/lib/browser/theming");
87
+ const monaco_indexed_db_1 = require("./monaco-indexed-db");
86
88
  (0, inversify_1.decorate)((0, inversify_1.injectable)(), contextKeyService_1.ContextKeyService);
87
- monaco_theming_service_1.MonacoThemingService.init();
88
89
  exports.default = new inversify_1.ContainerModule((bind, unbind, isBound, rebind) => {
89
90
  bind(monaco_theming_service_1.MonacoThemingService).toSelf().inSingletonScope();
90
91
  bind(monaco_context_key_service_1.MonacoContextKeyService).toSelf().inSingletonScope();
@@ -145,6 +146,8 @@ exports.default = new inversify_1.ContainerModule((bind, unbind, isBound, rebind
145
146
  rebind(mime_service_1.MimeService).toService(monaco_mime_service_1.MonacoMimeService);
146
147
  bind(monaco_color_registry_1.MonacoColorRegistry).toSelf().inSingletonScope();
147
148
  rebind(color_registry_1.ColorRegistry).toService(monaco_color_registry_1.MonacoColorRegistry);
149
+ bind(monaco_indexed_db_1.ThemeServiceWithDB).toSelf().inSingletonScope();
150
+ rebind(theming_1.ThemeService).toService(monaco_indexed_db_1.ThemeServiceWithDB);
148
151
  });
149
152
  exports.MonacoConfigurationService = Symbol('MonacoConfigurationService');
150
153
  function createMonacoConfigurationService(container) {
@@ -1 +1 @@
1
- {"version":3,"file":"monaco-frontend-module.js","sourceRoot":"","sources":["../../src/browser/monaco-frontend-module.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"monaco-frontend-module.js","sourceRoot":"","sources":["../../src/browser/monaco-frontend-module.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,2EAA2E;AAC3E,gFAAgF;;;AAEhF,kEAAkE;AAClE,oDAAiD;AACjD,2EAAoF;AAEpF,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE;IACrB,QAAQ,CAAC,IAAY,EAAE,KAAa,EAAE,GAAG,IAAkB;QACvD,IAAI,SAAG,CAAC,MAAM,EAAE;YACZ,MAAM,UAAU,GAAG,SAAG,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YAC5C,IAAI,UAAU,EAAE;gBACZ,OAAO,SAAG,CAAC,QAAQ,CAAC,UAAU,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,CAAC;aACnD;SACJ;QACD,OAAO,2BAAY,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IAC5C,CAAC;CACJ,CAAC,CAAC;AAEH,6CAA2C;AAC3C,qDAAmD;AACnD,oDAAkD;AAClD,4DAAiG;AACjG,mDAA+E;AAC/E,qDAIiC;AACjC,uDAAsF;AACtF,qGAAoG;AACpG,qEAAqF;AACrF,+CAA6D;AAC7D,qDAA+D;AAC/D,2DAAmE;AACnE,yDAAqD;AACrD,yDAAqD;AACrD,mEAA8D;AAC9D,2EAA+F;AAC/F,+DAAiE;AACjE,+EAA0E;AAC1E,qFAA+E;AAC/E,qEAA6F;AAC7F,uEAAkE;AAClE,mFAA6E;AAC7E,6EAAkF;AAClF,yGAAmG;AACnG,oGAAsF;AACtF,yEAAmE;AACnE,yEAAoE;AACpE,yGAAiG;AACjG,uFAAiF;AACjF,qFAAgF;AAChF,6EAAuE;AACvE,+DAA0D;AAC1D,uEAAmE;AACnE,mDAAuD;AACvD,mEAA8D;AAC9D,2EAAuE;AACvE,qEAAgE;AAChE,sCAAuD;AACvD,yEAAoE;AACpE,+EAA2E;AAC3E,iFAA2E;AAC3E,iFAA2E;AAC3E,+EAAsF;AACtF,6EAAuG;AACvG,iFAAiF;AACjF,qFAAqF;AACrF,mFAAgH;AAChH,iFAA2E;AAC3E,sHAA8I;AAC9I,gHAAqK;AACrK,sHAAmJ;AAEnJ,oGAAgG;AAChG,2FAAsF;AACtF,6DAA+D;AAC/D,2DAAyD;AAEzD,IAAA,oBAAQ,EAAC,IAAA,sBAAU,GAAE,EAAE,qCAAuB,CAAC,CAAC;AAEhD,kBAAe,IAAI,2BAAe,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;IACjE,IAAI,CAAC,6CAAoB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAEvD,IAAI,CAAC,oDAAuB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC1D,MAAM,CAAC,uCAAiB,CAAC,CAAC,SAAS,CAAC,oDAAuB,CAAC,CAAC;IAE7D,IAAI,CAAC,8DAA4B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC/D,IAAI,CAAC,yCAA+B,CAAC,CAAC,EAAE,CAAC,gFAAqC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAEnG,IAAI,CAAC,wDAAyB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC5D,IAAI,CAAC,wDAAyB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAE5D,IAAI,CAAC,kCAAe,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAClD,MAAM,CAAC,kCAAe,CAAC,CAAC,SAAS,CAAC,kCAAe,CAAC,CAAC;IACnD,IAAI,CAAC,iDAAsB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACzD,KAAK,MAAM,UAAU,IAAI,CAAC,4BAAmB,EAAE,gCAAsB,EAAE,yBAAgB,EAAE,sCAAuB,CAAC,EAAE;QAC/G,IAAI,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,iDAAsB,CAAC,CAAC;KACtD;IAED,IAAI,CAAC,kCAAe,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAElD,IAAI,CAAC,kCAA0B,CAAC,CAAC,cAAc,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAC9D,gCAAgC,CAAC,SAAS,CAAC,CAC9C,CAAC,gBAAgB,EAAE,CAAC;IACrB,IAAI,CAAC,qCAAuB,CAAC,CAAC,cAAc,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAC3D,IAAI,qCAAuB,CAAC,SAAS,CAAC,GAAG,CAAC,kCAA0B,CAAC,CAAC,CACzE,CAAC,gBAAgB,EAAE,CAAC;IAErB,IAAI,CAAC,gDAAqB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACxD,IAAI,CAAC,2CAAmB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACtD,IAAI,CAAC,kDAAsB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACzD,IAAI,CAAC,8CAAwB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC3D,IAAI,CAAC,oCAAoB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACvD,IAAI,CAAC,6CAAoB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACvD,IAAA,+BAAwB,EAAC,IAAI,EAAE,4CAAmB,CAAC,CAAC;IACpD,IAAA,+BAAwB,EAAC,IAAI,EAAE,oDAAwB,CAAC,CAAC;IACzD,IAAI,CAAC,6CAAoB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACvD,IAAI,CAAC,oDAA2B,CAAC,CAAC,aAAa,CAAC,6CAAoB,CAAC,CAAC;IAEtE,IAAI,CAAC,4BAAkB,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAC1C,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,6CAAoB,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAC9D,CAAC;IAEF,IAAI,CAAC,0DAA0B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC7D,IAAI,CAAC,+BAAqB,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAC5C,MAAM,CAAC,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,6CAAoB,CAAC,CAAC,gBAAgB,CAAC,MAAM,CAAC,CACjF,CAAC;IAEF,IAAI,CAAC,uDAAyB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC5D,IAAI,CAAC,yCAA+B,CAAC,CAAC,SAAS,CAAC,uDAAyB,CAAC,CAAC;IAE3E,MAAM,CAAC,oCAAgB,CAAC,CAAC,EAAE,CAAC,iDAAsB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAEvE,IAAI,CAAC,mEAAqC,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACxE,IAAI,CAAC,yCAA+B,CAAC,CAAC,SAAS,CAAC,mEAAqC,CAAC,CAAC;IAEvF,IAAI,CAAC,4DAA2B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC9D,IAAI,CAAC,yCAA+B,CAAC,CAAC,SAAS,CAAC,4DAA2B,CAAC,CAAC;IAE7E,IAAI,CAAC,+CAAqB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACxD,IAAI,CAAC,4BAAmB,CAAC,CAAC,EAAE,CAAC,4CAA2B,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC7E,IAAI,CAAC,0CAA4B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC/D,IAAI,CAAC,yBAAgB,CAAC,CAAC,SAAS,CAAC,0CAA4B,CAAC,CAAC;IAC/D,IAAI,CAAC,gDAA4B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC/D,IAAI,CAAC,gCAAsB,CAAC,CAAC,SAAS,CAAC,gDAA4B,CAAC,CAAC;IACrE,MAAM,CAAC,yDAA4B,CAAC,CAAC,EAAE,CAAC,+DAAkC,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAE/F,IAAI,CAAC,2DAA8B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACjE,IAAI,CAAC,oDAAuB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC1D,IAAI,CAAC,2BAAiB,CAAC,CAAC,SAAS,CAAC,oDAAuB,CAAC,CAAC;IAE3D,IAAI,CAAC,wDAAyB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC5D,IAAI,CAAC,kCAAmB,CAAC,CAAC,SAAS,CAAC,wDAAyB,CAAC,CAAC;IAE/D,IAAI,CAAC,8DAA+B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAClE,IAAI,CAAC,sCAAuB,CAAC,CAAC,SAAS,CAAC,8DAA+B,CAAC,CAAC;IAEzE,IAAI,CAAC,kEAAiC,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACpE,IAAI,CAAC,sCAAuB,CAAC,CAAC,SAAS,CAAC,kEAAiC,CAAC,CAAC;IAE3E,IAAA,2CAA0B,EAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IAE1D,IAAI,CAAC,iDAAsB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACzD,IAAI,CAAC,gDAAoB,CAAC,CAAC,SAAS,CAAC,iDAAsB,CAAC,CAAC;IAE7D,IAAI,CAAC,uCAAiB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACpD,MAAM,CAAC,0BAAW,CAAC,CAAC,SAAS,CAAC,uCAAiB,CAAC,CAAC;IAEjD,IAAI,CAAC,2CAAmB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACtD,MAAM,CAAC,8BAAa,CAAC,CAAC,SAAS,CAAC,2CAAmB,CAAC,CAAC;IAErD,IAAI,CAAC,sCAAkB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACrD,MAAM,CAAC,sBAAY,CAAC,CAAC,SAAS,CAAC,sCAAkB,CAAC,CAAC;AACvD,CAAC,CAAC,CAAC;AAEU,QAAA,0BAA0B,GAAG,MAAM,CAAC,4BAA4B,CAAC,CAAC;AAC/E,SAAgB,gCAAgC,CAAC,SAA+B;IAC5E,MAAM,WAAW,GAAG,SAAS,CAAC,GAAG,CAAoB,2BAAiB,CAAC,CAAC;IACxE,MAAM,wBAAwB,GAAG,SAAS,CAAC,GAAG,CAA2B,kCAAwB,CAAC,CAAC;IACnG,MAAM,OAAO,GAAG,uCAAkB,CAAC,GAAG,CAAC,qCAAqB,CAAmC,CAAC;IAChG,MAAM,cAAc,GAAkB,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAEhE,cAAc,CAAC,QAAQ,GAAG,CAAC,OAAO,EAAE,SAAS,EAAE,EAAE;QAC7C,MAAM,kBAAkB,GAAuB,CAAC,SAAS,IAAI,oBAAoB,IAAI,SAAS,IAAI,OAAO,SAAS,CAAC,kBAAkB,KAAK,QAAQ,CAAC;YAC/I,CAAC,CAAC,SAAS,CAAC,oBAAoB,CAAC;YACjC,CAAC,CAAC,SAAS,CAAC;QAChB,MAAM,WAAW,GAAuB,CAAC,SAAS,IAAI,UAAU,IAAI,SAAS,IAAI,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;QACzJ,8DAA8D;QAC9D,MAAM,KAAK,GAAG,IAAA,+BAAqB,EAAyB,WAAW,EAAE,wBAAwB,CAAC,iBAAiB,EAAE,EAAE;YACnH,WAAW,EAAE,kBAAkB,EAAE,KAAK,EAAE,MAAM;SACjD,CAAC,CAAC;QACH,IAAI,OAAO,EAAE;YACT,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC;SACzB;QACD,OAAO,KAAK,CAAC;IACjB,CAAC,CAAC;IAEF,MAAM,QAAQ,GAAG,CAAC,KAAsB,EAAuB,EAAE;QAC7D,QAAQ,KAAK,EAAE;YACX,KAAK,yBAAe,CAAC,OAAO,CAAC,CAAC,uBAAmC;YACjE,KAAK,yBAAe,CAAC,IAAI,CAAC,CAAC,oBAAgC;YAC3D,KAAK,yBAAe,CAAC,SAAS,CAAC,CAAC,yBAAqC;YACrE,KAAK,yBAAe,CAAC,MAAM,CAAC,CAAC,gCAA4C;SAC5E;IACL,CAAC,CAAC;IAQF,MAAM,oCAAoC,GAAG,GAAsC,EAAE,CAAC,CAAC;QACnF,OAAO,EAAE,EAAE;QACX,YAAY,EAAE,IAAI,GAAG,EAAU;QAC/B,IAAI,EAAE,IAAI,GAAG,EAAU;QACvB,SAAS,EAAE,IAAI,GAAG,EAAuB;KAC5C,CAAC,CAAC;IACH,MAAM,0BAA0B,GAAG,CAAC,MAA2B,EAAE,OAA0C,EAAQ,EAAE;QACjH,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE;YAC5B,OAAO;SACV;QACD,MAAM,SAAS,GAAyB,EAAE,CAAC;QAC3C,KAAK,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,OAAO,CAAC,SAAS,EAAE;YAChD,SAAS,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;SAC3C;QACD,OAAO,CAAC,2BAA2B,CAAC,CAAC,IAAI,CAA4B;YACjE,MAAM,EAAE;gBACJ,IAAI,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;gBACvB,SAAS;aACZ;YACD,YAAY,EAAE,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC;YACvC,MAAM;YACN,oBAAoB,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE;;gBACtC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;oBACnC,OAAO,KAAK,CAAC;iBAChB;gBACD,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,OAAO,EAAE;oBAClC,MAAM,UAAU,GAAG,WAAW,CAAC,wBAAwB,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;oBAC/E,MAAM,cAAc,GAAG,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC;oBACtF,IAAI,cAAc,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;wBACnC,IAAI,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,kBAAkB,MAAK,SAAS,EAAE;4BAC3C,IAAI,UAAU,IAAI,UAAU,CAAC,kBAAkB,MAAK,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,kBAAkB,CAAA,EAAE;gCAC7E,SAAS;6BACZ;yBACJ;wBACD,IAAI,MAAM,CAAC,OAAO,CAAC,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,0CAAE,QAAQ,EAAE,CAAC,EAAE;4BAC/C,OAAO,IAAI,CAAC;yBACf;qBACJ;iBACJ;gBACD,OAAO,KAAK,CAAC;YACjB,CAAC;SACJ,CAAC,CAAC;IACP,CAAC,CAAC;IAEF,WAAW,CAAC,oBAAoB,CAAC,KAAK,CAAC,EAAE;;QACrC,IAAI,MAAuC,CAAC;QAC5C,IAAI,OAAO,GAAG,oCAAoC,EAAE,CAAC;QACrD,KAAK,IAAI,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;YAChC,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;YAC1B,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACtC,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,MAAM,EAAE;gBAC3C,0BAA0B,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;gBAC5C,OAAO,GAAG,oCAAoC,EAAE,CAAC;aACpD;YACD,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAC7B,MAAM,GAAG,MAAM,CAAC;YAEhB,IAAI,YAAqC,CAAC;YAC1C,IAAI,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;gBACrB,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;gBAC/B,MAAM,QAAQ,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;gBACzC,MAAM,kBAAkB,GAAG,MAAA,QAAQ,CAAC,KAAK,CAAC,mCAAyB,CAAC,0CAAG,CAAC,CAAC,CAAC;gBAC1E,IAAI,kBAAkB,EAAE;oBACpB,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;oBAC3B,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;oBACnC,YAAY,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,kBAAkB,CAAC,IAAI,IAAI,GAAG,EAAU,CAAC;oBAC9E,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,kBAAkB,EAAE,YAAY,CAAC,CAAC;oBACxD,GAAG,GAAG,GAAG,CAAC,SAAS,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;iBAClC;aACJ;YACD,OAAO,GAAG,EAAE;gBACR,IAAI,YAAY,EAAE;oBACd,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;iBACzB;gBACD,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBACtB,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBAC9B,MAAM,KAAK,GAAG,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;gBACnC,GAAG,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;aACjC;SACJ;QACD,IAAI,MAAM,EAAE;YACR,0BAA0B,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;SAC/C;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC;AACnB,CAAC;AA1HD,4EA0HC"}
@@ -1,8 +1,9 @@
1
1
  import * as idb from 'idb';
2
2
  import { Disposable } from '@theia/core/lib/common/disposable';
3
- import { Theme, ThemeService } from '@theia/core/lib/browser/theming';
3
+ import { ThemeService } from '@theia/core/lib/browser/theming';
4
4
  import * as monaco from '@theia/monaco-editor-core';
5
- declare type ThemeMix = import('./textmate/monaco-theme-registry').ThemeMix;
5
+ import type { ThemeMix } from './textmate/monaco-theme-registry';
6
+ import { Theme } from '@theia/core/lib/common/theme';
6
7
  export declare const monacoDB: Promise<idb.IDBPDatabase<unknown>> | undefined;
7
8
  export interface MonacoThemeState {
8
9
  id: string;
@@ -19,9 +20,7 @@ export declare function putTheme(state: MonacoThemeState): Disposable;
19
20
  export declare function deleteTheme(id: string): Promise<void>;
20
21
  export declare function stateToTheme(state: MonacoThemeState): Theme;
21
22
  export declare class ThemeServiceWithDB extends ThemeService {
22
- static get(): ThemeService;
23
23
  loadUserTheme(): void;
24
24
  protected loadUserThemeWithDB(): Promise<void>;
25
25
  }
26
- export {};
27
26
  //# sourceMappingURL=monaco-indexed-db.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"monaco-indexed-db.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-indexed-db.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,EAAE,UAAU,EAAwB,MAAM,mCAAmC,CAAC;AACrF,OAAO,EAAwB,KAAK,EAAE,YAAY,EAAsB,MAAM,iCAAiC,CAAC;AAChH,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AACpD,aAAK,QAAQ,GAAG,OAAO,kCAAkC,EAAE,QAAQ,CAAC;AAapE,eAAO,MAAM,QAAQ,gDAAY,CAAC;AAElC,MAAM,WAAW,gBAAgB;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAA;IACnC,IAAI,EAAE,QAAQ,CAAA;CACjB;AACD,yBAAiB,gBAAgB,CAAC;IAC9B,SAAgB,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,KAAK,IAAI,gBAAgB,CAEvE;CACJ;AAED,wBAAsB,SAAS,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAO7D;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,gBAAgB,GAAG,UAAU,CAI5D;AAkBD,wBAAsB,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAM3D;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,gBAAgB,GAAG,KAAK,CAiB3D;AAOD,qBAAa,kBAAmB,SAAQ,YAAY;WAChC,GAAG,IAAI,YAAY;IAW1B,aAAa,IAAI,IAAI;cAId,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;CAKvD"}
1
+ {"version":3,"file":"monaco-indexed-db.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-indexed-db.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAC3B,OAAO,EAAE,UAAU,EAAwB,MAAM,mCAAmC,CAAC;AACrF,OAAO,EAAwB,YAAY,EAAE,MAAM,iCAAiC,CAAC;AACrF,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AAEpD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AAarD,eAAO,MAAM,QAAQ,gDAAY,CAAC;AAElC,MAAM,WAAW,gBAAgB;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAA;IACnC,IAAI,EAAE,QAAQ,CAAA;CACjB;AACD,yBAAiB,gBAAgB,CAAC;IAC9B,SAAgB,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,KAAK,IAAI,gBAAgB,CAEvE;CACJ;AAED,wBAAsB,SAAS,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAO7D;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,gBAAgB,GAAG,UAAU,CAI5D;AAkBD,wBAAsB,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAM3D;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,gBAAgB,GAAG,KAAK,CAiB3D;AAOD,qBACa,kBAAmB,SAAQ,YAAY;IACvC,aAAa,IAAI,IAAI;cAId,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;CAUvD"}
@@ -14,11 +14,18 @@
14
14
  //
15
15
  // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
16
16
  // *****************************************************************************
17
+ var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
18
+ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
19
+ if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
20
+ else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
21
+ return c > 3 && r && Object.defineProperty(target, key, r), r;
22
+ };
17
23
  Object.defineProperty(exports, "__esModule", { value: true });
18
24
  exports.ThemeServiceWithDB = exports.stateToTheme = exports.deleteTheme = exports.putTheme = exports.getThemes = exports.MonacoThemeState = exports.monacoDB = void 0;
19
25
  const idb = require("idb");
20
26
  const disposable_1 = require("@theia/core/lib/common/disposable");
21
27
  const theming_1 = require("@theia/core/lib/browser/theming");
28
+ const inversify_1 = require("@theia/core/shared/inversify");
22
29
  let _monacoDB;
23
30
  if ('indexedDB' in window) {
24
31
  _monacoDB = idb.openDB('theia-monaco', 1, {
@@ -99,17 +106,7 @@ async function getThemeFromDB(id) {
99
106
  const matchingState = (await getThemes()).find(theme => theme.id === id);
100
107
  return matchingState && stateToTheme(matchingState);
101
108
  }
102
- class ThemeServiceWithDB extends theming_1.ThemeService {
103
- static get() {
104
- const global = window; // eslint-disable-line @typescript-eslint/no-explicit-any
105
- if (!global[theming_1.ThemeServiceSymbol]) {
106
- const themeService = new ThemeServiceWithDB();
107
- themeService.register(...theming_1.BuiltinThemeProvider.themes);
108
- themeService.startupTheme();
109
- global[theming_1.ThemeServiceSymbol] = themeService;
110
- }
111
- return global[theming_1.ThemeServiceSymbol];
112
- }
109
+ let ThemeServiceWithDB = class ThemeServiceWithDB extends theming_1.ThemeService {
113
110
  loadUserTheme() {
114
111
  this.loadUserThemeWithDB();
115
112
  }
@@ -117,9 +114,16 @@ class ThemeServiceWithDB extends theming_1.ThemeService {
117
114
  var _a, _b;
118
115
  const themeId = window.localStorage.getItem('theme') || this.defaultTheme.id;
119
116
  const theme = (_b = (_a = this.themes[themeId]) !== null && _a !== void 0 ? _a : await getThemeFromDB(themeId)) !== null && _b !== void 0 ? _b : this.defaultTheme;
117
+ // In case the theme comes from the DB.
118
+ if (!this.themes[theme.id]) {
119
+ this.themes[theme.id] = theme;
120
+ }
120
121
  this.setCurrentTheme(theme.id);
122
+ this.deferredInitializer.resolve();
121
123
  }
122
- }
124
+ };
125
+ ThemeServiceWithDB = __decorate([
126
+ (0, inversify_1.injectable)()
127
+ ], ThemeServiceWithDB);
123
128
  exports.ThemeServiceWithDB = ThemeServiceWithDB;
124
- theming_1.ThemeService.get = ThemeServiceWithDB.get;
125
129
  //# sourceMappingURL=monaco-indexed-db.js.map
@@ -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":";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,2EAA2E;AAC3E,gFAAgF;;;;;;;;;AAEhF,2BAA2B;AAC3B,kEAAqF;AACrF,6DAAqF;AAErF,4DAA0D;AAI1D,IAAI,SAAgD,CAAC;AACrD,IAAI,WAAW,IAAI,MAAM,EAAE;IACvB,SAAS,GAAG,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC,EAAE;QACtC,OAAO,EAAE,EAAE,CAAC,EAAE;YACV,IAAI,CAAC,EAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE;gBACzC,EAAE,CAAC,iBAAiB,CAAC,QAAQ,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;aACrD;QACL,CAAC;KACJ,CAAC,CAAC;CACN;AAEY,QAAA,QAAQ,GAAG,SAAS,CAAC;AASlC,IAAiB,gBAAgB,CAIhC;AAJD,WAAiB,gBAAgB;IAC7B,SAAgB,EAAE,CAAC,KAAyB;QACxC,OAAO,CAAC,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,IAAI,IAAI,KAAK,IAAI,OAAO,IAAI,KAAK,IAAI,SAAS,IAAI,KAAK,IAAI,MAAM,IAAI,KAAK,CAAC;IAC9H,CAAC;IAFe,mBAAE,KAEjB,CAAA;AACL,CAAC,EAJgB,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAIhC;AAEM,KAAK,UAAU,SAAS;IAC3B,IAAI,CAAC,gBAAQ,EAAE;QACX,OAAO,EAAE,CAAC;KACb;IACD,MAAM,EAAE,GAAG,MAAM,gBAAQ,CAAC;IAC1B,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,WAAW,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,CAAC;IACzF,OAAO,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;AAC9C,CAAC;AAPD,8BAOC;AAED,SAAgB,QAAQ,CAAC,KAAuB;IAC5C,MAAM,SAAS,GAAG,IAAI,iCAAoB,CAAC,uBAAU,CAAC,MAAM,CAAC,GAAG,EAAE,GAA8B,CAAC,CAAC,CAAC,CAAC;IACpG,UAAU,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IAC7B,OAAO,SAAS,CAAC;AACrB,CAAC;AAJD,4BAIC;AACD,KAAK,UAAU,UAAU,CAAC,KAAuB,EAAE,SAA+B;IAC9E,IAAI,CAAC,gBAAQ,EAAE;QACX,OAAO;KACV;IACD,MAAM,EAAE,GAAG,MAAM,gBAAQ,CAAC;IAC1B,IAAI,SAAS,CAAC,QAAQ,EAAE;QACpB,OAAO;KACV;IACD,MAAM,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC;IACpB,MAAM,EAAE,CAAC,WAAW,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAC7E,IAAI,SAAS,CAAC,QAAQ,EAAE;QACpB,MAAM,WAAW,CAAC,EAAE,CAAC,CAAC;QACtB,OAAO;KACV;IACD,SAAS,CAAC,IAAI,CAAC,uBAAU,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAC7D,CAAC;AAEM,KAAK,UAAU,WAAW,CAAC,EAAU;IACxC,IAAI,CAAC,gBAAQ,EAAE;QACX,OAAO;KACV;IACD,MAAM,EAAE,GAAG,MAAM,gBAAQ,CAAC;IAC1B,MAAM,EAAE,CAAC,WAAW,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AACjF,CAAC;AAND,kCAMC;AAED,SAAgB,YAAY,CAAC,KAAuB;IAChD,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;IACxD,MAAM,IAAI,GAAG,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;IAChF,MAAM,YAAY,GAAG,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,8BAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC,8BAAoB,CAAC,OAAO,CAAC;IACrG,OAAO;QACH,IAAI;QACJ,EAAE;QACF,KAAK;QACL,WAAW;QACX,WAAW,EAAE,IAAI,CAAC,IAAK;QACvB,QAAQ;YACJ,YAAY,CAAC,GAAG,EAAE,CAAC;QACvB,CAAC;QACD,UAAU;YACN,YAAY,CAAC,KAAK,EAAE,CAAC;QACzB,CAAC;KACJ,CAAC;AACN,CAAC;AAjBD,oCAiBC;AAED,KAAK,UAAU,cAAc,CAAC,EAAU;IACpC,MAAM,aAAa,GAAG,CAAC,MAAM,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IACzE,OAAO,aAAa,IAAI,YAAY,CAAC,aAAa,CAAC,CAAC;AACxD,CAAC;AAGD,IAAa,kBAAkB,GAA/B,MAAa,kBAAmB,SAAQ,sBAAY;IACvC,aAAa;QAClB,IAAI,CAAC,mBAAmB,EAAE,CAAC;IAC/B,CAAC;IAES,KAAK,CAAC,mBAAmB;;QAC/B,MAAM,OAAO,GAAG,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;QAC7E,MAAM,KAAK,GAAG,MAAA,MAAA,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,mCAAI,MAAM,cAAc,CAAC,OAAO,CAAC,mCAAI,IAAI,CAAC,YAAY,CAAC;QACzF,uCAAuC;QACvC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE;YACxB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC;SACjC;QACD,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC/B,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,CAAC;IACvC,CAAC;CACJ,CAAA;AAfY,kBAAkB;IAD9B,IAAA,sBAAU,GAAE;GACA,kBAAkB,CAe9B;AAfY,gDAAkB"}
@@ -1,5 +1,7 @@
1
+ import { ThemeService } from '@theia/core/lib/browser/theming';
1
2
  import URI from '@theia/core/lib/common/uri';
2
3
  import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
4
+ import { MonacoThemeRegistry } from './textmate/monaco-theme-registry';
3
5
  import { MonacoThemeState } from './monaco-indexed-db';
4
6
  import { FileService } from '@theia/filesystem/lib/browser/file-service';
5
7
  import * as monaco from '@theia/monaco-editor-core';
@@ -34,6 +36,9 @@ export interface MonacoThemeJson {
34
36
  }
35
37
  export declare class MonacoThemingService {
36
38
  protected readonly fileService: FileService;
39
+ protected readonly monacoThemeRegistry: MonacoThemeRegistry;
40
+ protected readonly themeService: ThemeService;
41
+ /** Register themes whose configuration needs to be loaded */
37
42
  register(theme: MonacoTheme, pending?: {
38
43
  [uri: string]: Promise<any>;
39
44
  }): Disposable;
@@ -50,12 +55,13 @@ export declare class MonacoThemingService {
50
55
  }, pending: {
51
56
  [uri: string]: Promise<any>;
52
57
  }, toDispose: DisposableCollection): Promise<any>;
53
- static init(): void;
54
- static register(theme: MonacoThemeJson): Disposable;
55
- protected static toUpdateUiTheme: DisposableCollection;
56
- protected static updateBodyUiTheme(): void;
57
- protected static doRegister(state: MonacoThemeState): Disposable;
58
- protected static restore(): Promise<void>;
58
+ initialize(): void;
59
+ /** register a theme whose configuration has already been loaded */
60
+ registerParsedTheme(theme: MonacoThemeJson): Disposable;
61
+ protected toUpdateUiTheme: DisposableCollection;
62
+ protected updateBodyUiTheme(): void;
63
+ protected doRegisterParsedTheme(state: MonacoThemeState): Disposable;
64
+ protected restore(): Promise<void>;
59
65
  protected static toCssSelector(str: string): string;
60
66
  private cleanEmpty;
61
67
  }
@@ -1 +1 @@
1
- {"version":3,"file":"monaco-theming-service.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-theming-service.ts"],"names":[],"mappings":"AAsBA,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAErF,OAAO,EAAuB,gBAAgB,EAAgB,MAAM,qBAAqB,CAAC;AAC1F,OAAO,EAAE,WAAW,EAAE,MAAM,4CAA4C,CAAC;AACzE,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AAEpD,MAAM,WAAW,WAAW;IACxB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;IACrC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,eAAe;IAC5B;;OAEG;IACH,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;IACrC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,IAAI,EAAE,GAAG,CAAA;IACT;;OAEG;IACH,QAAQ,CAAC,EAAE;QAAE,CAAC,WAAW,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAA;CAC5C;AAED,qBACa,oBAAoB;IAG7B,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAE5C,QAAQ,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,GAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAA;KAAO,GAAG,UAAU;cAMvE,UAAU,CAAC,KAAK,EAAE,WAAW,EACzC,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAA;KAAE,EACxC,SAAS,EAAE,oBAAoB,GAChC,OAAO,CAAC,IAAI,CAAC;cAeA,SAAS,CACrB,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE;QAAE,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EACpC,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAA;KAAE,EACxC,SAAS,EAAE,oBAAoB,GAChC,OAAO,CAAC,GAAG,CAAC;IAgCf,SAAS,CAAC,WAAW,CACjB,QAAQ,EAAE,GAAG,EACb,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE;QAAE,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EACpC,OAAO,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAA;KAAE,EACxC,SAAS,EAAE,oBAAoB,GAChC,OAAO,CAAC,GAAG,CAAC;IAQf,MAAM,CAAC,IAAI,IAAI,IAAI;IAMnB,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,eAAe,GAAG,UAAU;IASnD,SAAS,CAAC,MAAM,CAAC,eAAe,uBAA8B;IAC9D,SAAS,CAAC,MAAM,CAAC,iBAAiB,IAAI,IAAI;IAQ1C,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,gBAAgB,GAAG,UAAU;qBAOzC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAa/C,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAQnD,OAAO,CAAC,UAAU;CAQrB"}
1
+ {"version":3,"file":"monaco-theming-service.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-theming-service.ts"],"names":[],"mappings":"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"}
@@ -37,6 +37,10 @@ const monaco_theme_registry_1 = require("./textmate/monaco-theme-registry");
37
37
  const monaco_indexed_db_1 = require("./monaco-indexed-db");
38
38
  const file_service_1 = require("@theia/filesystem/lib/browser/file-service");
39
39
  let MonacoThemingService = MonacoThemingService_1 = class MonacoThemingService {
40
+ constructor() {
41
+ this.toUpdateUiTheme = new disposable_1.DisposableCollection();
42
+ }
43
+ /** Register themes whose configuration needs to be loaded */
40
44
  register(theme, pending = {}) {
41
45
  const toDispose = new disposable_1.DisposableCollection(disposable_1.Disposable.create(() => { }));
42
46
  this.doRegister(theme, pending, toDispose);
@@ -51,7 +55,7 @@ let MonacoThemingService = MonacoThemingService_1 = class MonacoThemingService {
51
55
  }
52
56
  const label = theme.label || new uri_1.default(theme.uri).path.base;
53
57
  const { id, description, uiTheme } = theme;
54
- toDispose.push(MonacoThemingService_1.register({ id, label, description, uiTheme: uiTheme, json, includes }));
58
+ toDispose.push(this.registerParsedTheme({ id, label, description, uiTheme: uiTheme, json, includes }));
55
59
  }
56
60
  catch (e) {
57
61
  console.error('Failed to load theme from ' + theme.uri, e);
@@ -95,35 +99,37 @@ let MonacoThemingService = MonacoThemingService_1 = class MonacoThemingService {
95
99
  }
96
100
  return pending[referencedUri];
97
101
  }
98
- static init() {
102
+ initialize() {
103
+ this.monacoThemeRegistry.initializeDefaultThemes();
99
104
  this.updateBodyUiTheme();
100
- theming_1.ThemeService.get().onDidColorThemeChange(() => this.updateBodyUiTheme());
105
+ this.themeService.onDidColorThemeChange(() => this.updateBodyUiTheme());
101
106
  this.restore();
102
107
  }
103
- static register(theme) {
108
+ /** register a theme whose configuration has already been loaded */
109
+ registerParsedTheme(theme) {
104
110
  const uiTheme = theme.uiTheme || 'vs-dark';
105
111
  const { label, description, json, includes } = theme;
106
112
  const id = theme.id || label;
107
113
  const cssSelector = MonacoThemingService_1.toCssSelector(id);
108
- const data = monaco_theme_registry_1.MonacoThemeRegistry.SINGLETON.register(json, includes, cssSelector, uiTheme);
109
- return MonacoThemingService_1.doRegister({ id, label, description, uiTheme, data });
114
+ const data = this.monacoThemeRegistry.register(json, includes, cssSelector, uiTheme);
115
+ return this.doRegisterParsedTheme({ id, label, description, uiTheme, data });
110
116
  }
111
- static updateBodyUiTheme() {
117
+ updateBodyUiTheme() {
112
118
  this.toUpdateUiTheme.dispose();
113
- const type = theming_1.ThemeService.get().getCurrentTheme().type;
119
+ const type = this.themeService.getCurrentTheme().type;
114
120
  const uiTheme = type === 'hc' ? 'hc-black' : type === 'light' ? 'vs' : 'vs-dark';
115
121
  document.body.classList.add(uiTheme);
116
122
  this.toUpdateUiTheme.push(disposable_1.Disposable.create(() => document.body.classList.remove(uiTheme)));
117
123
  }
118
- static doRegister(state) {
119
- return new disposable_1.DisposableCollection(theming_1.ThemeService.get().register((0, monaco_indexed_db_1.stateToTheme)(state)), (0, monaco_indexed_db_1.putTheme)(state));
124
+ doRegisterParsedTheme(state) {
125
+ return new disposable_1.DisposableCollection(this.themeService.register((0, monaco_indexed_db_1.stateToTheme)(state)), (0, monaco_indexed_db_1.putTheme)(state));
120
126
  }
121
- static async restore() {
127
+ async restore() {
122
128
  try {
123
129
  const themes = await (0, monaco_indexed_db_1.getThemes)();
124
130
  for (const state of themes) {
125
- monaco_theme_registry_1.MonacoThemeRegistry.SINGLETON.setTheme(state.data.name, state.data);
126
- MonacoThemingService_1.doRegister(state);
131
+ this.monacoThemeRegistry.setTheme(state.data.name, state.data);
132
+ this.doRegisterParsedTheme(state);
127
133
  }
128
134
  }
129
135
  catch (e) {
@@ -147,11 +153,18 @@ let MonacoThemingService = MonacoThemingService_1 = class MonacoThemingService {
147
153
  }
148
154
  }
149
155
  };
150
- MonacoThemingService.toUpdateUiTheme = new disposable_1.DisposableCollection();
151
156
  __decorate([
152
157
  (0, inversify_1.inject)(file_service_1.FileService),
153
158
  __metadata("design:type", file_service_1.FileService)
154
159
  ], MonacoThemingService.prototype, "fileService", void 0);
160
+ __decorate([
161
+ (0, inversify_1.inject)(monaco_theme_registry_1.MonacoThemeRegistry),
162
+ __metadata("design:type", monaco_theme_registry_1.MonacoThemeRegistry)
163
+ ], MonacoThemingService.prototype, "monacoThemeRegistry", void 0);
164
+ __decorate([
165
+ (0, inversify_1.inject)(theming_1.ThemeService),
166
+ __metadata("design:type", theming_1.ThemeService)
167
+ ], MonacoThemingService.prototype, "themeService", void 0);
155
168
  MonacoThemingService = MonacoThemingService_1 = __decorate([
156
169
  (0, inversify_1.injectable)()
157
170
  ], MonacoThemingService);
@@ -1 +1 @@
1
- {"version":3,"file":"monaco-theming-service.js","sourceRoot":"","sources":["../../src/browser/monaco-theming-service.ts"],"names":[],"mappings":"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"}
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,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;;AAEhF,uDAAuD;AAEvD,4DAAkE;AAClE,4CAA4C;AAC5C,0CAA0C;AAC1C,6DAA+D;AAC/D,oDAA6C;AAC7C,kEAAqF;AACrF,4EAAuE;AACvE,2DAA0F;AAC1F,6EAAyE;AAiCzE,IAAa,oBAAoB,4BAAjC,MAAa,oBAAoB;IAAjC;QAmGc,oBAAe,GAAG,IAAI,iCAAoB,EAAE,CAAC;IA6C3D,CAAC;IA1IG,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;YACA,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;gBACpB,OAAO;aACV;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;SAC1G;QAAC,OAAO,CAAC,EAAE;YACR,OAAO,CAAC,KAAK,CAAC,4BAA4B,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;SAC9D;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;YACpB,OAAO;SACV;QACD,MAAM,QAAQ,GAAG,IAAI,aAAG,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,QAAQ,CAAC,IAAI,CAAC,GAAG,KAAK,OAAO,EAAE;YAC/B,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;gBAC/D,OAAO,EAAE,WAAW,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC;aAC1C;YACD,MAAM,IAAI,KAAK,CAAC,iCAAiC,GAAG,4BAA4B,CAAC,CAAC;SACrF;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;YAC/D,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;gBACpB,OAAO;aACV;YACD,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;SACxC;QACD,IAAI,IAAI,CAAC,OAAO,EAAE;YACd,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;gBACpB,OAAO;aACV;SACJ;QACD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC7B,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;YACzB,OAAO,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;SACxF;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,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;QAC7G,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACrC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,uBAAU,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAChG,CAAC;IAES,qBAAqB,CAAC,KAAuB;QACnD,OAAO,IAAI,iCAAoB,CAC3B,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAA,gCAAY,EAAC,KAAK,CAAC,CAAC,EAC/C,IAAA,4BAAQ,EAAC,KAAK,CAAC,CAClB,CAAC;IACN,CAAC;IAES,KAAK,CAAC,OAAO;QACnB,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,IAAA,6BAAS,GAAE,CAAC;YACjC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;gBACxB,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,IAAK,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;gBAChE,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC;aACrC;SACJ;QAAC,OAAO,CAAC,EAAE;YACR,OAAO,CAAC,KAAK,CAAC,iCAAiC,EAAE,CAAC,CAAC,CAAC;SACvD;IACL,CAAC;IAED,uDAAuD;IAC7C,MAAM,CAAC,aAAa,CAAC,GAAW;QACtC,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,iBAAiB,EAAE,GAAG,CAAC,CAAC;QAC1C,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE;YAChC,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC;SACnB;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IAEO,UAAU,CAAC,GAAQ;QACvB,KAAK,MAAM,GAAG,IAAI,GAAG,EAAE;YACnB,2CAA2C;YAC3C,IAAI,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE;gBACtC,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC;aACnB;SACJ;IACL,CAAC;CACJ,CAAA;AA9IwB;IAApB,IAAA,kBAAM,EAAC,0BAAW,CAAC;8BAAiC,0BAAW;yDAAC;AACpC;IAA5B,IAAA,kBAAM,EAAC,2CAAmB,CAAC;8BAAyC,2CAAmB;iEAAC;AACnE;IAArB,IAAA,kBAAM,EAAC,sBAAY,CAAC;8BAAkC,sBAAY;0DAAC;AAJ3D,oBAAoB;IADhC,IAAA,sBAAU,GAAE;GACA,oBAAoB,CAgJhC;AAhJY,oDAAoB"}
@@ -38,7 +38,7 @@ exports.default = (bind, unbind, isBound, rebind) => {
38
38
  bind(browser_1.FrontendApplicationContribution).toService(monaco_textmate_service_1.MonacoTextmateService);
39
39
  (0, core_1.bindContributionProvider)(bind, textmate_contribution_1.LanguageGrammarDefinitionContribution);
40
40
  bind(textmate_registry_1.TextmateRegistry).toSelf().inSingletonScope();
41
- bind(monaco_theme_registry_1.MonacoThemeRegistry).toDynamicValue(() => monaco_theme_registry_1.MonacoThemeRegistry.SINGLETON).inSingletonScope();
41
+ bind(monaco_theme_registry_1.MonacoThemeRegistry).toSelf().inSingletonScope();
42
42
  };
43
43
  async function dynamicOnigasmLib(ctx) {
44
44
  return createOnigasmLib();
@@ -1 +1 @@
1
- {"version":3,"file":"monaco-textmate-frontend-bindings.js","sourceRoot":"","sources":["../../../src/browser/textmate/monaco-textmate-frontend-bindings.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,2EAA2E;AAC3E,gFAAgF;;;AAGhF,qDAAgG;AAChG,sCAAuD;AACvD,2DAAuD;AACvD,mEAAgF;AAChF,uEAAkF;AAClF,mEAA8D;AAC9D,qCAA4D;AAG5D,MAAa,UAAU;IACnB,iBAAiB,CAAC,OAAiB;QAC/B,OAAO,IAAI,qBAAW,CAAC,OAAO,CAAC,CAAC;IACpC,CAAC;IACD,gBAAgB,CAAC,OAAe;QAC5B,OAAO,IAAI,oBAAU,CAAC,OAAO,CAAC,CAAC;IACnC,CAAC;CACJ;AAPD,gCAOC;AAED,kBAAe,CAAC,IAAqB,EAAE,MAAyB,EAAE,OAA2B,EAAE,MAAyB,EAAE,EAAE;IACxH,IAAI,CAAC,wCAAc,CAAC,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC1E,IAAI,CAAC,+CAAqB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACxD,IAAI,CAAC,yCAA+B,CAAC,CAAC,SAAS,CAAC,+CAAqB,CAAC,CAAC;IACvE,IAAA,+BAAwB,EAAC,IAAI,EAAE,6DAAqC,CAAC,CAAC;IACtE,IAAI,CAAC,oCAAgB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACnD,IAAI,CAAC,2CAAmB,CAAC,CAAC,cAAc,CAAC,GAAG,EAAE,CAAC,2CAAmB,CAAC,SAAS,CAAC,CAAC,gBAAgB,EAAE,CAAC;AACrG,CAAC,CAAC;AAEK,KAAK,UAAU,iBAAiB,CAAC,GAAuB;IAC3D,OAAO,gBAAgB,EAAE,CAAC;AAC9B,CAAC;AAFD,8CAEC;AAEM,KAAK,UAAU,gBAAgB;IAClC,IAAI,CAAC,8BAAoB,EAAE;QACvB,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;KACzC;IACD,MAAM,IAAI,GAAG,MAAM,YAAY,EAAE,CAAC;IAClC,MAAM,IAAA,kBAAQ,EAAC,IAAI,CAAC,CAAC;IACrB,OAAO,IAAI,UAAU,EAAE,CAAC;AAC5B,CAAC;AAPD,4CAOC;AAEM,KAAK,UAAU,YAAY;IAC9B,+EAA+E;IAC/E,MAAM,WAAW,GAAW,OAAO,CAAC,0BAA0B,CAAC,CAAC;IAChE,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IAC7D,OAAO,QAAQ,CAAC,WAAW,EAAE,CAAC;AAClC,CAAC;AALD,oCAKC"}
1
+ {"version":3,"file":"monaco-textmate-frontend-bindings.js","sourceRoot":"","sources":["../../../src/browser/textmate/monaco-textmate-frontend-bindings.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,2EAA2E;AAC3E,gFAAgF;;;AAGhF,qDAAgG;AAChG,sCAAuD;AACvD,2DAAuD;AACvD,mEAAgF;AAChF,uEAAkF;AAClF,mEAA8D;AAC9D,qCAA4D;AAG5D,MAAa,UAAU;IACnB,iBAAiB,CAAC,OAAiB;QAC/B,OAAO,IAAI,qBAAW,CAAC,OAAO,CAAC,CAAC;IACpC,CAAC;IACD,gBAAgB,CAAC,OAAe;QAC5B,OAAO,IAAI,oBAAU,CAAC,OAAO,CAAC,CAAC;IACnC,CAAC;CACJ;AAPD,gCAOC;AAED,kBAAe,CAAC,IAAqB,EAAE,MAAyB,EAAE,OAA2B,EAAE,MAAyB,EAAE,EAAE;IACxH,IAAI,CAAC,wCAAc,CAAC,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC1E,IAAI,CAAC,+CAAqB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACxD,IAAI,CAAC,yCAA+B,CAAC,CAAC,SAAS,CAAC,+CAAqB,CAAC,CAAC;IACvE,IAAA,+BAAwB,EAAC,IAAI,EAAE,6DAAqC,CAAC,CAAC;IACtE,IAAI,CAAC,oCAAgB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACnD,IAAI,CAAC,2CAAmB,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;AAC1D,CAAC,CAAC;AAEK,KAAK,UAAU,iBAAiB,CAAC,GAAuB;IAC3D,OAAO,gBAAgB,EAAE,CAAC;AAC9B,CAAC;AAFD,8CAEC;AAEM,KAAK,UAAU,gBAAgB;IAClC,IAAI,CAAC,8BAAoB,EAAE;QACvB,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;KACzC;IACD,MAAM,IAAI,GAAG,MAAM,YAAY,EAAE,CAAC;IAClC,MAAM,IAAA,kBAAQ,EAAC,IAAI,CAAC,CAAC;IACrB,OAAO,IAAI,UAAU,EAAE,CAAC;AAC5B,CAAC;AAPD,4CAOC;AAEM,KAAK,UAAU,YAAY;IAC9B,+EAA+E;IAC/E,MAAM,WAAW,GAAW,OAAO,CAAC,0BAA0B,CAAC,CAAC;IAChE,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IAC7D,OAAO,QAAQ,CAAC,WAAW,EAAE,CAAC;AAClC,CAAC;AALD,oCAKC"}
@@ -8,6 +8,7 @@ export interface MixStandaloneTheme extends IStandaloneTheme {
8
8
  themeData: ThemeMix;
9
9
  }
10
10
  export declare class MonacoThemeRegistry {
11
+ initializeDefaultThemes(): void;
11
12
  getThemeData(): ThemeMix;
12
13
  getThemeData(name: string): ThemeMix | undefined;
13
14
  getTheme(): MixStandaloneTheme;
@@ -24,9 +25,8 @@ export declare class MonacoThemeRegistry {
24
25
  protected normalizeColor(color: string | Color | undefined): string | undefined;
25
26
  }
26
27
  export declare namespace MonacoThemeRegistry {
27
- const SINGLETON: MonacoThemeRegistry;
28
- const DARK_DEFAULT_THEME: string;
29
- const LIGHT_DEFAULT_THEME: string;
30
- const HC_DEFAULT_THEME: string;
28
+ const DARK_DEFAULT_THEME = "dark-theia";
29
+ const LIGHT_DEFAULT_THEME = "light-theia";
30
+ const HC_DEFAULT_THEME = "hc-theia";
31
31
  }
32
32
  //# 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":"AAoBA,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAA2B,MAAM,2EAA2E,CAAC;AAGtI,OAAO,EAAE,KAAK,EAAE,MAAM,oDAAoD,CAAC;AAE3E,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,qBACa,mBAAmB;IAE5B,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;IAK5C;;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;IAkErI,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;CAYlF;AAED,yBAAiB,mBAAmB,CAAC;IAC1B,MAAM,SAAS,qBAA4B,CAAC;IAE5C,MAAM,kBAAkB,EAAE,MAGA,CAAC;IAC3B,MAAM,mBAAmB,EAAE,MAGL,CAAC;IACvB,MAAM,gBAAgB,EAAE,MAEC,CAAC;CACpC"}
1
+ {"version":3,"file":"monaco-theme-registry.d.ts","sourceRoot":"","sources":["../../../src/browser/textmate/monaco-theme-registry.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAE,SAAS,EAA8B,MAAM,iBAAiB,CAAC;AACxE,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAA2B,MAAM,2EAA2E,CAAC;AAGtI,OAAO,EAAE,KAAK,EAAE,MAAM,oDAAoD,CAAC;AAE3E,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,qBACa,mBAAmB;IAE5B,uBAAuB,IAAI,IAAI;IAc/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;IAK5C;;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;IAkErI,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;CAYlF;AAED,yBAAiB,mBAAmB,CAAC;IAC1B,MAAM,kBAAkB,eAAe,CAAC;IACxC,MAAM,mBAAmB,gBAAgB,CAAC;IAC1C,MAAM,gBAAgB,aAAa,CAAC;CAC9C"}
@@ -29,6 +29,19 @@ const monaco = require("@theia/monaco-editor-core");
29
29
  const standaloneTheme_1 = require("@theia/monaco-editor-core/esm/vs/editor/standalone/common/standaloneTheme");
30
30
  const standaloneServices_1 = require("@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices");
31
31
  let MonacoThemeRegistry = class MonacoThemeRegistry {
32
+ initializeDefaultThemes() {
33
+ this.register(require('../../../data/monaco-themes/vscode/dark_theia.json'), {
34
+ './dark_vs.json': require('../../../data/monaco-themes/vscode/dark_vs.json'),
35
+ './dark_plus.json': require('../../../data/monaco-themes/vscode/dark_plus.json')
36
+ }, 'dark-theia', 'vs-dark');
37
+ this.register(require('../../../data/monaco-themes/vscode/light_theia.json'), {
38
+ './light_vs.json': require('../../../data/monaco-themes/vscode/light_vs.json'),
39
+ './light_plus.json': require('../../../data/monaco-themes/vscode/light_plus.json'),
40
+ }, 'light-theia', 'vs');
41
+ this.register(require('../../../data/monaco-themes/vscode/hc_theia.json'), {
42
+ './hc_black.json': require('../../../data/monaco-themes/vscode/hc_black.json')
43
+ }, 'hc-theia', 'hc-black');
44
+ }
32
45
  getThemeData(name) {
33
46
  const theme = this.doGetTheme(name);
34
47
  return theme && theme.themeData;
@@ -141,18 +154,9 @@ MonacoThemeRegistry = __decorate([
141
154
  ], MonacoThemeRegistry);
142
155
  exports.MonacoThemeRegistry = MonacoThemeRegistry;
143
156
  (function (MonacoThemeRegistry) {
144
- MonacoThemeRegistry.SINGLETON = new MonacoThemeRegistry();
145
- MonacoThemeRegistry.DARK_DEFAULT_THEME = MonacoThemeRegistry.SINGLETON.register(require('../../../data/monaco-themes/vscode/dark_theia.json'), {
146
- './dark_vs.json': require('../../../data/monaco-themes/vscode/dark_vs.json'),
147
- './dark_plus.json': require('../../../data/monaco-themes/vscode/dark_plus.json')
148
- }, 'dark-theia', 'vs-dark').name;
149
- MonacoThemeRegistry.LIGHT_DEFAULT_THEME = MonacoThemeRegistry.SINGLETON.register(require('../../../data/monaco-themes/vscode/light_theia.json'), {
150
- './light_vs.json': require('../../../data/monaco-themes/vscode/light_vs.json'),
151
- './light_plus.json': require('../../../data/monaco-themes/vscode/light_plus.json'),
152
- }, 'light-theia', 'vs').name;
153
- MonacoThemeRegistry.HC_DEFAULT_THEME = MonacoThemeRegistry.SINGLETON.register(require('../../../data/monaco-themes/vscode/hc_theia.json'), {
154
- './hc_black.json': require('../../../data/monaco-themes/vscode/hc_black.json')
155
- }, 'hc-theia', 'hc-black').name;
157
+ MonacoThemeRegistry.DARK_DEFAULT_THEME = 'dark-theia';
158
+ MonacoThemeRegistry.LIGHT_DEFAULT_THEME = 'light-theia';
159
+ MonacoThemeRegistry.HC_DEFAULT_THEME = 'hc-theia';
156
160
  })(MonacoThemeRegistry = exports.MonacoThemeRegistry || (exports.MonacoThemeRegistry = {}));
157
161
  exports.MonacoThemeRegistry = MonacoThemeRegistry;
158
162
  //# 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":"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"}
1
+ {"version":3,"file":"monaco-theme-registry.js","sourceRoot":"","sources":["../../../src/browser/textmate/monaco-theme-registry.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,14 +1,14 @@
1
1
  {
2
2
  "name": "@theia/monaco",
3
- "version": "1.27.0-next.4+6f0c4d3028c",
3
+ "version": "1.27.0-next.43+398fa66289f",
4
4
  "description": "Theia - Monaco Extension",
5
5
  "dependencies": {
6
- "@theia/core": "1.27.0-next.4+6f0c4d3028c",
7
- "@theia/editor": "1.27.0-next.4+6f0c4d3028c",
8
- "@theia/filesystem": "1.27.0-next.4+6f0c4d3028c",
9
- "@theia/markers": "1.27.0-next.4+6f0c4d3028c",
6
+ "@theia/core": "1.27.0-next.43+398fa66289f",
7
+ "@theia/editor": "1.27.0-next.43+398fa66289f",
8
+ "@theia/filesystem": "1.27.0-next.43+398fa66289f",
9
+ "@theia/markers": "1.27.0-next.43+398fa66289f",
10
10
  "@theia/monaco-editor-core": "1.65.2",
11
- "@theia/outline-view": "1.27.0-next.4+6f0c4d3028c",
11
+ "@theia/outline-view": "1.27.0-next.43+398fa66289f",
12
12
  "fast-plist": "^0.1.2",
13
13
  "idb": "^4.0.5",
14
14
  "jsonc-parser": "^2.2.0",
@@ -54,5 +54,5 @@
54
54
  "nyc": {
55
55
  "extends": "../../configs/nyc.json"
56
56
  },
57
- "gitHead": "6f0c4d3028c4b555079b0f0844f75bb618ded256"
57
+ "gitHead": "398fa66289f38a18f148dbf93c2ac8bc77025256"
58
58
  }
@@ -15,7 +15,8 @@
15
15
  // *****************************************************************************
16
16
 
17
17
  import { injectable } from '@theia/core/shared/inversify';
18
- import { ColorRegistry, ColorDefinition, Color } from '@theia/core/lib/browser/color-registry';
18
+ import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
19
+ import { Color, ColorDefinition } from '@theia/core/lib/common/color';
19
20
  import { Disposable } from '@theia/core/lib/common/disposable';
20
21
  import { ColorDefaults, ColorValue, getColorRegistry } from '@theia/monaco-editor-core/esm/vs/platform/theme/common/colorRegistry';
21
22
  import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
@@ -14,7 +14,7 @@
14
14
  // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
15
  // *****************************************************************************
16
16
 
17
- import { injectable, inject } from '@theia/core/shared/inversify';
17
+ import { injectable, inject, postConstruct } from '@theia/core/shared/inversify';
18
18
  import { FrontendApplicationContribution, PreferenceSchemaProvider, QuickAccessRegistry } from '@theia/core/lib/browser';
19
19
  import { MonacoSnippetSuggestProvider } from './monaco-snippet-suggest-provider';
20
20
  import * as monaco from '@theia/monaco-editor-core';
@@ -29,6 +29,7 @@ import { ITextModelService } from '@theia/monaco-editor-core/esm/vs/editor/commo
29
29
  import { IContextKeyService } from '@theia/monaco-editor-core/esm/vs/platform/contextkey/common/contextkey';
30
30
  import { IContextMenuService } from '@theia/monaco-editor-core/esm/vs/platform/contextview/browser/contextView';
31
31
  import { MonacoContextMenuService } from './monaco-context-menu';
32
+ import { MonacoThemingService } from './monaco-theming-service';
32
33
 
33
34
  @injectable()
34
35
  export class MonacoFrontendApplicationContribution implements FrontendApplicationContribution {
@@ -54,7 +55,10 @@ export class MonacoFrontendApplicationContribution implements FrontendApplicatio
54
55
  @inject(MonacoContextMenuService)
55
56
  protected readonly contextMenuService: MonacoContextMenuService;
56
57
 
57
- async initialize(): Promise<void> {
58
+ @inject(MonacoThemingService) protected readonly monacoThemingService: MonacoThemingService;
59
+
60
+ @postConstruct()
61
+ protected init(): void {
58
62
  const { codeEditorService, textModelService, contextKeyService, contextMenuService } = this;
59
63
  StandaloneServices.initialize({
60
64
  [ICodeEditorService.toString()]: codeEditorService,
@@ -77,6 +81,9 @@ export class MonacoFrontendApplicationContribution implements FrontendApplicatio
77
81
  this.preferenceSchema.registerOverrideIdentifier(language.id);
78
82
  registerLanguage(language);
79
83
  };
84
+
85
+ this.monacoThemingService.initialize();
80
86
  }
81
87
 
88
+ initialize(): void { }
82
89
  }
@@ -88,11 +88,11 @@ import { StandaloneConfigurationService, StandaloneServices } from '@theia/monac
88
88
  import { Configuration } from '@theia/monaco-editor-core/esm/vs/platform/configuration/common/configurationModels';
89
89
  import { MarkdownRenderer } from '@theia/core/lib/browser/markdown-rendering/markdown-renderer';
90
90
  import { MonacoMarkdownRenderer } from './markdown-renderer/monaco-markdown-renderer';
91
+ import { ThemeService } from '@theia/core/lib/browser/theming';
92
+ import { ThemeServiceWithDB } from './monaco-indexed-db';
91
93
 
92
94
  decorate(injectable(), VSCodeContextKeyService);
93
95
 
94
- MonacoThemingService.init();
95
-
96
96
  export default new ContainerModule((bind, unbind, isBound, rebind) => {
97
97
  bind(MonacoThemingService).toSelf().inSingletonScope();
98
98
 
@@ -183,6 +183,9 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
183
183
 
184
184
  bind(MonacoColorRegistry).toSelf().inSingletonScope();
185
185
  rebind(ColorRegistry).toService(MonacoColorRegistry);
186
+
187
+ bind(ThemeServiceWithDB).toSelf().inSingletonScope();
188
+ rebind(ThemeService).toService(ThemeServiceWithDB);
186
189
  });
187
190
 
188
191
  export const MonacoConfigurationService = Symbol('MonacoConfigurationService');
@@ -16,9 +16,11 @@
16
16
 
17
17
  import * as idb from 'idb';
18
18
  import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
19
- import { BuiltinThemeProvider, Theme, ThemeService, ThemeServiceSymbol } from '@theia/core/lib/browser/theming';
19
+ import { BuiltinThemeProvider, ThemeService } from '@theia/core/lib/browser/theming';
20
20
  import * as monaco from '@theia/monaco-editor-core';
21
- type ThemeMix = import('./textmate/monaco-theme-registry').ThemeMix;
21
+ import { injectable } from '@theia/core/shared/inversify';
22
+ import type { ThemeMix } from './textmate/monaco-theme-registry';
23
+ import { Theme } from '@theia/core/lib/common/theme';
22
24
 
23
25
  let _monacoDB: Promise<idb.IDBPDatabase> | undefined;
24
26
  if ('indexedDB' in window) {
@@ -109,18 +111,8 @@ async function getThemeFromDB(id: string): Promise<Theme | undefined> {
109
111
  return matchingState && stateToTheme(matchingState);
110
112
  }
111
113
 
114
+ @injectable()
112
115
  export class ThemeServiceWithDB extends ThemeService {
113
- static override get(): ThemeService {
114
- const global = window as any; // eslint-disable-line @typescript-eslint/no-explicit-any
115
- if (!global[ThemeServiceSymbol]) {
116
- const themeService = new ThemeServiceWithDB();
117
- themeService.register(...BuiltinThemeProvider.themes);
118
- themeService.startupTheme();
119
- global[ThemeServiceSymbol] = themeService;
120
- }
121
- return global[ThemeServiceSymbol];
122
- }
123
-
124
116
  override loadUserTheme(): void {
125
117
  this.loadUserThemeWithDB();
126
118
  }
@@ -128,8 +120,11 @@ export class ThemeServiceWithDB extends ThemeService {
128
120
  protected async loadUserThemeWithDB(): Promise<void> {
129
121
  const themeId = window.localStorage.getItem('theme') || this.defaultTheme.id;
130
122
  const theme = this.themes[themeId] ?? await getThemeFromDB(themeId) ?? this.defaultTheme;
123
+ // In case the theme comes from the DB.
124
+ if (!this.themes[theme.id]) {
125
+ this.themes[theme.id] = theme;
126
+ }
131
127
  this.setCurrentTheme(theme.id);
128
+ this.deferredInitializer.resolve();
132
129
  }
133
130
  }
134
-
135
- ThemeService.get = ThemeServiceWithDB.get;
@@ -59,9 +59,11 @@ export interface MonacoThemeJson {
59
59
  @injectable()
60
60
  export class MonacoThemingService {
61
61
 
62
- @inject(FileService)
63
- protected readonly fileService: FileService;
62
+ @inject(FileService) protected readonly fileService: FileService;
63
+ @inject(MonacoThemeRegistry) protected readonly monacoThemeRegistry: MonacoThemeRegistry;
64
+ @inject(ThemeService) protected readonly themeService: ThemeService;
64
65
 
66
+ /** Register themes whose configuration needs to be loaded */
65
67
  register(theme: MonacoTheme, pending: { [uri: string]: Promise<any> } = {}): Disposable {
66
68
  const toDispose = new DisposableCollection(Disposable.create(() => { /* mark as not disposed */ }));
67
69
  this.doRegister(theme, pending, toDispose);
@@ -80,7 +82,7 @@ export class MonacoThemingService {
80
82
  }
81
83
  const label = theme.label || new URI(theme.uri).path.base;
82
84
  const { id, description, uiTheme } = theme;
83
- toDispose.push(MonacoThemingService.register({ id, label, description, uiTheme: uiTheme, json, includes }));
85
+ toDispose.push(this.registerParsedTheme({ id, label, description, uiTheme: uiTheme, json, includes }));
84
86
  } catch (e) {
85
87
  console.error('Failed to load theme from ' + theme.uri, e);
86
88
  }
@@ -137,43 +139,45 @@ export class MonacoThemingService {
137
139
  return pending[referencedUri];
138
140
  }
139
141
 
140
- static init(): void {
142
+ initialize(): void {
143
+ this.monacoThemeRegistry.initializeDefaultThemes();
141
144
  this.updateBodyUiTheme();
142
- ThemeService.get().onDidColorThemeChange(() => this.updateBodyUiTheme());
145
+ this.themeService.onDidColorThemeChange(() => this.updateBodyUiTheme());
143
146
  this.restore();
144
147
  }
145
148
 
146
- static register(theme: MonacoThemeJson): Disposable {
149
+ /** register a theme whose configuration has already been loaded */
150
+ registerParsedTheme(theme: MonacoThemeJson): Disposable {
147
151
  const uiTheme = theme.uiTheme || 'vs-dark';
148
152
  const { label, description, json, includes } = theme;
149
153
  const id = theme.id || label;
150
154
  const cssSelector = MonacoThemingService.toCssSelector(id);
151
- const data = MonacoThemeRegistry.SINGLETON.register(json, includes, cssSelector, uiTheme);
152
- return MonacoThemingService.doRegister({ id, label, description, uiTheme, data });
155
+ const data = this.monacoThemeRegistry.register(json, includes, cssSelector, uiTheme);
156
+ return this.doRegisterParsedTheme({ id, label, description, uiTheme, data });
153
157
  }
154
158
 
155
- protected static toUpdateUiTheme = new DisposableCollection();
156
- protected static updateBodyUiTheme(): void {
159
+ protected toUpdateUiTheme = new DisposableCollection();
160
+ protected updateBodyUiTheme(): void {
157
161
  this.toUpdateUiTheme.dispose();
158
- const type = ThemeService.get().getCurrentTheme().type;
162
+ const type = this.themeService.getCurrentTheme().type;
159
163
  const uiTheme: monaco.editor.BuiltinTheme = type === 'hc' ? 'hc-black' : type === 'light' ? 'vs' : 'vs-dark';
160
164
  document.body.classList.add(uiTheme);
161
165
  this.toUpdateUiTheme.push(Disposable.create(() => document.body.classList.remove(uiTheme)));
162
166
  }
163
167
 
164
- protected static doRegister(state: MonacoThemeState): Disposable {
168
+ protected doRegisterParsedTheme(state: MonacoThemeState): Disposable {
165
169
  return new DisposableCollection(
166
- ThemeService.get().register(stateToTheme(state)),
170
+ this.themeService.register(stateToTheme(state)),
167
171
  putTheme(state)
168
172
  );
169
173
  }
170
174
 
171
- protected static async restore(): Promise<void> {
175
+ protected async restore(): Promise<void> {
172
176
  try {
173
177
  const themes = await getThemes();
174
178
  for (const state of themes) {
175
- MonacoThemeRegistry.SINGLETON.setTheme(state.data.name!, state.data);
176
- MonacoThemingService.doRegister(state);
179
+ this.monacoThemeRegistry.setTheme(state.data.name!, state.data);
180
+ this.doRegisterParsedTheme(state);
177
181
  }
178
182
  } catch (e) {
179
183
  console.error('Failed to restore monaco themes', e);
@@ -39,7 +39,7 @@ export default (bind: interfaces.Bind, unbind: interfaces.Unbind, isBound: inter
39
39
  bind(FrontendApplicationContribution).toService(MonacoTextmateService);
40
40
  bindContributionProvider(bind, LanguageGrammarDefinitionContribution);
41
41
  bind(TextmateRegistry).toSelf().inSingletonScope();
42
- bind(MonacoThemeRegistry).toDynamicValue(() => MonacoThemeRegistry.SINGLETON).inSingletonScope();
42
+ bind(MonacoThemeRegistry).toSelf().inSingletonScope();
43
43
  };
44
44
 
45
45
  export async function dynamicOnigasmLib(ctx: interfaces.Context): Promise<IOnigLib> {
@@ -33,6 +33,20 @@ export interface MixStandaloneTheme extends IStandaloneTheme {
33
33
  @injectable()
34
34
  export class MonacoThemeRegistry {
35
35
 
36
+ initializeDefaultThemes(): void {
37
+ this.register(require('../../../data/monaco-themes/vscode/dark_theia.json'), {
38
+ './dark_vs.json': require('../../../data/monaco-themes/vscode/dark_vs.json'),
39
+ './dark_plus.json': require('../../../data/monaco-themes/vscode/dark_plus.json')
40
+ }, 'dark-theia', 'vs-dark');
41
+ this.register(require('../../../data/monaco-themes/vscode/light_theia.json'), {
42
+ './light_vs.json': require('../../../data/monaco-themes/vscode/light_vs.json'),
43
+ './light_plus.json': require('../../../data/monaco-themes/vscode/light_plus.json'),
44
+ }, 'light-theia', 'vs');
45
+ this.register(require('../../../data/monaco-themes/vscode/hc_theia.json'), {
46
+ './hc_black.json': require('../../../data/monaco-themes/vscode/hc_black.json')
47
+ }, 'hc-theia', 'hc-black');
48
+ }
49
+
36
50
  getThemeData(): ThemeMix;
37
51
  getThemeData(name: string): ThemeMix | undefined;
38
52
  getThemeData(name?: string): ThemeMix | undefined {
@@ -155,17 +169,7 @@ export class MonacoThemeRegistry {
155
169
  }
156
170
 
157
171
  export namespace MonacoThemeRegistry {
158
- export const SINGLETON = new MonacoThemeRegistry();
159
-
160
- export const DARK_DEFAULT_THEME: string = SINGLETON.register(require('../../../data/monaco-themes/vscode/dark_theia.json'), {
161
- './dark_vs.json': require('../../../data/monaco-themes/vscode/dark_vs.json'),
162
- './dark_plus.json': require('../../../data/monaco-themes/vscode/dark_plus.json')
163
- }, 'dark-theia', 'vs-dark').name!;
164
- export const LIGHT_DEFAULT_THEME: string = SINGLETON.register(require('../../../data/monaco-themes/vscode/light_theia.json'), {
165
- './light_vs.json': require('../../../data/monaco-themes/vscode/light_vs.json'),
166
- './light_plus.json': require('../../../data/monaco-themes/vscode/light_plus.json'),
167
- }, 'light-theia', 'vs').name!;
168
- export const HC_DEFAULT_THEME: string = SINGLETON.register(require('../../../data/monaco-themes/vscode/hc_theia.json'), {
169
- './hc_black.json': require('../../../data/monaco-themes/vscode/hc_black.json')
170
- }, 'hc-theia', 'hc-black').name!;
172
+ export const DARK_DEFAULT_THEME = 'dark-theia';
173
+ export const LIGHT_DEFAULT_THEME = 'light-theia';
174
+ export const HC_DEFAULT_THEME = 'hc-theia';
171
175
  }