@theia/monaco 1.23.0-next.57 → 1.23.0-next.61

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 (18) hide show
  1. package/data/monaco-themes/vscode/dark_plus.json +19 -2
  2. package/data/monaco-themes/vscode/dark_vs.json +29 -5
  3. package/data/monaco-themes/vscode/hc_black.json +334 -3
  4. package/data/monaco-themes/vscode/light_plus.json +22 -4
  5. package/data/monaco-themes/vscode/light_vs.json +39 -10
  6. package/lib/browser/monaco-editor-provider.d.ts +2 -1
  7. package/lib/browser/monaco-editor-provider.d.ts.map +1 -1
  8. package/lib/browser/monaco-editor-provider.js +13 -7
  9. package/lib/browser/monaco-editor-provider.js.map +1 -1
  10. package/lib/browser/textmate/monaco-theme-registry.d.ts.map +1 -1
  11. package/lib/browser/textmate/monaco-theme-registry.js +0 -3
  12. package/lib/browser/textmate/monaco-theme-registry.js.map +1 -1
  13. package/package.json +7 -7
  14. package/src/browser/monaco-editor-provider.ts +19 -8
  15. package/src/browser/textmate/monaco-theme-registry.ts +0 -3
  16. package/data/monaco-themes/vscode/dark_defaults.json +0 -22
  17. package/data/monaco-themes/vscode/hc_black_defaults.json +0 -341
  18. package/data/monaco-themes/vscode/light_defaults.json +0 -21
package/lib/browser/monaco-editor-provider.js CHANGED
@@ -234,7 +234,7 @@ let MonacoEditorProvider = MonacoEditorProvider_1 = class MonacoEditorProvider {
234
234
  if (event) {
235
235
  const preferenceName = event.preferenceName;
236
236
  const overrideIdentifier = editor.document.languageId;
237
- const newValue = this.editorPreferences.get({ preferenceName, overrideIdentifier }, undefined, editor.uri.toString());
237
+ const newValue = this.preferenceValidator.validateByName(preferenceName, this.editorPreferences.get({ preferenceName, overrideIdentifier }, undefined, editor.uri.toString()));
238
238
  editor.getControl().updateOptions(this.setOption(preferenceName, newValue, this.preferencePrefixes));
239
239
  }
240
240
  else {
@@ -263,7 +263,7 @@ let MonacoEditorProvider = MonacoEditorProvider_1 = class MonacoEditorProvider {
263
263
  }
264
264
  const overrideIdentifier = editor.document.languageId;
265
265
  const uri = editor.uri.toString();
266
- const formatOnSave = this.editorPreferences.get({ preferenceName: 'editor.formatOnSave', overrideIdentifier }, undefined, uri);
266
+ const formatOnSave = this.preferenceValidator.validateByName('editor.formatOnSave', this.editorPreferences.get({ preferenceName: 'editor.formatOnSave', overrideIdentifier }, undefined, uri));
267
267
  if (formatOnSave) {
268
268
  const formatOnSaveTimeout = this.editorPreferences.get({ preferenceName: 'editor.formatOnSaveTimeout', overrideIdentifier }, undefined, uri);
269
269
  await Promise.race([
@@ -304,7 +304,7 @@ let MonacoEditorProvider = MonacoEditorProvider_1 = class MonacoEditorProvider {
304
304
  if (event) {
305
305
  const preferenceName = event.preferenceName;
306
306
  const overrideIdentifier = editor.document.languageId;
307
- const newValue = this.editorPreferences.get({ preferenceName, overrideIdentifier }, undefined, resourceUri);
307
+ const newValue = this.preferenceValidator.validateByName(preferenceName, this.editorPreferences.get({ preferenceName, overrideIdentifier }, undefined, resourceUri));
308
308
  editor.diffEditor.updateOptions(this.setOption(preferenceName, newValue, this.diffPreferencePrefixes));
309
309
  }
310
310
  else {
@@ -313,10 +313,12 @@ let MonacoEditorProvider = MonacoEditorProvider_1 = class MonacoEditorProvider {
313
313
  }
314
314
  }
315
315
  createOptions(prefixes, uri, overrideIdentifier) {
316
- return Object.keys(this.editorPreferences).reduce((options, preferenceName) => {
317
- const value = this.editorPreferences.get({ preferenceName, overrideIdentifier }, undefined, uri);
318
- return this.setOption(preferenceName, (0, common_1.deepClone)(value), prefixes, options);
319
- }, {});
316
+ const flat = {};
317
+ for (const preferenceName of Object.keys(this.editorPreferences)) {
318
+ flat[preferenceName] = this.editorPreferences.get({ preferenceName, overrideIdentifier }, undefined, uri);
319
+ }
320
+ const valid = this.preferenceValidator.validateOptions(flat);
321
+ return Object.entries(valid).reduce((tree, [preferenceName, value]) => this.setOption(preferenceName, (0, common_1.deepClone)(value), prefixes, tree), {});
320
322
  }
321
323
  setOption(preferenceName, value, prefixes, options = {}) {
322
324
  const optionName = this.toOptionName(preferenceName, prefixes);
@@ -469,6 +471,10 @@ __decorate([
469
471
  (0, inversify_1.inject)(monaco_quick_input_service_1.MonacoQuickInputImplementation),
470
472
  __metadata("design:type", monaco_quick_input_service_1.MonacoQuickInputImplementation)
471
473
  ], MonacoEditorProvider.prototype, "quickInputService", void 0);
474
+ __decorate([
475
+ (0, inversify_1.inject)(browser_2.PreferenceValidationService),
476
+ __metadata("design:type", browser_2.PreferenceValidationService)
477
+ ], MonacoEditorProvider.prototype, "preferenceValidator", void 0);
472
478
  MonacoEditorProvider = MonacoEditorProvider_1 = __decorate([
473
479
  (0, inversify_1.injectable)(),
474
480
  __param(0, (0, inversify_1.inject)(monaco_editor_service_1.MonacoEditorService)),
package/lib/browser/monaco-editor-provider.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"monaco-editor-provider.js","sourceRoot":"","sources":["../../src/browser/monaco-editor-provider.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"monaco-editor-provider.js","sourceRoot":"","sources":["../../src/browser/monaco-editor-provider.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;AACvD,oDAA6C;AAC7C,uDAAiH;AACjH,iEAA6D;AAC7D,4DAAyE;AACzE,mDAAqF;AACrF,sGAA2F;AAC3F,qEAAuE;AACvE,+DAAiE;AACjE,6DAAwD;AACxD,mFAA6E;AAC7E,mDAAqE;AACrE,+DAAoF;AACpF,mEAA8D;AAC9D,2EAAqE;AACrE,yDAAqD;AACrD,yEAAmE;AAGnE,sFAAgF;AAChF,sCAAmD;AACnD,qDAAgJ;AAChJ,6EAAwE;AAExE,iFAA2E;AAC3E,iFAA2E;AAC3E,2DAAsE;AACtE,6EAA8E;AAC9E,sEAAoE;AAEvD,QAAA,mBAAmB,GAAG,MAAM,CAAC,qBAAqB,CAAC,CAAC;AAOjE,IAAa,oBAAoB,4BAAjC,MAAa,oBAAoB;IAqC7B,YACoD,iBAAsC,EACnC,gBAAwC,EACtC,kBAA4C,EAC3C,GAA8B,EAC9B,GAA8B,EACxC,SAA0B,EACd,qBAAkD,EAC5D,iBAAoC,EAC3B,oBAAgD;IACvG,8BAA8B;IACgB,iBAAoC,EACX,iBAA6D;QAXpF,sBAAiB,GAAjB,iBAAiB,CAAqB;QACnC,qBAAgB,GAAhB,gBAAgB,CAAwB;QACtC,uBAAkB,GAAlB,kBAAkB,CAA0B;QAC3C,QAAG,GAAH,GAAG,CAA2B;QAC9B,QAAG,GAAH,GAAG,CAA2B;QACxC,cAAS,GAAT,SAAS,CAAiB;QACd,0BAAqB,GAArB,qBAAqB,CAA6B;QAC5D,sBAAiB,GAAjB,iBAAiB,CAAmB;QAC3B,yBAAoB,GAApB,oBAAoB,CAA4B;QAEzD,sBAAiB,GAAjB,iBAAiB,CAAmB;QACX,sBAAiB,GAAjB,iBAAiB,CAA4C;QAEpI,MAAM,cAAc,GAAG,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC;QACtD,MAAM,IAAI,GAAG,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;QAEtE,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,GAAG,CAAC,CAAC,EAAE;YACtC,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YACvB,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,kBAAkB,EAAE,iBAAiB,CAAC,CAAC;YACrE,OAAO,MAAM,CAAC;QAClB,CAAC,CAAC;IACN,CAAC;IA/BD;;;;OAIG;IACH,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IA0BS,KAAK,CAAC,QAAQ,CAAC,GAAQ,EAAE,SAA+B;QAC9D,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;QACxE,yHAAyH;QACzH,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE;YACzB,MAAM,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;SACjC;QACD,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE;YACzB,SAAS,CAAC,OAAO,EAAE,CAAC;YACpB,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,GAAG,CAAC,QAAQ,EAAE,cAAc,CAAC,EAAE,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC,CAAC;SAClG;QACD,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC1B,OAAO,SAAS,CAAC,MAAM,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,GAAQ;QACd,MAAM,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC;QACnC,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC;IAC1G,CAAC;IAES,KAAK,CAAC,cAAc,CAAC,GAAQ,EAAE,OAAsG;QAC3I,MAAM,cAAc,GAAG,IAAI,CAAC,qBAAqB,EAAE,CAAC;QACpD,MAAM,OAAO,GAAG,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC9C,MAAM,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QACvE,MAAM,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,GAAG,IAAI,CAAC;QACzE,MAAM,qBAAqB,GAAG,IAAI,CAAC,eAAe,CAAC;QACnD,MAAM,SAAS,GAAG,IAAI,6BAAoB,CAAC,cAAc,CAAC,CAAC;QAC3D,MAAM,aAAa,GAAG,IAAI,MAAM,CAAC,QAAQ,CAAC,aAAa,CAAC,iBAAiB,EAAE,cAAc,CAAC,CAAC;QAC3F,aAAa,CAAC,cAAc,CAAC;YACzB,IAAI,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,EAAE,OAAO,CAAC;SACvD,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC;YACzB,iBAAiB;YACjB,gBAAgB;YAChB,kBAAkB;YAClB,cAAc;YACd,qBAAqB;YACrB,iBAAiB;YACjB,aAAa;YACb,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;SAC5C,EAAE,SAAS,CAAC,CAAC;QACd,MAAM,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC;QAE5C,IAAI,CAAC,gCAAgC,CAAC,MAAM,CAAC,CAAC;QAC9C,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAAC;QAEtC,MAAM,wBAAwB,GAAG,IAAI,MAAM,CAAC,QAAQ,CAAC,wBAAwB,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;QAC3G,cAAc,CAAC,WAAW,CAAC,wBAAwB,CAAC,CAAC;QACrD,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAC,CAAC;QAEzD,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE;YAC3C,IAAI,OAAO,EAAE;gBACT,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC;aAC1B;QACL,CAAC,CAAC,CAAC,CAAC;QACJ,SAAS,CAAC,IAAI,CAAC,mBAAU,CAAC,MAAM,CAAC,GAAG,EAAE;YAClC,IAAI,IAAI,CAAC,QAAQ,KAAK,MAAM,EAAE;gBAC1B,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;aAC7B;QACL,CAAC,CAAC,CAAC,CAAC;QAEJ,OAAO,MAAM,CAAC;IAClB,CAAC;IAED;;OAEG;IACO,KAAK,CAAC,aAAa,CAAC,SAA8B,EAAE,aAAyF;QACnJ,IAAI,OAAO,GAAG,SAAS,CAAC;QACxB,IAAI,aAAa,EAAE;YACf,IAAI,YAAY,IAAI,aAAa,IAAI,aAAa,CAAC,UAAU,EAAE;gBAC3D,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,EAAuB;oBACxD,aAAa,EAAE;wBACX,IAAI,EAAE,aAAa;qBACtB;iBACJ,CAAC,CAAC;aACN;YACD,IAAI,cAAc,IAAI,aAAa,IAAI,aAAa,CAAC,YAAY,EAAE;gBAC/D,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,EAA0B;oBAC3D,YAAY,EAAE,IAAI;iBACrB,CAAC,CAAC;aACN;SACJ;QACD,MAAM,GAAG,GAAG,IAAI,aAAG,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC1C,IAAI;YACA,MAAM,IAAA,cAAI,EAAC,IAAI,CAAC,aAAa,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;YAC7C,OAAO,IAAI,CAAC;SACf;QAAC,OAAO,CAAC,EAAE;YACR,OAAO,CAAC,KAAK,CAAC,iBAAiB,GAAG,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;YACtD,OAAO,KAAK,CAAC;SAChB;IACL,CAAC;IAED;;;;OAIG;IACO,gCAAgC,CAAC,MAAoB;QAC3D,IAAI,eAA+C,CAAC;QACpD,MAAM,iBAAiB,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC,4BAA4B,CAAC;QAC3E,KAAK,MAAM,QAAQ,IAAI,iBAAiB,CAAC,MAAM,CAAC,UAAU,EAAE;YACxD,IAAK,QAAgB,CAAC,OAAO,CAAC,KAAK,SAAS,EAAE;gBAC1C,eAAe,GAAG,QAAQ,CAAC;gBAC3B,MAAM;aACT;SACJ;QACD,IAAI,eAAe,EAAE;YACjB,eAAe,CAAC,OAAO,EAAE,CAAC;SAC7B;IACL,CAAC;IAES,wBAAwB,CAAC,MAAoB;QACnD,MAAM,iBAAiB,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC,4BAA4B,CAAC;QAC3E,iBAAiB,CAAC,iBAAiB,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,qDAAwB,CAAC,qDAAwB,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC;QAC9J,iBAAiB,CAAC,oBAAoB,GAAG,aAAa,CAAC,EAAE;YACrD,MAAM,UAAU,GAAG,IAAI,MAAM,CAAC,WAAW,CAAC,gBAAgB,CACtD,aAAa,CAAC,OAAO,EACrB,aAAa,CAAC,QAAQ,EACtB,aAAa,CAAC,MAAM,EACpB,aAAa,CAAC,OAAO,EACrB,aAAa,CAAC,OAAO,CACxB,CAAC,OAAO,EAAE,CAAC;YACZ,OAAO,IAAI,qDAAwB,CAAC,qDAAwB,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC;QACnH,CAAC,CAAC;IACN,CAAC;IAES,YAAY,CAAC,GAAQ,EAAE,QAAiC,EAAE,SAA+B;QAC/F,IAAI,oBAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE;YACzB,OAAO,IAAI,CAAC,sBAAsB,CAAC,GAAG,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;SAChE;QACD,OAAO,IAAI,CAAC,kBAAkB,CAAC,GAAG,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;IAC7D,CAAC;IAED,IAAc,kBAAkB;QAC5B,OAAO,CAAC,SAAS,CAAC,CAAC;IACvB,CAAC;IACS,KAAK,CAAC,kBAAkB,CAAC,GAAQ,EAAE,QAAiC,EAAE,SAA+B;QAC3G,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QAClD,MAAM,OAAO,GAAG,IAAI,CAAC,yBAAyB,CAAC,KAAK,CAAC,CAAC;QACtD,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,gBAAgB,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC;QAC9F,MAAM,MAAM,GAAG,OAAO;YAClB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,CAAC;YAC1C,CAAC,CAAC,IAAI,4BAAY,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;QACpG,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,KAAK,CAAC,EAAE;YAC9D,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,KAAK,CAAC,UAAU,CAAC,EAAE;gBACjD,IAAI,CAAC,yBAAyB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;aACjD;QACL,CAAC,CAAC,CAAC,CAAC;QACJ,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,yBAAyB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACvF,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;QAC5F,OAAO,MAAM,CAAC;IAClB,CAAC;IACS,yBAAyB,CAAC,KAAwB;QACxD,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,kBAAkB,EAAE,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;QACzF,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC,eAAe,CAAC;QACtC,OAAO,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC;QAClC,OAAO,CAAC,mBAAmB,GAAG,KAAK,CAAC,mBAAmB,CAAC;QACxD,OAAO,OAAO,CAAC;IACnB,CAAC;IACS,yBAAyB,CAAC,MAAoB,EAAE,KAA8B;QACpF,IAAI,KAAK,EAAE;YACP,MAAM,cAAc,GAAG,KAAK,CAAC,cAAc,CAAC;YAC5C,MAAM,kBAAkB,GAAG,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC;YACtD,MAAM,QAAQ,GAAG,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAAC,cAAc,EACnE,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,cAAc,EAAE,kBAAkB,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CACvG,CAAC;YACF,MAAM,CAAC,UAAU,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,QAAQ,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAAC;SACxG;aAAM;YACH,MAAM,OAAO,GAAG,IAAI,CAAC,yBAAyB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YAChE,OAAO,OAAO,CAAC,KAAK,CAAC;YACrB,MAAM,CAAC,UAAU,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;SAC9C;IACL,CAAC;IAES,YAAY,CAAC,MAAoB,EAAE,KAA+B;;QACxE,IAAI,KAAK,CAAC,MAAM,KAAK,uDAAsB,CAAC,MAAM,EAAE;YAChD,OAAO,KAAK,CAAC;SAChB;QACD,IAAI,MAAA,KAAK,CAAC,OAAO,0CAAE,UAAU,EAAE;YAC3B,QAAQ,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE;gBAC9B,eAAkB,CAAC,CAAC,OAAO,IAAI,CAAC;gBAChC,gBAAmB,CAAC,CAAC,OAAO,KAAK,CAAC;gBAClC,kBAAqB,CAAC,CAAC,OAAO,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC;aACvD;SACJ;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAES,KAAK,CAAC,YAAY,CAAC,MAAoB,EAAE,KAA+B;QAC9E,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE;YACnC,OAAO,EAAE,CAAC;SACb;QACD,MAAM,kBAAkB,GAAG,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC;QACtD,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;QAClC,MAAM,YAAY,GAAG,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAAC,qBAAqB,EAC9E,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,cAAc,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,EAAE,SAAS,EAAE,GAAG,CAAE,CAC7G,CAAC;QACF,IAAI,YAAY,EAAE;YACd,MAAM,mBAAmB,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,cAAc,EAAE,4BAA4B,EAAE,kBAAkB,EAAE,EAAE,SAAS,EAAE,GAAG,CAAE,CAAC;YAC9I,MAAM,OAAO,CAAC,IAAI,CAAC;gBACf,IAAA,4BAAa,EAAC,mBAAmB,EAAE,gCAAgC,mBAAmB,IAAI,CAAC;gBAC3F,MAAM,CAAC,SAAS,CAAC,8BAA8B,CAAC;aACnD,CAAC,CAAC;SACN;QACD,MAAM,sBAAsB,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,EAAE,cAAc,EAAE,8BAA8B,EAAE,kBAAkB,EAAE,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;QAChJ,IAAI,sBAAsB,EAAE;YACxB,MAAM,MAAM,CAAC,SAAS,CAAC,sCAAsC,CAAC,CAAC;SAClE;QACD,OAAO,EAAE,CAAC;IACd,CAAC;IAED,IAAc,sBAAsB;QAChC,OAAO,CAAC,GAAG,IAAI,CAAC,kBAAkB,EAAE,aAAa,CAAC,CAAC;IACvD,CAAC;IACS,KAAK,CAAC,sBAAsB,CAAC,GAAQ,EAAE,QAAiC,EAAE,SAA+B;QAC/G,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,oBAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAElD,MAAM,CAAC,aAAa,EAAE,aAAa,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC;QAEnI,MAAM,OAAO,GAAG,IAAI,CAAC,6BAA6B,CAAC,aAAa,EAAE,aAAa,CAAC,CAAC;QACjF,MAAM,MAAM,GAAG,IAAI,qCAAgB,CAC/B,GAAG,EACH,QAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,EAC7B,aAAa,EAAE,aAAa,EAC5B,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,oBAAoB,EACzB,OAAO,EACP,QAAQ,CAAC,CAAC;QACd,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CAAC,KAAK,CAAC,EAAE;YAC9D,MAAM,eAAe,GAAG,QAAQ,CAAC,YAAY,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC;YAC9E,IAAI,KAAK,CAAC,OAAO,CAAC,eAAe,EAAE,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;gBAC5D,IAAI,CAAC,6BAA6B,CAAC,MAAM,EAAE,KAAK,EAAE,eAAe,CAAC,CAAC;aACtE;QACL,CAAC,CAAC,CAAC,CAAC;QACJ,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,6BAA6B,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAC3F,OAAO,MAAM,CAAC;IAClB,CAAC;IACS,6BAA6B,CAAC,QAA2B,EAAE,QAA2B;QAC5F,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,sBAAsB,EAAE,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;QACnG,OAAO,CAAC,gBAAgB,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC;QAC9C,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;QACrC,OAAO,OAAO,CAAC;IACnB,CAAC;IACS,6BAA6B,CAAC,MAAwB,EAAE,KAA8B,EAAE,WAAoB;QAClH,IAAI,KAAK,EAAE;YACP,MAAM,cAAc,GAAG,KAAK,CAAC,cAAc,CAAC;YAC5C,MAAM,kBAAkB,GAAG,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC;YACtD,MAAM,QAAQ,GAAG,IAAI,CAAC,mBAAmB,CAAC,cAAc,CAAC,cAAc,EACnE,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,cAAc,EAAE,kBAAkB,EAAE,EAAE,SAAS,EAAE,WAAW,CAAC,CAC7F,CAAC;YACF,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,QAAQ,EAAE,IAAI,CAAC,sBAAsB,CAAC,CAAC,CAAC;SAC1G;aAAM;YACH,MAAM,OAAO,GAAG,IAAI,CAAC,6BAA6B,CAAC,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC;YAC/F,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;SAC5C;IACL,CAAC;IAKS,aAAa,CAAC,QAAkB,EAAE,GAAW,EAAE,kBAA2B;QAChF,MAAM,IAAI,GAAwB,EAAE,CAAC;QACrC,KAAK,MAAM,cAAc,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,EAAE;YAC9D,IAAI,CAAC,cAAc,CAAC,GAAS,IAAI,CAAC,iBAAkB,CAAC,GAAG,CAAC,EAAE,cAAc,EAAE,kBAAkB,EAAE,EAAE,SAAS,EAAE,GAAG,CAAC,CAAC;SACpH;QACD,MAAM,KAAK,GAAG,IAAI,CAAC,mBAAmB,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QAC7D,OAAO,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,cAAc,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,cAAc,EAAE,IAAA,kBAAS,EAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;IACjJ,CAAC;IAES,SAAS,CAAC,cAAsB,EAAE,KAAU,EAAE,QAAkB,EAAE,UAAmC,EAAE;QAG7G,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;QAC/D,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,KAAK,EAAE,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QACxD,OAAO,OAAO,CAAC;IACnB,CAAC;IACS,YAAY,CAAC,cAAsB,EAAE,QAAkB;QAC7D,KAAK,MAAM,MAAM,IAAI,QAAQ,EAAE;YAC3B,IAAI,cAAc,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;gBACnC,OAAO,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;aAC/C;SACJ;QACD,OAAO,cAAc,CAAC;IAC1B,CAAC;IACS,WAAW,CAAC,GAA4B,EAAE,KAAU,EAAE,KAAe,EAAE,MAAc,CAAC;QAC5F,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;QACxB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YACZ,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC,EAAE;gBAC1B,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;gBACf,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;aACxD;iBAAM;gBACH,GAAG,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;aACrB;SACJ;IACL,CAAC;IAES,2BAA2B,CAAC,MAAoB;QACtD,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,EAAE,CAAC;QACpC,MAAM,oBAAoB,GAAG,OAAO,CAAC,cAAc,CAAC,qCAAqC,CAAC,CAAC;QAC3F,MAAM,qBAAqB,GAAG,oBAAoB,CAAC,cAAc,CAAC;QAClE,oBAAoB,CAAC,cAAc,GAAG,KAAK,EAAC,GAAG,EAAC,EAAE;YAC9C,IAAI,oBAAoB,CAAC,OAAO,EAAE;gBAC9B,oBAAoB,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;aACvC;YAED,oBAAoB,CAAC,uBAAuB,GAAG,IAAI,CAAC;YACpD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,eAAe,EAAE,CAAC;YAE7D,2FAA2F;YAC3F,MAAM,KAAK,GAAG,oBAAoB,CAAC,MAAM,CAAC;YAC1C,oBAAoB,CAAC,MAAM,GAAG,SAAS,CAAC;YAExC,oBAAoB,CAAC,cAAc,CAAC,cAAc,CAAC;gBAC/C,QAAQ,EAAE,GAAG,CAAC,GAAG;gBACjB,OAAO,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE;aAChC,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE;gBAC5B,oBAAoB,CAAC,MAAM,GAAG,KAAK,CAAC;gBACpC,oBAAoB,CAAC,uBAAuB,GAAG,KAAK,CAAC;gBACrD,IAAI,CAAC,YAAY,EAAE;oBACf,oBAAoB,CAAC,WAAW,EAAE,CAAC;oBACnC,OAAO;iBACV;gBACD,IAAI,YAAY,KAAK,OAAO,EAAE;oBAC1B,yFAAyF;oBACzF,oBAAoB,CAAC,MAAM,GAAG,SAAS,CAAC;oBAExC,gCAAgC;oBAChC,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;oBAC5B,OAAO,CAAC,KAAK,GAAG,GAAG,EAAE,GAAG,CAAC,CAAC;oBAC1B,oBAAoB,CAAC,WAAW,EAAE,CAAC;oBACnC,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC;oBAEtB,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAQ,CAAC;oBACnD,YAAY,CAAC,MAAM,GAAG,GAAG,EAAE,GAAG,CAAC,CAAC;oBAChC,YAAY,CAAC,cAAc,CAAC,qCAAqC,CAAC,CAAC,YAAY,CAAC,KAAK,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC;oBAC3G,OAAO;iBACV;gBAED,IAAI,oBAAoB,CAAC,OAAO,EAAE;oBAC9B,oBAAoB,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBACzC,oBAAoB,CAAC,OAAO,CAAC,oBAAoB,EAAE,CAAC;iBACvD;YAEL,CAAC,EAAE,CAAC,CAAM,EAAE,EAAE;gBACV,oBAAoB,CAAC,uBAAuB,GAAG,KAAK,CAAC;gBACrD,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;YACtC,CAAC,CAAC,CAAC;QACP,CAAC,CAAC;QACF,OAAO,mBAAU,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,oBAAoB,CAAC,cAAc,GAAG,qBAAqB,CAAC,CAAC;IAChG,CAAC;IAED,gBAAgB,CAAC,MAAkB;QAC/B,IAAI,MAAM,YAAY,qCAAgB,EAAE;YACpC,OAAO,MAAM,CAAC,aAAa,CAAC;SAC/B;QACD,OAAO,0DAA0B,CAAC,aAAa,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,GAAQ,EAAE,IAAiB,EAAE,OAA+B;QAC3E,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE;YAC1D,QAAQ,CAAC,kBAAkB,GAAG;gBAC1B,eAAe,EAAE,GAAG,EAAE,GAAa,CAAC;aACvC,CAAC;YACF,MAAM,QAAQ,GAAG,IAAI,uCAAiB,CAAC;gBACnC,GAAG;gBACH,YAAY,EAAE,KAAK,IAAI,EAAE,CAAC,EAAE;gBAC5B,OAAO,EAAE,GAAG,EAAE,GAAG,CAAC;aACrB,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;YACvB,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACzB,MAAM,KAAK,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,eAAe,CAAC;YACtD,OAAO,IAAI,4BAAY,CACnB,GAAG,EACH,QAAQ,EACR,IAAI,EACJ,IAAI,CAAC,QAAQ,EACb,MAAM,CAAC,MAAM,CAAC;gBACV,KAAK;gBACL,cAAc,EAAE,IAAI;gBACpB,UAAU,EAAE,KAAK;gBACjB,SAAS,EAAE,CAAC;gBACZ,SAAS,EAAE,CAAC;aACf,EAAE,sBAAoB,CAAC,aAAa,EAAE,OAAO,CAAC,EAC/C,QAAQ,CACX,CAAC;QACN,CAAC,CAAC,CAAC;IACP,CAAC;CAyBJ,CAAA;AAvBU,kCAAa,GAA6C;IAC7D,QAAQ,EAAE,IAAI;IACd,kBAAkB,EAAE,CAAC;IACrB,WAAW,EAAE,KAAK;IAClB,WAAW,EAAE,KAAK;IAClB,OAAO,EAAE,KAAK;IACd,mBAAmB,EAAE,KAAK;IAC1B,yBAAyB,EAAE,IAAI;IAC/B,kBAAkB,EAAE,KAAK;IACzB,SAAS,EAAE;QACP,UAAU,EAAE,QAAQ;KACvB;IACD,oBAAoB,EAAE,CAAC;IACvB,mBAAmB,EAAE,KAAK;IAC1B,oBAAoB,EAAE,KAAK;IAC3B,mBAAmB,EAAE,MAAM;IAC3B,oBAAoB,EAAE,IAAI;IAC1B,uBAAuB,EAAE,OAAO;IAChC,OAAO,EAAE;QACL,OAAO,EAAE,KAAK;KACjB;CACH,CAAA;AAjdF;IAFC,IAAA,kBAAM,EAAC,2BAAoB,CAAC;IAC5B,IAAA,iBAAK,EAAC,2BAAmB,CAAC;;uDAC6C;AAGxE;IADC,IAAA,kBAAM,EAAC,gDAAqB,CAAC;8BACM,gDAAqB;6DAAC;AAG1D;IADC,IAAA,kBAAM,EAAC,oCAAoB,CAAC;8BACA,oCAAoB;sDAAC;AAGlD;IADC,IAAA,kBAAM,EAAC,4BAAkB,CAAC;8BACY,4BAAkB;gEAAC;AAG1D;IADC,IAAA,kBAAM,EAAC,uBAAa,CAAC;;2DAC0B;AAGhD;IADC,IAAA,kBAAM,EAAC,+BAAqB,CAAC;;6DAC4B;AAG1D;IADC,IAAA,kBAAM,EAAC,2DAA8B,CAAC;8BACD,2DAA8B;+DAAC;AAGrE;IADC,IAAA,kBAAM,EAAC,qCAA2B,CAAC;8BACI,qCAA2B;iEAAC;AAzB3D,oBAAoB;IADhC,IAAA,sBAAU,GAAE;IAuCJ,WAAA,IAAA,kBAAM,EAAC,2CAAmB,CAAC,CAAA;IAC3B,WAAA,IAAA,kBAAM,EAAC,kDAAsB,CAAC,CAAA;IAC9B,WAAA,IAAA,kBAAM,EAAC,8CAAwB,CAAC,CAAA;IAChC,WAAA,IAAA,kBAAM,EAAC,wDAAyB,CAAC,CAAA;IACjC,WAAA,IAAA,kBAAM,EAAC,wDAAyB,CAAC,CAAA;IACjC,WAAA,IAAA,kBAAM,EAAC,kCAAe,CAAC,CAAA;IACvB,WAAA,IAAA,kBAAM,EAAC,oDAA2B,CAAC,CAAA;IACnC,WAAA,IAAA,kBAAM,EAAC,2BAAiB,CAAC,CAAA;IACzB,WAAA,IAAA,kBAAM,EAAC,0DAA0B,CAAC,CAAA;IAElC,WAAA,IAAA,kBAAM,EAAC,wCAAiB,CAAC,CAAA;IACzB,YAAA,IAAA,kBAAM,EAAC,MAAM,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAA;qCAXgB,2CAAmB;QACjB,kDAAsB;QAClB,8CAAwB;QACtC,wDAAyB;QACzB,wDAAyB;QAC7B,kCAAe,oBAGO,0DAA0B,UAGb,MAAM,CAAC,iBAAiB,CAAC,iBAAiB;GAjD/H,oBAAoB,CAudhC;AAvdY,oDAAoB"}
package/lib/browser/textmate/monaco-theme-registry.d.ts.map CHANGED
@@ -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;AAExE,MAAM,WAAW,QAAS,SAAQ,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,oBAAoB;CAAI;AACnF,MAAM,WAAW,kBAAmB,SAAQ,MAAM,CAAC,QAAQ,CAAC,gBAAgB;IACxE,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,MAAM,CAAC,KAAK,CAAC,KAAK,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS;CAY/F;AAED,yBAAiB,mBAAmB,CAAC;IAC1B,MAAM,SAAS,qBAA4B,CAAC;IAE5C,MAAM,kBAAkB,EAAE,MAIA,CAAC;IAC3B,MAAM,mBAAmB,EAAE,MAIL,CAAC;IACvB,MAAM,gBAAgB,EAAE,MAGC,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;AAExE,MAAM,WAAW,QAAS,SAAQ,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,oBAAoB;CAAI;AACnF,MAAM,WAAW,kBAAmB,SAAQ,MAAM,CAAC,QAAQ,CAAC,gBAAgB;IACxE,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,MAAM,CAAC,KAAK,CAAC,KAAK,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS;CAY/F;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"}
package/lib/browser/textmate/monaco-theme-registry.js CHANGED
@@ -140,17 +140,14 @@ exports.MonacoThemeRegistry = MonacoThemeRegistry;
140
140
  (function (MonacoThemeRegistry) {
141
141
  MonacoThemeRegistry.SINGLETON = new MonacoThemeRegistry();
142
142
  MonacoThemeRegistry.DARK_DEFAULT_THEME = MonacoThemeRegistry.SINGLETON.register(require('../../../data/monaco-themes/vscode/dark_theia.json'), {
143
- './dark_defaults.json': require('../../../data/monaco-themes/vscode/dark_defaults.json'),
144
143
  './dark_vs.json': require('../../../data/monaco-themes/vscode/dark_vs.json'),
145
144
  './dark_plus.json': require('../../../data/monaco-themes/vscode/dark_plus.json')
146
145
  }, 'dark-theia', 'vs-dark').name;
147
146
  MonacoThemeRegistry.LIGHT_DEFAULT_THEME = MonacoThemeRegistry.SINGLETON.register(require('../../../data/monaco-themes/vscode/light_theia.json'), {
148
- './light_defaults.json': require('../../../data/monaco-themes/vscode/light_defaults.json'),
149
147
  './light_vs.json': require('../../../data/monaco-themes/vscode/light_vs.json'),
150
148
  './light_plus.json': require('../../../data/monaco-themes/vscode/light_plus.json'),
151
149
  }, 'light-theia', 'vs').name;
152
150
  MonacoThemeRegistry.HC_DEFAULT_THEME = MonacoThemeRegistry.SINGLETON.register(require('../../../data/monaco-themes/vscode/hc_theia.json'), {
153
- './hc_black_defaults.json': require('../../../data/monaco-themes/vscode/hc_black_defaults.json'),
154
151
  './hc_black.json': require('../../../data/monaco-themes/vscode/hc_black.json')
155
152
  }, 'hc-theia', 'hc-black').name;
156
153
  })(MonacoThemeRegistry = exports.MonacoThemeRegistry || (exports.MonacoThemeRegistry = {}));
package/lib/browser/textmate/monaco-theme-registry.js.map CHANGED
@@ -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.23.0-next.57+ab55cbea5bd",
3
+ "version": "1.23.0-next.61+68b31a3c0b3",
4
4
  "description": "Theia - Monaco Extension",
5
5
  "dependencies": {
6
- "@theia/core": "1.23.0-next.57+ab55cbea5bd",
7
- "@theia/editor": "1.23.0-next.57+ab55cbea5bd",
8
- "@theia/filesystem": "1.23.0-next.57+ab55cbea5bd",
9
- "@theia/markers": "1.23.0-next.57+ab55cbea5bd",
6
+ "@theia/core": "1.23.0-next.61+68b31a3c0b3",
7
+ "@theia/editor": "1.23.0-next.61+68b31a3c0b3",
8
+ "@theia/filesystem": "1.23.0-next.61+68b31a3c0b3",
9
+ "@theia/markers": "1.23.0-next.61+68b31a3c0b3",
10
10
  "@theia/monaco-editor-core": "0.23.0",
11
- "@theia/outline-view": "1.23.0-next.57+ab55cbea5bd",
11
+ "@theia/outline-view": "1.23.0-next.61+68b31a3c0b3",
12
12
  "fast-plist": "^0.1.2",
13
13
  "idb": "^4.0.5",
14
14
  "jsonc-parser": "^2.2.0",
@@ -55,5 +55,5 @@
55
55
  "nyc": {
56
56
  "extends": "../../configs/nyc.json"
57
57
  },
58
- "gitHead": "ab55cbea5bd570863fae348d9abaf1a54f0c0624"
58
+ "gitHead": "68b31a3c0b3bdd7bb80ad97cd9cc276d7b1faa5f"
59
59
  }
package/src/browser/monaco-editor-provider.ts CHANGED
@@ -35,7 +35,7 @@ import { MonacoBulkEditService } from './monaco-bulk-edit-service';
35
35
  import IEditorOverrideServices = monaco.editor.IEditorOverrideServices;
36
36
  import { ApplicationServer } from '@theia/core/lib/common/application-protocol';
37
37
  import { ContributionProvider } from '@theia/core';
38
- import { KeybindingRegistry, OpenerService, open, WidgetOpenerOptions, FormatType } from '@theia/core/lib/browser';
38
+ import { KeybindingRegistry, OpenerService, open, WidgetOpenerOptions, FormatType, PreferenceValidationService } from '@theia/core/lib/browser';
39
39
  import { MonacoResolvedKeybinding } from './monaco-resolved-keybinding';
40
40
  import { HttpOpenHandlerOptions } from '@theia/core/lib/browser/http-open-handler';
41
41
  import { MonacoToProtocolConverter } from './monaco-to-protocol-converter';
@@ -75,6 +75,9 @@ export class MonacoEditorProvider {
75
75
  @inject(MonacoQuickInputImplementation)
76
76
  protected readonly quickInputService: MonacoQuickInputImplementation;
77
77
 
78
+ @inject(PreferenceValidationService)
79
+ protected readonly preferenceValidator: PreferenceValidationService;
80
+
78
81
  protected _current: MonacoEditor | undefined;
79
82
  /**
80
83
  * Returns the last focused MonacoEditor.
@@ -272,7 +275,9 @@ export class MonacoEditorProvider {
272
275
  if (event) {
273
276
  const preferenceName = event.preferenceName;
274
277
  const overrideIdentifier = editor.document.languageId;
275
- const newValue = this.editorPreferences.get({ preferenceName, overrideIdentifier }, undefined, editor.uri.toString());
278
+ const newValue = this.preferenceValidator.validateByName(preferenceName,
279
+ this.editorPreferences.get({ preferenceName, overrideIdentifier }, undefined, editor.uri.toString())
280
+ );
276
281
  editor.getControl().updateOptions(this.setOption(preferenceName, newValue, this.preferencePrefixes));
277
282
  } else {
278
283
  const options = this.createMonacoEditorOptions(editor.document);
@@ -301,7 +306,9 @@ export class MonacoEditorProvider {
301
306
  }
302
307
  const overrideIdentifier = editor.document.languageId;
303
308
  const uri = editor.uri.toString();
304
- const formatOnSave = this.editorPreferences.get({ preferenceName: 'editor.formatOnSave', overrideIdentifier }, undefined, uri)!;
309
+ const formatOnSave = this.preferenceValidator.validateByName('editor.formatOnSave',
310
+ this.editorPreferences.get({ preferenceName: 'editor.formatOnSave', overrideIdentifier }, undefined, uri)!
311
+ );
305
312
  if (formatOnSave) {
306
313
  const formatOnSaveTimeout = this.editorPreferences.get({ preferenceName: 'editor.formatOnSaveTimeout', overrideIdentifier }, undefined, uri)!;
307
314
  await Promise.race([
@@ -352,7 +359,9 @@ export class MonacoEditorProvider {
352
359
  if (event) {
353
360
  const preferenceName = event.preferenceName;
354
361
  const overrideIdentifier = editor.document.languageId;
355
- const newValue = this.editorPreferences.get({ preferenceName, overrideIdentifier }, undefined, resourceUri);
362
+ const newValue = this.preferenceValidator.validateByName(preferenceName,
363
+ this.editorPreferences.get({ preferenceName, overrideIdentifier }, undefined, resourceUri)
364
+ );
356
365
  editor.diffEditor.updateOptions(this.setOption(preferenceName, newValue, this.diffPreferencePrefixes));
357
366
  } else {
358
367
  const options = this.createMonacoDiffEditorOptions(editor.originalModel, editor.modifiedModel);
@@ -364,10 +373,12 @@ export class MonacoEditorProvider {
364
373
  protected createOptions(prefixes: string[], uri: string): { [name: string]: any };
365
374
  protected createOptions(prefixes: string[], uri: string, overrideIdentifier: string): { [name: string]: any };
366
375
  protected createOptions(prefixes: string[], uri: string, overrideIdentifier?: string): { [name: string]: any } {
367
- return Object.keys(this.editorPreferences).reduce((options, preferenceName) => {
368
- const value = (<any>this.editorPreferences).get({ preferenceName, overrideIdentifier }, undefined, uri);
369
- return this.setOption(preferenceName, deepClone(value), prefixes, options);
370
- }, {});
376
+ const flat: Record<string, any> = {};
377
+ for (const preferenceName of Object.keys(this.editorPreferences)) {
378
+ flat[preferenceName] = (<any>this.editorPreferences).get({ preferenceName, overrideIdentifier }, undefined, uri);
379
+ }
380
+ const valid = this.preferenceValidator.validateOptions(flat);
381
+ return Object.entries(valid).reduce((tree, [preferenceName, value]) => this.setOption(preferenceName, deepClone(value), prefixes, tree), {});
371
382
  }
372
383
 
373
384
  protected setOption(preferenceName: string, value: any, prefixes: string[], options: { [name: string]: any } = {}): {
package/src/browser/textmate/monaco-theme-registry.ts CHANGED
@@ -153,17 +153,14 @@ export namespace MonacoThemeRegistry {
153
153
  export const SINGLETON = new MonacoThemeRegistry();
154
154
 
155
155
  export const DARK_DEFAULT_THEME: string = SINGLETON.register(require('../../../data/monaco-themes/vscode/dark_theia.json'), {
156
- './dark_defaults.json': require('../../../data/monaco-themes/vscode/dark_defaults.json'),
157
156
  './dark_vs.json': require('../../../data/monaco-themes/vscode/dark_vs.json'),
158
157
  './dark_plus.json': require('../../../data/monaco-themes/vscode/dark_plus.json')
159
158
  }, 'dark-theia', 'vs-dark').name!;
160
159
  export const LIGHT_DEFAULT_THEME: string = SINGLETON.register(require('../../../data/monaco-themes/vscode/light_theia.json'), {
161
- './light_defaults.json': require('../../../data/monaco-themes/vscode/light_defaults.json'),
162
160
  './light_vs.json': require('../../../data/monaco-themes/vscode/light_vs.json'),
163
161
  './light_plus.json': require('../../../data/monaco-themes/vscode/light_plus.json'),
164
162
  }, 'light-theia', 'vs').name!;
165
163
  export const HC_DEFAULT_THEME: string = SINGLETON.register(require('../../../data/monaco-themes/vscode/hc_theia.json'), {
166
- './hc_black_defaults.json': require('../../../data/monaco-themes/vscode/hc_black_defaults.json'),
167
164
  './hc_black.json': require('../../../data/monaco-themes/vscode/hc_black.json')
168
165
  }, 'hc-theia', 'hc-black').name!;
169
166
  }
package/data/monaco-themes/vscode/dark_defaults.json DELETED
@@ -1,22 +0,0 @@
1
- {
2
- "$schema": "vscode://schemas/color-theme",
3
- "name": "Dark Default Colors",
4
- "colors": {
5
- "editor.background": "#1E1E1E",
6
- "editor.foreground": "#D4D4D4",
7
- "editor.inactiveSelectionBackground": "#3A3D41",
8
- "editorIndentGuide.background": "#404040",
9
- "editorIndentGuide.activeBackground": "#707070",
10
- "editor.selectionHighlightBackground": "#ADD6FF26",
11
- "list.dropBackground": "#383B3D",
12
- "activityBarBadge.background": "#007ACC",
13
- "sideBarTitle.foreground": "#BBBBBB",
14
- "input.placeholderForeground": "#A6A6A6",
15
- "settings.textInputBackground": "#292929",
16
- "settings.numberInputBackground": "#292929",
17
- "menu.background": "#252526",
18
- "menu.foreground": "#CCCCCC",
19
- "statusBarItem.remoteForeground": "#FFF",
20
- "statusBarItem.remoteBackground": "#16825D"
21
- }
22
- }