@theia/monaco 1.29.0-next.4 → 1.29.0-next.44

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 (31) hide show
  1. package/lib/browser/monaco-color-registry.d.ts +2 -0
  2. package/lib/browser/monaco-color-registry.d.ts.map +1 -1
  3. package/lib/browser/monaco-color-registry.js +5 -2
  4. package/lib/browser/monaco-color-registry.js.map +1 -1
  5. package/lib/browser/monaco-frontend-application-contribution.d.ts.map +1 -1
  6. package/lib/browser/monaco-frontend-application-contribution.js +10 -0
  7. package/lib/browser/monaco-frontend-application-contribution.js.map +1 -1
  8. package/lib/browser/monaco-indexed-db.d.ts +4 -1
  9. package/lib/browser/monaco-indexed-db.d.ts.map +1 -1
  10. package/lib/browser/monaco-indexed-db.js +18 -8
  11. package/lib/browser/monaco-indexed-db.js.map +1 -1
  12. package/lib/browser/monaco-quick-input-service.d.ts +5 -0
  13. package/lib/browser/monaco-quick-input-service.d.ts.map +1 -1
  14. package/lib/browser/monaco-quick-input-service.js +67 -10
  15. package/lib/browser/monaco-quick-input-service.js.map +1 -1
  16. package/lib/browser/monaco-snippet-suggest-provider.d.ts +1 -1
  17. package/lib/browser/monaco-snippet-suggest-provider.d.ts.map +1 -1
  18. package/lib/browser/monaco-snippet-suggest-provider.js +1 -1
  19. package/lib/browser/monaco-snippet-suggest-provider.js.map +1 -1
  20. package/lib/browser/monaco-theming-service.d.ts +4 -4
  21. package/lib/browser/monaco-theming-service.d.ts.map +1 -1
  22. package/lib/browser/monaco-theming-service.js +7 -7
  23. package/lib/browser/monaco-theming-service.js.map +1 -1
  24. package/package.json +7 -7
  25. package/src/browser/monaco-color-registry.ts +5 -2
  26. package/src/browser/monaco-frontend-application-contribution.ts +11 -0
  27. package/src/browser/monaco-indexed-db.ts +16 -9
  28. package/src/browser/monaco-quick-input-service.ts +66 -10
  29. package/src/browser/monaco-snippet-suggest-provider.ts +2 -2
  30. package/src/browser/monaco-theming-service.ts +7 -7
  31. package/src/browser/style/index.css +6 -0
package/lib/browser/monaco-color-registry.d.ts CHANGED
@@ -3,12 +3,14 @@ import { Color, ColorDefinition } from '@theia/core/lib/common/color';
3
3
  import { Disposable } from '@theia/core/lib/common/disposable';
4
4
  import { ColorValue } from '@theia/monaco-editor-core/esm/vs/platform/theme/common/colorRegistry';
5
5
  import { IStandaloneThemeService } from '@theia/monaco-editor-core/esm/vs/editor/standalone/common/standaloneTheme';
6
+ import { Color as MonacoColor } from '@theia/monaco-editor-core/esm/vs/base/common/color';
6
7
  import * as Colors from '@theia/monaco-editor-core/esm/vs/platform/theme/common/colorRegistry';
7
8
  export declare class MonacoColorRegistry extends ColorRegistry {
8
9
  protected readonly monacoThemeService: IStandaloneThemeService;
9
10
  protected readonly monacoColorRegistry: Colors.IColorRegistry;
10
11
  getColors(): IterableIterator<string>;
11
12
  getCurrentColor(id: string): string | undefined;
13
+ getColor(id: string): MonacoColor | undefined;
12
14
  protected doRegister(definition: ColorDefinition): Disposable;
13
15
  protected toColor(value: Color | undefined): ColorValue | null;
14
16
  }
package/lib/browser/monaco-color-registry.d.ts.map CHANGED
@@ -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,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;IAWtE,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;AACpH,OAAO,EAAE,KAAK,IAAI,WAAW,EAAc,MAAM,oDAAoD,CAAC;AACtG,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;IAIxD,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS;cAI1B,UAAU,CAAC,UAAU,EAAE,eAAe,GAAG,UAAU;IAWtE,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,GAAG,SAAS,GAAG,UAAU,GAAG,IAAI;CAejE"}
package/lib/browser/monaco-color-registry.js CHANGED
@@ -42,8 +42,11 @@ let MonacoColorRegistry = class MonacoColorRegistry extends color_registry_1.Col
42
42
  }
43
43
  }
44
44
  getCurrentColor(id) {
45
- const color = this.monacoThemeService.getColorTheme().getColor(id);
46
- return color && color.toString();
45
+ var _a;
46
+ return (_a = this.monacoThemeService.getColorTheme().getColor(id)) === null || _a === void 0 ? void 0 : _a.toString();
47
+ }
48
+ getColor(id) {
49
+ return this.monacoThemeService.getColorTheme().getColor(id);
47
50
  }
48
51
  doRegister(definition) {
49
52
  var _a, _b, _c, _d, _e, _f;
package/lib/browser/monaco-color-registry.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"monaco-color-registry.js","sourceRoot":"","sources":["../../src/browser/monaco-color-registry.ts"],"names":[],"mappings":"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"}
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;IA0ChE,CAAC;IAxCY,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,OAAO,MAAA,IAAI,CAAC,kBAAkB,CAAC,aAAa,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,0CAAE,QAAQ,EAAE,CAAC;IAC5E,CAAC;IAED,QAAQ,CAAC,EAAU;QACf,OAAO,IAAI,CAAC,kBAAkB,CAAC,aAAa,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAChE,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,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,MAAA,MAAA,UAAU,CAAC,QAAQ,0CAAE,MAAM,mCAAI,MAAA,UAAU,CAAC,QAAQ,0CAAE,EAAE,CAAC;YAC5E,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,MAAA,UAAU,CAAC,QAAQ,0CAAE,OAAO,CAAC;SACtD,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;AA7CY,mBAAmB;IAD/B,IAAA,sBAAU,GAAE;GACA,mBAAmB,CA6C/B;AA7CY,kDAAmB"}
package/lib/browser/monaco-frontend-application-contribution.d.ts.map CHANGED
@@ -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,UAAU,EAAE,iBAAiB,EAAE,+BAA+B,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC5K,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;AAMhE,qBACa,qCAAsC,YAAW,+BAA+B,EAAE,kBAAkB;IAG7G,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;IA+BtB,UAAU,IAAI,IAAI;IAElB,kBAAkB,CAAC,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,iBAAiB,GAAG,IAAI;IA2CzE;;;;OAIG;IACH,SAAS,CAAC,kCAAkC,IAAI,IAAI;CA+BvD"}
1
+ {"version":3,"file":"monaco-frontend-application-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-frontend-application-contribution.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,+BAA+B,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC5K,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;AAgBhE,qBACa,qCAAsC,YAAW,+BAA+B,EAAE,kBAAkB;IAG7G,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;IAgCtB,UAAU,IAAI,IAAI;IAElB,kBAAkB,CAAC,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,iBAAiB,GAAG,IAAI;IA2CzE;;;;OAIG;IACH,SAAS,CAAC,kCAAkC,IAAI,IAAI;CA+BvD"}
package/lib/browser/monaco-frontend-application-contribution.js CHANGED
@@ -44,10 +44,20 @@ const theme_1 = require("@theia/core/lib/common/theme");
44
44
  const editorOptions_1 = require("@theia/monaco-editor-core/esm/vs/editor/common/config/editorOptions");
45
45
  const core_1 = require("@theia/core");
46
46
  const editor_generated_preference_schema_1 = require("@theia/editor/lib/browser/editor-generated-preference-schema");
47
+ let theiaDidInitialize = false;
48
+ const originalInitialize = standaloneServices_1.StandaloneServices.initialize;
49
+ standaloneServices_1.StandaloneServices.initialize = overrides => {
50
+ if (!theiaDidInitialize) {
51
+ console.warn('Monaco was initialized before overrides were installed by Theia\'s initialization.'
52
+ + ' Please check the lifecycle of services that use Monaco and ensure that Monaco entities are not instantiated before Theia is initialized.', new Error());
53
+ }
54
+ return originalInitialize(overrides);
55
+ };
47
56
  let MonacoFrontendApplicationContribution = class MonacoFrontendApplicationContribution {
48
57
  init() {
49
58
  this.addAdditionalPreferenceValidations();
50
59
  const { codeEditorService, textModelService, contextKeyService, contextMenuService } = this;
60
+ theiaDidInitialize = true;
51
61
  standaloneServices_1.StandaloneServices.initialize({
52
62
  [codeEditorService_1.ICodeEditorService.toString()]: codeEditorService,
53
63
  [resolverService_1.ITextModelService.toString()]: textModelService,
package/lib/browser/monaco-frontend-application-contribution.js.map CHANGED
@@ -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,4DAAiF;AACjF,qDAA4K;AAC5K,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;AAChE,wDAA8D;AAC9D,uGAA2H;AAC3H,sCAA+C;AAC/C,qHAAmH;AAGnH,IAAa,qCAAqC,GAAlD,MAAa,qCAAqC;IA0BpC,IAAI;QACV,IAAI,CAAC,kCAAkC,EAAE,CAAC;QAC1C,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;;;WAGG;QACH,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;IAEtB,kBAAkB,CAAC,KAAiB,EAAE,SAA4B;QAC9D,IAAI,IAAA,sBAAc,EAAC,KAAK,CAAC,IAAI,CAAC,EAAE;YAC5B,MAAM,WAAW,GAAG,KAAK,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;YAClD,MAAM,cAAc,GAAG,KAAK,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;YACxD,IAAI,WAAW,EAAE;gBACb,cAAc;gBACd,SAAS,CAAC,OAAO,CAAC;;;;;8CAKY,WAAW;;;8CAGX,WAAW;;iBAExC,CAAC,CAAC;gBACH,4DAA4D;gBAC5D,SAAS,CAAC,OAAO,CAAC;;;;;;iBAMjB,CAAC,CAAC;aACN;YACD,IAAI,cAAc,EAAE;gBAChB,SAAS,CAAC,OAAO,CAAC;;6CAEW,cAAc;;;iBAG1C,CAAC,CAAC;aACN;SACJ;aAAM;YACH,SAAS,CAAC,OAAO,CAAC;;;;aAIjB,CAAC,CAAC;SACN;IACL,CAAC;IAED;;;;OAIG;IACO,kCAAkC;QACxC,IAAI,oBAA6F,CAAC;QAClG,IAAI,qBAA+F,CAAC;QACpG,IAAI,2BAAoG,CAAC;QACzG,KAAK,MAAM,SAAS,IAAI,qCAAqB,EAAE;YAC3C,+DAA+D;YAC/D,IAAI,oBAAoB,IAAI,qBAAqB,IAAI,2BAA2B,EAAE;gBAAE,MAAM;aAAE;YAC5F,IAAI,SAAS,CAAC,IAAI,KAAK,mCAAmC,EAAE;gBACxD,qBAAqB,GAAG,SAAS,CAAC,WAAkB,CAAC;aACxD;iBAAM,IAAI,SAAS,CAAC,IAAI,KAAK,yBAAyB,EAAE;gBACrD,2BAA2B,GAAG,SAAS,CAAC,WAAkB,CAAC;aAC9D;iBAAM,IAAI,SAAS,CAAC,IAAI,KAAK,uBAAuB,EAAE;gBACnD,oBAAoB,GAAG,SAAS,CAAC,WAAkB,CAAC;aACvD;YACD,sDAAsD;SACzD;QACD,IAAI,oBAAoB,IAAI,qBAAqB,IAAI,2BAA2B,EAAE;YAC9E,IAAI,EAAE,GAAG,GAAG,CAAC,CAAC,sEAAsE;YACpF,qCAAqB,CAAC,IAAI,CACtB,IAAI,oBAAoB,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,CAAC,EAAE,uBAAgB,EAAE,wEAAmC,CAAC,gBAAgB,CAAC,CAAC,EACxH,IAAI,qBAAqB,CAAC,EAAE,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,wEAAmC,CAAC,qBAAqB,CAAC,CAAC,EACjH,IAAI,qBAAqB,CAAC,EAAE,EAAE,EAAE,mBAAmB,EAAE,IAAI,EAAE,wEAAmC,CAAC,0BAA0B,CAAC,CAAC,EAC3H,IAAI,qBAAqB,CAAC,EAAE,EAAE,EAAE,oBAAoB,EAAE,IAAI,EAAE,wEAAmC,CAAC,2BAA2B,CAAC,CAAC,EAC7H,IAAI,qBAAqB,CAAC,EAAE,EAAE,EAAE,wBAAwB,EAAE,IAAI,EAAE,wEAAmC,CAAC,+BAA+B,CAAC,CAAC,EACrI,IAAI,qBAAqB,CAAC,EAAE,EAAE,EAAE,sBAAsB,EAAE,IAAI,EAAE,wEAAmC,CAAC,6BAA6B,CAAC,CAAC,EACjI,IAAI,2BAA2B,CAAC,EAAE,EAAE,EAAE,0BAA0B,EAAE,mBAAmB,EAAE,wEAAmC,CAAC,iCAAiC,CAAC,CAAC,IAAI,EAAE,wEAAmC,CAAC,iCAAiC,CAAC,CAAC,EAC3O,IAAI,qBAAqB,CAAC,EAAE,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,wEAAmC,CAAC,mBAAmB,CAAC,CAAC,EAC9G,IAAI,oBAAoB,CAAC,EAAE,EAAE,EAAE,2BAA2B,EAAE,KAAK,EAAE,CAAC,EAAE,uBAAgB,EAAE,wEAAmC,CAAC,kCAAkC,CAAC,CAAC,CACnK,CAAC;SACL;IACL,CAAC;CACJ,CAAA;AAvIG;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;;;;iEA8Bf;AAvDQ,qCAAqC;IADjD,IAAA,sBAAU,GAAE;GACA,qCAAqC,CA0IjD;AA1IY,sFAAqC"}
1
+ {"version":3,"file":"monaco-frontend-application-contribution.js","sourceRoot":"","sources":["../../src/browser/monaco-frontend-application-contribution.ts"],"names":[],"mappings":"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"}
package/lib/browser/monaco-indexed-db.d.ts CHANGED
@@ -4,6 +4,7 @@ import { ThemeService } from '@theia/core/lib/browser/theming';
4
4
  import * as monaco from '@theia/monaco-editor-core';
5
5
  import type { ThemeMix } from './textmate/monaco-theme-types';
6
6
  import { Theme } from '@theia/core/lib/common/theme';
7
+ import { Emitter, Event } from '@theia/core';
7
8
  export declare const monacoDB: Promise<idb.IDBPDatabase<unknown>> | undefined;
8
9
  export interface MonacoThemeState {
9
10
  id: string;
@@ -13,13 +14,15 @@ export interface MonacoThemeState {
13
14
  data: ThemeMix;
14
15
  }
15
16
  export declare namespace MonacoThemeState {
16
- function is(state: Object | undefined): state is MonacoThemeState;
17
+ function is(state: unknown): state is MonacoThemeState;
17
18
  }
18
19
  export declare function getThemes(): Promise<MonacoThemeState[]>;
19
20
  export declare function putTheme(state: MonacoThemeState): Disposable;
20
21
  export declare function deleteTheme(id: string): Promise<void>;
21
22
  export declare function stateToTheme(state: MonacoThemeState): Theme;
22
23
  export declare class ThemeServiceWithDB extends ThemeService {
24
+ protected onDidRetrieveThemeEmitter: Emitter<MonacoThemeState>;
25
+ get onDidRetrieveTheme(): Event<MonacoThemeState>;
23
26
  loadUserTheme(): void;
24
27
  protected loadUserThemeWithDB(): Promise<void>;
25
28
  }
package/lib/browser/monaco-indexed-db.d.ts.map CHANGED
@@ -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,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AAEpD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAC9D,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,CAU3D;AAOD,qBACa,kBAAmB,SAAQ,YAAY;IACvC,aAAa,IAAI,IAAI;cAId,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;CAUvD"}
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,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AAEpD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAa7C,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,OAAO,GAAG,KAAK,IAAI,gBAAgB,CAE5D;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,CAU3D;AAED,qBACa,kBAAmB,SAAQ,YAAY;IAChD,SAAS,CAAC,yBAAyB,4BAAmC;IACtE,IAAI,kBAAkB,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAEhD;IAEQ,aAAa,IAAI,IAAI;cAId,mBAAmB,IAAI,OAAO,CAAC,IAAI,CAAC;CAgBvD"}
package/lib/browser/monaco-indexed-db.js CHANGED
@@ -26,6 +26,7 @@ const idb = require("idb");
26
26
  const disposable_1 = require("@theia/core/lib/common/disposable");
27
27
  const theming_1 = require("@theia/core/lib/browser/theming");
28
28
  const inversify_1 = require("@theia/core/shared/inversify");
29
+ const core_1 = require("@theia/core");
29
30
  let _monacoDB;
30
31
  if ('indexedDB' in window) {
31
32
  _monacoDB = idb.openDB('theia-monaco', 1, {
@@ -95,23 +96,32 @@ function stateToTheme(state) {
95
96
  };
96
97
  }
97
98
  exports.stateToTheme = stateToTheme;
98
- async function getThemeFromDB(id) {
99
- const matchingState = (await getThemes()).find(theme => theme.id === id);
100
- return matchingState && stateToTheme(matchingState);
101
- }
102
99
  let ThemeServiceWithDB = class ThemeServiceWithDB extends theming_1.ThemeService {
100
+ constructor() {
101
+ super(...arguments);
102
+ this.onDidRetrieveThemeEmitter = new core_1.Emitter();
103
+ }
104
+ get onDidRetrieveTheme() {
105
+ return this.onDidRetrieveThemeEmitter.event;
106
+ }
103
107
  loadUserTheme() {
104
108
  this.loadUserThemeWithDB();
105
109
  }
106
110
  async loadUserThemeWithDB() {
107
- var _a, _b;
108
- const themeId = window.localStorage.getItem('theme') || this.defaultTheme.id;
109
- const theme = (_b = (_a = this.themes[themeId]) !== null && _a !== void 0 ? _a : await getThemeFromDB(themeId)) !== null && _b !== void 0 ? _b : this.defaultTheme;
111
+ var _a, _b, _c;
112
+ const themeId = (_a = window.localStorage.getItem(theming_1.ThemeService.STORAGE_KEY)) !== null && _a !== void 0 ? _a : this.defaultTheme.id;
113
+ const theme = (_c = (_b = this.themes[themeId]) !== null && _b !== void 0 ? _b : await getThemes().then(themes => {
114
+ const matchingTheme = themes.find(candidate => candidate.id === themeId);
115
+ if (matchingTheme) {
116
+ this.onDidRetrieveThemeEmitter.fire(matchingTheme);
117
+ return stateToTheme(matchingTheme);
118
+ }
119
+ })) !== null && _c !== void 0 ? _c : this.getTheme(themeId);
110
120
  // In case the theme comes from the DB.
111
121
  if (!this.themes[theme.id]) {
112
122
  this.themes[theme.id] = theme;
113
123
  }
114
- this.setCurrentTheme(theme.id);
124
+ this.setCurrentTheme(theme.id, false);
115
125
  this.deferredInitializer.resolve();
116
126
  }
117
127
  };
package/lib/browser/monaco-indexed-db.js.map CHANGED
@@ -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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"}
package/lib/browser/monaco-quick-input-service.d.ts CHANGED
@@ -7,6 +7,8 @@ import * as monaco from '@theia/monaco-editor-core';
7
7
  import { ResolvedKeybinding } from '@theia/monaco-editor-core/esm/vs/base/common/keybindings';
8
8
  import { IMatch } from '@theia/monaco-editor-core/esm/vs/base/common/filters';
9
9
  import { Event } from '@theia/core';
10
+ import { MonacoColorRegistry } from './monaco-color-registry';
11
+ import { ThemeService } from '@theia/core/lib/browser/theming';
10
12
  export interface IListElement {
11
13
  readonly index: number;
12
14
  readonly item: IQuickPickItem;
@@ -26,6 +28,8 @@ export declare class MonacoQuickInputImplementation implements IQuickInputServic
26
28
  controller: QuickInputController;
27
29
  quickAccess: IQuickAccessController;
28
30
  protected readonly shell: ApplicationShell;
31
+ protected readonly colorRegistry: MonacoColorRegistry;
32
+ protected readonly themeService: ThemeService;
29
33
  protected readonly contextKeyService: VSCodeContextKeyService;
30
34
  protected container: HTMLElement;
31
35
  private quickInputList;
@@ -54,6 +58,7 @@ export declare class MonacoQuickInputImplementation implements IQuickInputServic
54
58
  private initContainer;
55
59
  private initController;
56
60
  private getOptions;
61
+ private getStyles;
57
62
  }
58
63
  export declare class MonacoQuickInputService implements QuickInputService {
59
64
  private monacoService;
package/lib/browser/monaco-quick-input-service.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"monaco-quick-input-service.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-quick-input-service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"monaco-quick-input-service.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-quick-input-service.ts"],"names":[],"mappings":"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"}
package/lib/browser/monaco-quick-input-service.js CHANGED
@@ -46,6 +46,9 @@ const listWidget_1 = require("@theia/monaco-editor-core/esm/vs/base/browser/ui/l
46
46
  const instantiation_1 = require("@theia/monaco-editor-core/esm/vs/platform/instantiation/common/instantiation");
47
47
  const standaloneServices_1 = require("@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices");
48
48
  const core_1 = require("@theia/core");
49
+ const monaco_color_registry_1 = require("./monaco-color-registry");
50
+ const theming_1 = require("@theia/core/lib/browser/theming");
51
+ const standaloneTheme_1 = require("@theia/monaco-editor-core/esm/vs/editor/standalone/common/standaloneTheme");
49
52
  let MonacoQuickInputImplementation = class MonacoQuickInputImplementation {
50
53
  get backButton() { return this.controller.backButton; }
51
54
  get onShow() { return this.controller.onShow; }
@@ -57,6 +60,9 @@ let MonacoQuickInputImplementation = class MonacoQuickInputImplementation {
57
60
  this.controller.onShow(() => {
58
61
  this.container.style.top = this.shell.mainPanel.node.getBoundingClientRect().top + 'px';
59
62
  });
63
+ this.themeService.initialized.then(() => this.controller.applyStyles(this.getStyles()));
64
+ // Hook into the theming service of Monaco to ensure that the updates are ready.
65
+ standaloneServices_1.StandaloneServices.get(standaloneTheme_1.IStandaloneThemeService).onDidColorThemeChange(() => this.controller.applyStyles(this.getStyles()));
60
66
  }
61
67
  setContextKey(key) {
62
68
  if (key) {
@@ -121,33 +127,84 @@ let MonacoQuickInputImplementation = class MonacoQuickInputImplementation {
121
127
  this.controller.layout({ width: 600, height: 1200 }, 0);
122
128
  }
123
129
  getOptions() {
124
- const styles = {
125
- widget: {},
126
- list: {},
127
- inputBox: {},
128
- countBadge: {},
129
- button: {},
130
- progressBar: {},
131
- keybindingLabel: {},
132
- };
133
130
  const options = {
134
131
  idPrefix: 'quickInput_',
135
132
  container: this.container,
133
+ styles: { widget: {}, list: {}, inputBox: {}, countBadge: {}, button: {}, progressBar: {}, keybindingLabel: {}, },
136
134
  ignoreFocusOut: () => false,
137
135
  isScreenReaderOptimized: () => true,
138
136
  backKeybindingLabel: () => undefined,
139
137
  setContextKey: (id) => this.setContextKey(id),
140
138
  returnFocus: () => this.container.focus(),
141
139
  createList: (user, container, delegate, renderers, listOptions) => this.quickInputList = new listWidget_1.List(user, container, delegate, renderers, listOptions),
142
- styles,
143
140
  };
144
141
  return options;
145
142
  }
143
+ // @monaco-uplift
144
+ // Keep the styles up to date with https://github.com/microsoft/vscode/blob/7888ff3a6b104e9e2e3d0f7890ca92dd0828215f/src/vs/platform/quickinput/browser/quickInput.ts#L171.
145
+ getStyles() {
146
+ return {
147
+ widget: {},
148
+ list: {
149
+ listBackground: this.colorRegistry.getColor('quickInput.background'),
150
+ listInactiveFocusForeground: this.colorRegistry.getColor('quickInputList.focusForeground'),
151
+ listInactiveSelectionIconForeground: this.colorRegistry.getColor('quickInputList.focusIconForeground'),
152
+ listInactiveFocusBackground: this.colorRegistry.getColor('quickInputList.focusBackground'),
153
+ listFocusOutline: this.colorRegistry.getColor('activeContrastBorder'),
154
+ listInactiveFocusOutline: this.colorRegistry.getColor('activeContrastBorder'),
155
+ pickerGroupBorder: this.colorRegistry.getColor('pickerGroup.border'),
156
+ pickerGroupForeground: this.colorRegistry.getColor('pickerGroup.foreground')
157
+ },
158
+ inputBox: {
159
+ inputForeground: this.colorRegistry.getColor('inputForeground'),
160
+ inputBackground: this.colorRegistry.getColor('inputBackground'),
161
+ inputBorder: this.colorRegistry.getColor('inputBorder'),
162
+ inputValidationInfoBackground: this.colorRegistry.getColor('inputValidation.infoBackground'),
163
+ inputValidationInfoForeground: this.colorRegistry.getColor('inputValidation.infoForeground'),
164
+ inputValidationInfoBorder: this.colorRegistry.getColor('inputValidation.infoBorder'),
165
+ inputValidationWarningBackground: this.colorRegistry.getColor('inputValidation.warningBackground'),
166
+ inputValidationWarningForeground: this.colorRegistry.getColor('inputValidation.warningForeground'),
167
+ inputValidationWarningBorder: this.colorRegistry.getColor('inputValidation.warningBorder'),
168
+ inputValidationErrorBackground: this.colorRegistry.getColor('inputValidation.errorBackground'),
169
+ inputValidationErrorForeground: this.colorRegistry.getColor('inputValidation.errorForeground'),
170
+ inputValidationErrorBorder: this.colorRegistry.getColor('inputValidation.errorBorder'),
171
+ },
172
+ countBadge: {
173
+ badgeBackground: this.colorRegistry.getColor('badge.background'),
174
+ badgeForeground: this.colorRegistry.getColor('badge.foreground'),
175
+ badgeBorder: this.colorRegistry.getColor('contrastBorder')
176
+ },
177
+ button: {
178
+ buttonForeground: this.colorRegistry.getColor('button.foreground'),
179
+ buttonBackground: this.colorRegistry.getColor('button.background'),
180
+ buttonHoverBackground: this.colorRegistry.getColor('button.hoverBackground'),
181
+ buttonBorder: this.colorRegistry.getColor('contrastBorder')
182
+ },
183
+ progressBar: {
184
+ progressBarBackground: this.colorRegistry.getColor('progressBar.background')
185
+ },
186
+ keybindingLabel: {
187
+ keybindingLabelBackground: this.colorRegistry.getColor('keybindingLabe.background'),
188
+ keybindingLabelForeground: this.colorRegistry.getColor('keybindingLabel.foreground'),
189
+ keybindingLabelBorder: this.colorRegistry.getColor('keybindingLabel.border'),
190
+ keybindingLabelBottomBorder: this.colorRegistry.getColor('keybindingLabel.bottomBorder'),
191
+ keybindingLabelShadow: this.colorRegistry.getColor('widget.shadow')
192
+ },
193
+ };
194
+ }
146
195
  };
147
196
  __decorate([
148
197
  (0, inversify_1.inject)(browser_1.ApplicationShell),
149
198
  __metadata("design:type", browser_1.ApplicationShell)
150
199
  ], MonacoQuickInputImplementation.prototype, "shell", void 0);
200
+ __decorate([
201
+ (0, inversify_1.inject)(monaco_color_registry_1.MonacoColorRegistry),
202
+ __metadata("design:type", monaco_color_registry_1.MonacoColorRegistry)
203
+ ], MonacoQuickInputImplementation.prototype, "colorRegistry", void 0);
204
+ __decorate([
205
+ (0, inversify_1.inject)(theming_1.ThemeService),
206
+ __metadata("design:type", theming_1.ThemeService)
207
+ ], MonacoQuickInputImplementation.prototype, "themeService", void 0);
151
208
  __decorate([
152
209
  (0, inversify_1.inject)(contextKeyService_1.ContextKeyService),
153
210
  __metadata("design:type", contextKeyService_1.ContextKeyService)
package/lib/browser/monaco-quick-input-service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"monaco-quick-input-service.js","sourceRoot":"","sources":["../../src/browser/monaco-quick-input-service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"monaco-quick-input-service.js","sourceRoot":"","sources":["../../src/browser/monaco-quick-input-service.ts"],"names":[],"mappings":"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"}
package/lib/browser/monaco-snippet-suggest-provider.d.ts CHANGED
@@ -36,7 +36,7 @@ export interface JsonSerializedSnippet {
36
36
  description: string;
37
37
  }
38
38
  export declare namespace JsonSerializedSnippet {
39
- function is(obj: Object | undefined): obj is JsonSerializedSnippet;
39
+ function is(obj: unknown): obj is JsonSerializedSnippet;
40
40
  }
41
41
  export interface Snippet {
42
42
  readonly scopes: string[];
package/lib/browser/monaco-snippet-suggest-provider.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"monaco-snippet-suggest-provider.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-snippet-suggest-provider.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"monaco-snippet-suggest-provider.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-snippet-suggest-provider.ts"],"names":[],"mappings":"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"}
package/lib/browser/monaco-snippet-suggest-provider.js CHANGED
@@ -239,7 +239,7 @@ exports.MonacoSnippetSuggestProvider = MonacoSnippetSuggestProvider;
239
239
  var JsonSerializedSnippet;
240
240
  (function (JsonSerializedSnippet) {
241
241
  function is(obj) {
242
- return typeof obj === 'object' && 'body' in obj && 'prefix' in obj;
242
+ return !!obj && typeof obj === 'object' && 'body' in obj && 'prefix' in obj;
243
243
  }
244
244
  JsonSerializedSnippet.is = is;
245
245
  })(JsonSerializedSnippet = exports.JsonSerializedSnippet || (exports.JsonSerializedSnippet = {}));
package/lib/browser/monaco-snippet-suggest-provider.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"monaco-snippet-suggest-provider.js","sourceRoot":"","sources":["../../src/browser/monaco-snippet-suggest-provider.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"monaco-snippet-suggest-provider.js","sourceRoot":"","sources":["../../src/browser/monaco-snippet-suggest-provider.ts"],"names":[],"mappings":"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"}
package/lib/browser/monaco-theming-service.d.ts CHANGED
@@ -1,8 +1,7 @@
1
- import { ThemeService } from '@theia/core/lib/browser/theming';
2
1
  import URI from '@theia/core/lib/common/uri';
3
2
  import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
4
3
  import { MonacoThemeRegistry } from './textmate/monaco-theme-registry';
5
- import { MonacoThemeState } from './monaco-indexed-db';
4
+ import { MonacoThemeState, ThemeServiceWithDB } from './monaco-indexed-db';
6
5
  import { FileService } from '@theia/filesystem/lib/browser/file-service';
7
6
  import * as monaco from '@theia/monaco-editor-core';
8
7
  export interface MonacoTheme {
@@ -37,7 +36,7 @@ export interface MonacoThemeJson {
37
36
  export declare class MonacoThemingService {
38
37
  protected readonly fileService: FileService;
39
38
  protected readonly monacoThemeRegistry: MonacoThemeRegistry;
40
- protected readonly themeService: ThemeService;
39
+ protected readonly themeService: ThemeServiceWithDB;
41
40
  /** Register themes whose configuration needs to be loaded */
42
41
  register(theme: MonacoTheme, pending?: {
43
42
  [uri: string]: Promise<any>;
@@ -63,6 +62,7 @@ export declare class MonacoThemingService {
63
62
  protected doRegisterParsedTheme(state: MonacoThemeState): Disposable;
64
63
  protected restore(): Promise<void>;
65
64
  protected static toCssSelector(str: string): string;
66
- private cleanEmpty;
65
+ /** removes all invalid theming values */
66
+ private clean;
67
67
  }
68
68
  //# sourceMappingURL=monaco-theming-service.d.ts.map
package/lib/browser/monaco-theming-service.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"monaco-theming-service.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-theming-service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"monaco-theming-service.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-theming-service.ts"],"names":[],"mappings":"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"}
package/lib/browser/monaco-theming-service.js CHANGED
@@ -30,7 +30,6 @@ exports.MonacoThemingService = void 0;
30
30
  const inversify_1 = require("@theia/core/shared/inversify");
31
31
  const jsoncparser = require("jsonc-parser");
32
32
  const plistparser = require("fast-plist");
33
- const theming_1 = require("@theia/core/lib/browser/theming");
34
33
  const uri_1 = require("@theia/core/lib/common/uri");
35
34
  const disposable_1 = require("@theia/core/lib/common/disposable");
36
35
  const monaco_theme_registry_1 = require("./textmate/monaco-theme-registry");
@@ -89,7 +88,7 @@ let MonacoThemingService = MonacoThemingService_1 = class MonacoThemingService {
89
88
  return;
90
89
  }
91
90
  }
92
- this.cleanEmpty(json.colors);
91
+ this.clean(json.colors);
93
92
  return json;
94
93
  }
95
94
  doLoadTheme(themeUri, referencedPath, includes, pending, toDispose) {
@@ -103,6 +102,7 @@ let MonacoThemingService = MonacoThemingService_1 = class MonacoThemingService {
103
102
  this.monacoThemeRegistry.initializeDefaultThemes();
104
103
  this.updateBodyUiTheme();
105
104
  this.themeService.onDidColorThemeChange(() => this.updateBodyUiTheme());
105
+ this.themeService.onDidRetrieveTheme(theme => this.monacoThemeRegistry.setTheme(MonacoThemingService_1.toCssSelector(theme.id), theme.data));
106
106
  this.restore();
107
107
  }
108
108
  /** register a theme whose configuration has already been loaded */
@@ -144,10 +144,10 @@ let MonacoThemingService = MonacoThemingService_1 = class MonacoThemingService {
144
144
  }
145
145
  return str;
146
146
  }
147
- cleanEmpty(obj) {
147
+ /** removes all invalid theming values */
148
+ clean(obj) {
148
149
  for (const key in obj) {
149
- // eslint-disable-next-line no-null/no-null
150
- if ([null, undefined].includes(obj[key])) {
150
+ if (typeof obj[key] !== 'string') {
151
151
  delete obj[key];
152
152
  }
153
153
  }
@@ -162,8 +162,8 @@ __decorate([
162
162
  __metadata("design:type", monaco_theme_registry_1.MonacoThemeRegistry)
163
163
  ], MonacoThemingService.prototype, "monacoThemeRegistry", void 0);
164
164
  __decorate([
165
- (0, inversify_1.inject)(theming_1.ThemeService),
166
- __metadata("design:type", theming_1.ThemeService)
165
+ (0, inversify_1.inject)(monaco_indexed_db_1.ThemeServiceWithDB),
166
+ __metadata("design:type", monaco_indexed_db_1.ThemeServiceWithDB)
167
167
  ], MonacoThemingService.prototype, "themeService", void 0);
168
168
  MonacoThemingService = MonacoThemingService_1 = __decorate([
169
169
  (0, inversify_1.injectable)()
package/lib/browser/monaco-theming-service.js.map CHANGED
@@ -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":"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"}
package/package.json CHANGED
@@ -1,14 +1,14 @@
1
1
  {
2
2
  "name": "@theia/monaco",
3
- "version": "1.29.0-next.4+0c0f8c7a7ae",
3
+ "version": "1.29.0-next.44+a32c9597fad",
4
4
  "description": "Theia - Monaco Extension",
5
5
  "dependencies": {
6
- "@theia/core": "1.29.0-next.4+0c0f8c7a7ae",
7
- "@theia/editor": "1.29.0-next.4+0c0f8c7a7ae",
8
- "@theia/filesystem": "1.29.0-next.4+0c0f8c7a7ae",
9
- "@theia/markers": "1.29.0-next.4+0c0f8c7a7ae",
6
+ "@theia/core": "1.29.0-next.44+a32c9597fad",
7
+ "@theia/editor": "1.29.0-next.44+a32c9597fad",
8
+ "@theia/filesystem": "1.29.0-next.44+a32c9597fad",
9
+ "@theia/markers": "1.29.0-next.44+a32c9597fad",
10
10
  "@theia/monaco-editor-core": "1.67.2",
11
- "@theia/outline-view": "1.29.0-next.4+0c0f8c7a7ae",
11
+ "@theia/outline-view": "1.29.0-next.44+a32c9597fad",
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": "0c0f8c7a7aedd67930bf65d6f63d827721707d60"
57
+ "gitHead": "a32c9597fad7185a6d39697c054f4931cd785562"
58
58
  }
package/src/browser/monaco-color-registry.ts CHANGED
@@ -37,8 +37,11 @@ export class MonacoColorRegistry extends ColorRegistry {
37
37
  }
38
38
 
39
39
  override getCurrentColor(id: string): string | undefined {
40
- const color = this.monacoThemeService.getColorTheme().getColor(id);
41
- return color && color.toString();
40
+ return this.monacoThemeService.getColorTheme().getColor(id)?.toString();
41
+ }
42
+
43
+ getColor(id: string): MonacoColor | undefined {
44
+ return this.monacoThemeService.getColorTheme().getColor(id);
42
45
  }
43
46
 
44
47
  protected override doRegister(definition: ColorDefinition): Disposable {
package/src/browser/monaco-frontend-application-contribution.ts CHANGED
@@ -35,6 +35,16 @@ import { editorOptionsRegistry, IEditorOption } from '@theia/monaco-editor-core/
35
35
  import { MAX_SAFE_INTEGER } from '@theia/core';
36
36
  import { editorGeneratedPreferenceProperties } from '@theia/editor/lib/browser/editor-generated-preference-schema';
37
37
 
38
+ let theiaDidInitialize = false;
39
+ const originalInitialize = StandaloneServices.initialize;
40
+ StandaloneServices.initialize = overrides => {
41
+ if (!theiaDidInitialize) {
42
+ console.warn('Monaco was initialized before overrides were installed by Theia\'s initialization.'
43
+ + ' Please check the lifecycle of services that use Monaco and ensure that Monaco entities are not instantiated before Theia is initialized.', new Error());
44
+ }
45
+ return originalInitialize(overrides);
46
+ };
47
+
38
48
  @injectable()
39
49
  export class MonacoFrontendApplicationContribution implements FrontendApplicationContribution, StylingParticipant {
40
50
 
@@ -65,6 +75,7 @@ export class MonacoFrontendApplicationContribution implements FrontendApplicatio
65
75
  protected init(): void {
66
76
  this.addAdditionalPreferenceValidations();
67
77
  const { codeEditorService, textModelService, contextKeyService, contextMenuService } = this;
78
+ theiaDidInitialize = true;
68
79
  StandaloneServices.initialize({
69
80
  [ICodeEditorService.toString()]: codeEditorService,
70
81
  [ITextModelService.toString()]: textModelService,
package/src/browser/monaco-indexed-db.ts CHANGED
@@ -21,6 +21,7 @@ import * as monaco from '@theia/monaco-editor-core';
21
21
  import { injectable } from '@theia/core/shared/inversify';
22
22
  import type { ThemeMix } from './textmate/monaco-theme-types';
23
23
  import { Theme } from '@theia/core/lib/common/theme';
24
+ import { Emitter, Event } from '@theia/core';
24
25
 
25
26
  let _monacoDB: Promise<idb.IDBPDatabase> | undefined;
26
27
  if ('indexedDB' in window) {
@@ -43,7 +44,7 @@ export interface MonacoThemeState {
43
44
  data: ThemeMix
44
45
  }
45
46
  export namespace MonacoThemeState {
46
- export function is(state: Object | undefined): state is MonacoThemeState {
47
+ export function is(state: unknown): state is MonacoThemeState {
47
48
  return !!state && typeof state === 'object' && 'id' in state && 'label' in state && 'uiTheme' in state && 'data' in state;
48
49
  }
49
50
  }
@@ -99,25 +100,31 @@ export function stateToTheme(state: MonacoThemeState): Theme {
99
100
  };
100
101
  }
101
102
 
102
- async function getThemeFromDB(id: string): Promise<Theme | undefined> {
103
- const matchingState = (await getThemes()).find(theme => theme.id === id);
104
- return matchingState && stateToTheme(matchingState);
105
- }
106
-
107
103
  @injectable()
108
104
  export class ThemeServiceWithDB extends ThemeService {
105
+ protected onDidRetrieveThemeEmitter = new Emitter<MonacoThemeState>();
106
+ get onDidRetrieveTheme(): Event<MonacoThemeState> {
107
+ return this.onDidRetrieveThemeEmitter.event;
108
+ }
109
+
109
110
  override loadUserTheme(): void {
110
111
  this.loadUserThemeWithDB();
111
112
  }
112
113
 
113
114
  protected async loadUserThemeWithDB(): Promise<void> {
114
- const themeId = window.localStorage.getItem('theme') || this.defaultTheme.id;
115
- const theme = this.themes[themeId] ?? await getThemeFromDB(themeId) ?? this.defaultTheme;
115
+ const themeId = window.localStorage.getItem(ThemeService.STORAGE_KEY) ?? this.defaultTheme.id;
116
+ const theme = this.themes[themeId] ?? await getThemes().then(themes => {
117
+ const matchingTheme = themes.find(candidate => candidate.id === themeId);
118
+ if (matchingTheme) {
119
+ this.onDidRetrieveThemeEmitter.fire(matchingTheme);
120
+ return stateToTheme(matchingTheme);
121
+ }
122
+ }) ?? this.getTheme(themeId);
116
123
  // In case the theme comes from the DB.
117
124
  if (!this.themes[theme.id]) {
118
125
  this.themes[theme.id] = theme;
119
126
  }
120
- this.setCurrentTheme(theme.id);
127
+ this.setCurrentTheme(theme.id, false);
121
128
  this.deferredInitializer.resolve();
122
129
  }
123
130
  }
package/src/browser/monaco-quick-input-service.ts CHANGED
@@ -38,6 +38,9 @@ import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/stan
38
38
  import { IMatch } from '@theia/monaco-editor-core/esm/vs/base/common/filters';
39
39
  import { IListRenderer, IListVirtualDelegate } from '@theia/monaco-editor-core/esm/vs/base/browser/ui/list/list';
40
40
  import { Event } from '@theia/core';
41
+ import { MonacoColorRegistry } from './monaco-color-registry';
42
+ import { ThemeService } from '@theia/core/lib/browser/theming';
43
+ import { IStandaloneThemeService } from '@theia/monaco-editor-core/esm/vs/editor/standalone/common/standaloneTheme';
41
44
 
42
45
  // Copied from @vscode/src/vs/base/parts/quickInput/browser/quickInputList.ts
43
46
  export interface IListElement {
@@ -65,6 +68,12 @@ export class MonacoQuickInputImplementation implements IQuickInputService {
65
68
  @inject(ApplicationShell)
66
69
  protected readonly shell: ApplicationShell;
67
70
 
71
+ @inject(MonacoColorRegistry)
72
+ protected readonly colorRegistry: MonacoColorRegistry;
73
+
74
+ @inject(ThemeService)
75
+ protected readonly themeService: ThemeService;
76
+
68
77
  @inject(VSCodeContextKeyService)
69
78
  protected readonly contextKeyService: VSCodeContextKeyService;
70
79
 
@@ -83,6 +92,9 @@ export class MonacoQuickInputImplementation implements IQuickInputService {
83
92
  this.controller.onShow(() => {
84
93
  this.container.style.top = this.shell.mainPanel.node.getBoundingClientRect().top + 'px';
85
94
  });
95
+ this.themeService.initialized.then(() => this.controller.applyStyles(this.getStyles()));
96
+ // Hook into the theming service of Monaco to ensure that the updates are ready.
97
+ StandaloneServices.get(IStandaloneThemeService).onDidColorThemeChange(() => this.controller.applyStyles(this.getStyles()));
86
98
  }
87
99
 
88
100
  setContextKey(key: string | undefined): void {
@@ -168,18 +180,10 @@ export class MonacoQuickInputImplementation implements IQuickInputService {
168
180
  }
169
181
 
170
182
  private getOptions(): IQuickInputOptions {
171
- const styles: IQuickInputStyles = {
172
- widget: {},
173
- list: {},
174
- inputBox: {},
175
- countBadge: {},
176
- button: {},
177
- progressBar: {},
178
- keybindingLabel: {},
179
- };
180
183
  const options: IQuickInputOptions = {
181
184
  idPrefix: 'quickInput_',
182
185
  container: this.container,
186
+ styles: { widget: {}, list: {}, inputBox: {}, countBadge: {}, button: {}, progressBar: {}, keybindingLabel: {}, },
183
187
  ignoreFocusOut: () => false,
184
188
  isScreenReaderOptimized: () => true,
185
189
  backKeybindingLabel: () => undefined,
@@ -188,10 +192,62 @@ export class MonacoQuickInputImplementation implements IQuickInputService {
188
192
  createList: <T>(
189
193
  user: string, container: HTMLElement, delegate: IListVirtualDelegate<T>, renderers: IListRenderer<T, unknown>[], listOptions: IListOptions<T>
190
194
  ): List<T> => this.quickInputList = new List(user, container, delegate, renderers, listOptions),
191
- styles,
192
195
  };
193
196
  return options;
194
197
  }
198
+
199
+ // @monaco-uplift
200
+ // Keep the styles up to date with https://github.com/microsoft/vscode/blob/7888ff3a6b104e9e2e3d0f7890ca92dd0828215f/src/vs/platform/quickinput/browser/quickInput.ts#L171.
201
+ private getStyles(): IQuickInputStyles {
202
+ return {
203
+ widget: {},
204
+ list: {
205
+ listBackground: this.colorRegistry.getColor('quickInput.background'),
206
+ listInactiveFocusForeground: this.colorRegistry.getColor('quickInputList.focusForeground'),
207
+ listInactiveSelectionIconForeground: this.colorRegistry.getColor('quickInputList.focusIconForeground'),
208
+ listInactiveFocusBackground: this.colorRegistry.getColor('quickInputList.focusBackground'),
209
+ listFocusOutline: this.colorRegistry.getColor('activeContrastBorder'),
210
+ listInactiveFocusOutline: this.colorRegistry.getColor('activeContrastBorder'),
211
+ pickerGroupBorder: this.colorRegistry.getColor('pickerGroup.border'),
212
+ pickerGroupForeground: this.colorRegistry.getColor('pickerGroup.foreground')
213
+ },
214
+ inputBox: {
215
+ inputForeground: this.colorRegistry.getColor('inputForeground'),
216
+ inputBackground: this.colorRegistry.getColor('inputBackground'),
217
+ inputBorder: this.colorRegistry.getColor('inputBorder'),
218
+ inputValidationInfoBackground: this.colorRegistry.getColor('inputValidation.infoBackground'),
219
+ inputValidationInfoForeground: this.colorRegistry.getColor('inputValidation.infoForeground'),
220
+ inputValidationInfoBorder: this.colorRegistry.getColor('inputValidation.infoBorder'),
221
+ inputValidationWarningBackground: this.colorRegistry.getColor('inputValidation.warningBackground'),
222
+ inputValidationWarningForeground: this.colorRegistry.getColor('inputValidation.warningForeground'),
223
+ inputValidationWarningBorder: this.colorRegistry.getColor('inputValidation.warningBorder'),
224
+ inputValidationErrorBackground: this.colorRegistry.getColor('inputValidation.errorBackground'),
225
+ inputValidationErrorForeground: this.colorRegistry.getColor('inputValidation.errorForeground'),
226
+ inputValidationErrorBorder: this.colorRegistry.getColor('inputValidation.errorBorder'),
227
+ },
228
+ countBadge: {
229
+ badgeBackground: this.colorRegistry.getColor('badge.background'),
230
+ badgeForeground: this.colorRegistry.getColor('badge.foreground'),
231
+ badgeBorder: this.colorRegistry.getColor('contrastBorder')
232
+ },
233
+ button: {
234
+ buttonForeground: this.colorRegistry.getColor('button.foreground'),
235
+ buttonBackground: this.colorRegistry.getColor('button.background'),
236
+ buttonHoverBackground: this.colorRegistry.getColor('button.hoverBackground'),
237
+ buttonBorder: this.colorRegistry.getColor('contrastBorder')
238
+ },
239
+ progressBar: {
240
+ progressBarBackground: this.colorRegistry.getColor('progressBar.background')
241
+ },
242
+ keybindingLabel: {
243
+ keybindingLabelBackground: this.colorRegistry.getColor('keybindingLabe.background'),
244
+ keybindingLabelForeground: this.colorRegistry.getColor('keybindingLabel.foreground'),
245
+ keybindingLabelBorder: this.colorRegistry.getColor('keybindingLabel.border'),
246
+ keybindingLabelBottomBorder: this.colorRegistry.getColor('keybindingLabel.bottomBorder'),
247
+ keybindingLabelShadow: this.colorRegistry.getColor('widget.shadow')
248
+ },
249
+ };
250
+ }
195
251
  }
196
252
 
197
253
  @injectable()
package/src/browser/monaco-snippet-suggest-provider.ts CHANGED
@@ -249,8 +249,8 @@ export interface JsonSerializedSnippet {
249
249
  description: string;
250
250
  }
251
251
  export namespace JsonSerializedSnippet {
252
- export function is(obj: Object | undefined): obj is JsonSerializedSnippet {
253
- return typeof obj === 'object' && 'body' in obj && 'prefix' in obj;
252
+ export function is(obj: unknown): obj is JsonSerializedSnippet {
253
+ return !!obj && typeof obj === 'object' && 'body' in obj && 'prefix' in obj;
254
254
  }
255
255
  }
256
256
 
package/src/browser/monaco-theming-service.ts CHANGED
@@ -19,11 +19,10 @@
19
19
  import { injectable, inject } from '@theia/core/shared/inversify';
20
20
  import * as jsoncparser from 'jsonc-parser';
21
21
  import * as plistparser from 'fast-plist';
22
- import { ThemeService } from '@theia/core/lib/browser/theming';
23
22
  import URI from '@theia/core/lib/common/uri';
24
23
  import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
25
24
  import { MonacoThemeRegistry } from './textmate/monaco-theme-registry';
26
- import { getThemes, putTheme, MonacoThemeState, stateToTheme } from './monaco-indexed-db';
25
+ import { getThemes, putTheme, MonacoThemeState, stateToTheme, ThemeServiceWithDB } from './monaco-indexed-db';
27
26
  import { FileService } from '@theia/filesystem/lib/browser/file-service';
28
27
  import * as monaco from '@theia/monaco-editor-core';
29
28
 
@@ -61,7 +60,7 @@ export class MonacoThemingService {
61
60
 
62
61
  @inject(FileService) protected readonly fileService: FileService;
63
62
  @inject(MonacoThemeRegistry) protected readonly monacoThemeRegistry: MonacoThemeRegistry;
64
- @inject(ThemeService) protected readonly themeService: ThemeService;
63
+ @inject(ThemeServiceWithDB) protected readonly themeService: ThemeServiceWithDB;
65
64
 
66
65
  /** Register themes whose configuration needs to be loaded */
67
66
  register(theme: MonacoTheme, pending: { [uri: string]: Promise<any> } = {}): Disposable {
@@ -121,7 +120,7 @@ export class MonacoThemingService {
121
120
  return;
122
121
  }
123
122
  }
124
- this.cleanEmpty(json.colors);
123
+ this.clean(json.colors);
125
124
  return json;
126
125
  }
127
126
 
@@ -143,6 +142,7 @@ export class MonacoThemingService {
143
142
  this.monacoThemeRegistry.initializeDefaultThemes();
144
143
  this.updateBodyUiTheme();
145
144
  this.themeService.onDidColorThemeChange(() => this.updateBodyUiTheme());
145
+ this.themeService.onDidRetrieveTheme(theme => this.monacoThemeRegistry.setTheme(MonacoThemingService.toCssSelector(theme.id), theme.data));
146
146
  this.restore();
147
147
  }
148
148
 
@@ -193,10 +193,10 @@ export class MonacoThemingService {
193
193
  return str;
194
194
  }
195
195
 
196
- private cleanEmpty(obj: any): void {
196
+ /** removes all invalid theming values */
197
+ private clean(obj: any): void {
197
198
  for (const key in obj) {
198
- // eslint-disable-next-line no-null/no-null
199
- if ([null, undefined].includes(obj[key])) {
199
+ if (typeof obj[key] !== 'string') {
200
200
  delete obj[key];
201
201
  }
202
202
  }
package/src/browser/style/index.css CHANGED
@@ -278,3 +278,9 @@
278
278
  align-self: center;
279
279
  margin-right: 4px;
280
280
  }
281
+
282
+ .monaco-inputbox.error > .ibwrapper > .input,
283
+ .monaco-inputbox.warning > .ibwrapper > .input,
284
+ .monaco-inputbox.info > .ibwrapper > .input {
285
+ outline: 0 !important;
286
+ }