@theia/monaco 1.66.0-next.67 → 1.66.0-next.80

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.
@@ -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;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"}
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,EAAuC,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC3G,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"}
@@ -19,11 +19,12 @@ exports.MonacoColorRegistry = void 0;
19
19
  const tslib_1 = require("tslib");
20
20
  const inversify_1 = require("@theia/core/shared/inversify");
21
21
  const color_registry_1 = require("@theia/core/lib/browser/color-registry");
22
+ const color_1 = require("@theia/core/lib/common/color");
22
23
  const disposable_1 = require("@theia/core/lib/common/disposable");
23
24
  const colorRegistry_1 = require("@theia/monaco-editor-core/esm/vs/platform/theme/common/colorRegistry");
24
25
  const standaloneServices_1 = require("@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices");
25
26
  const standaloneTheme_1 = require("@theia/monaco-editor-core/esm/vs/editor/standalone/common/standaloneTheme");
26
- const color_1 = require("@theia/monaco-editor-core/esm/vs/base/common/color");
27
+ const color_2 = require("@theia/monaco-editor-core/esm/vs/base/common/color");
27
28
  const Colors = require("@theia/monaco-editor-core/esm/vs/platform/theme/common/colorRegistry");
28
29
  let MonacoColorRegistry = class MonacoColorRegistry extends color_registry_1.ColorRegistry {
29
30
  constructor() {
@@ -44,12 +45,11 @@ let MonacoColorRegistry = class MonacoColorRegistry extends color_registry_1.Col
44
45
  return this.monacoThemeService.getColorTheme().getColor(id);
45
46
  }
46
47
  doRegister(definition) {
47
- var _a, _b, _c, _d, _e, _f;
48
48
  const defaults = {
49
- dark: this.toColor((_a = definition.defaults) === null || _a === void 0 ? void 0 : _a.dark),
50
- light: this.toColor((_b = definition.defaults) === null || _b === void 0 ? void 0 : _b.light),
51
- hcDark: this.toColor((_d = (_c = definition.defaults) === null || _c === void 0 ? void 0 : _c.hcDark) !== null && _d !== void 0 ? _d : (_e = definition.defaults) === null || _e === void 0 ? void 0 : _e.hc),
52
- hcLight: this.toColor((_f = definition.defaults) === null || _f === void 0 ? void 0 : _f.hcLight),
49
+ dark: this.toColor(color_1.ColorDefaults.getDark(definition.defaults)),
50
+ light: this.toColor(color_1.ColorDefaults.getLight(definition.defaults)),
51
+ hcDark: this.toColor(color_1.ColorDefaults.getHCDark(definition.defaults)),
52
+ hcLight: this.toColor(color_1.ColorDefaults.getHCLight(definition.defaults)),
53
53
  };
54
54
  const identifier = this.monacoColorRegistry.registerColor(definition.id, defaults, definition.description);
55
55
  return disposable_1.Disposable.create(() => this.monacoColorRegistry.deregisterColor(identifier));
@@ -63,11 +63,11 @@ let MonacoColorRegistry = class MonacoColorRegistry extends color_registry_1.Col
63
63
  }
64
64
  else if ('r' in value) {
65
65
  const { r, g, b, a } = value;
66
- return new color_1.Color(new color_1.RGBA(r, g, b, a));
66
+ return new color_2.Color(new color_2.RGBA(r, g, b, a));
67
67
  }
68
68
  else {
69
69
  const { h, s, l, a } = value;
70
- return new color_1.Color(new color_1.HSLA(h, s, l, a));
70
+ return new color_2.Color(new color_2.HSLA(h, s, l, a));
71
71
  }
72
72
  }
73
73
  };
@@ -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":"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"}
package/package.json CHANGED
@@ -1,15 +1,15 @@
1
1
  {
2
2
  "name": "@theia/monaco",
3
- "version": "1.66.0-next.67+6fae23c43",
3
+ "version": "1.66.0-next.80+623c098dc",
4
4
  "description": "Theia - Monaco Extension",
5
5
  "dependencies": {
6
- "@theia/core": "1.66.0-next.67+6fae23c43",
7
- "@theia/editor": "1.66.0-next.67+6fae23c43",
8
- "@theia/filesystem": "1.66.0-next.67+6fae23c43",
9
- "@theia/markers": "1.66.0-next.67+6fae23c43",
6
+ "@theia/core": "1.66.0-next.80+623c098dc",
7
+ "@theia/editor": "1.66.0-next.80+623c098dc",
8
+ "@theia/filesystem": "1.66.0-next.80+623c098dc",
9
+ "@theia/markers": "1.66.0-next.80+623c098dc",
10
10
  "@theia/monaco-editor-core": "1.96.302",
11
- "@theia/outline-view": "1.66.0-next.67+6fae23c43",
12
- "@theia/workspace": "1.66.0-next.67+6fae23c43",
11
+ "@theia/outline-view": "1.66.0-next.80+623c098dc",
12
+ "@theia/workspace": "1.66.0-next.80+623c098dc",
13
13
  "fast-plist": "^0.1.2",
14
14
  "idb": "^4.0.5",
15
15
  "jsonc-parser": "^2.2.0",
@@ -57,5 +57,5 @@
57
57
  "nyc": {
58
58
  "extends": "../../configs/nyc.json"
59
59
  },
60
- "gitHead": "6fae23c43f4e850ef4dd6f7c85aa0422077f70e2"
60
+ "gitHead": "623c098dc2e331499458d2bdcc67792919335d9c"
61
61
  }
@@ -16,7 +16,7 @@
16
16
 
17
17
  import { injectable } from '@theia/core/shared/inversify';
18
18
  import { ColorRegistry } from '@theia/core/lib/browser/color-registry';
19
- import { Color, ColorDefinition } from '@theia/core/lib/common/color';
19
+ import { Color, ColorDefaults as TheiaColorDefaults, ColorDefinition } from '@theia/core/lib/common/color';
20
20
  import { Disposable } from '@theia/core/lib/common/disposable';
21
21
  import { ColorDefaults, ColorValue, getColorRegistry } from '@theia/monaco-editor-core/esm/vs/platform/theme/common/colorRegistry';
22
22
  import { StandaloneServices } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices';
@@ -46,10 +46,10 @@ export class MonacoColorRegistry extends ColorRegistry {
46
46
 
47
47
  protected override doRegister(definition: ColorDefinition): Disposable {
48
48
  const defaults: ColorDefaults = {
49
- dark: this.toColor(definition.defaults?.dark),
50
- light: this.toColor(definition.defaults?.light),
51
- hcDark: this.toColor(definition.defaults?.hcDark ?? definition.defaults?.hc),
52
- hcLight: this.toColor(definition.defaults?.hcLight),
49
+ dark: this.toColor(TheiaColorDefaults.getDark(definition.defaults)),
50
+ light: this.toColor(TheiaColorDefaults.getLight(definition.defaults)),
51
+ hcDark: this.toColor(TheiaColorDefaults.getHCDark(definition.defaults)),
52
+ hcLight: this.toColor(TheiaColorDefaults.getHCLight(definition.defaults)),
53
53
  };
54
54
  const identifier = this.monacoColorRegistry.registerColor(definition.id, defaults, definition.description);
55
55
  return Disposable.create(() => this.monacoColorRegistry.deregisterColor(identifier));