@theia/monaco 1.27.0-next.52 → 1.27.0-next.56

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 (11) hide show
  1. package/lib/browser/monaco-editor-provider.d.ts +1 -2
  2. package/lib/browser/monaco-editor-provider.d.ts.map +1 -1
  3. package/lib/browser/monaco-editor-provider.js +4 -9
  4. package/lib/browser/monaco-editor-provider.js.map +1 -1
  5. package/lib/browser/monaco-frontend-application-contribution.d.ts +6 -0
  6. package/lib/browser/monaco-frontend-application-contribution.d.ts.map +1 -1
  7. package/lib/browser/monaco-frontend-application-contribution.js +34 -0
  8. package/lib/browser/monaco-frontend-application-contribution.js.map +1 -1
  9. package/package.json +7 -7
  10. package/src/browser/monaco-editor-provider.ts +5 -15
  11. package/src/browser/monaco-frontend-application-contribution.ts +40 -0
package/lib/browser/monaco-editor-provider.d.ts CHANGED
@@ -13,7 +13,7 @@ import { MonacoWorkspace } from './monaco-workspace';
13
13
  import { MonacoBulkEditService } from './monaco-bulk-edit-service';
14
14
  import { ApplicationServer } from '@theia/core/lib/common/application-protocol';
15
15
  import { ContributionProvider } from '@theia/core';
16
- import { KeybindingRegistry, OpenerService, PreferenceValidationService } from '@theia/core/lib/browser';
16
+ import { KeybindingRegistry, OpenerService } from '@theia/core/lib/browser';
17
17
  import { MonacoToProtocolConverter } from './monaco-to-protocol-converter';
18
18
  import { ProtocolToMonacoConverter } from './protocol-to-monaco-converter';
19
19
  import { FileSystemPreferences } from '@theia/filesystem/lib/browser';
@@ -46,7 +46,6 @@ export declare class MonacoEditorProvider {
46
46
  protected readonly openerService: OpenerService;
47
47
  protected readonly filePreferences: FileSystemPreferences;
48
48
  protected readonly quickInputService: MonacoQuickInputImplementation;
49
- protected readonly preferenceValidator: PreferenceValidationService;
50
49
  protected _current: MonacoEditor | undefined;
51
50
  /**
52
51
  * Returns the last focused MonacoEditor.
package/lib/browser/monaco-editor-provider.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"monaco-editor-provider.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-editor-provider.ts"],"names":[],"mappings":"AAiBA,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAGjH,OAAO,EAAE,oBAAoB,EAAyB,MAAM,wBAAwB,CAAC;AAErF,OAAO,EAAE,2BAA2B,EAAE,MAAM,0BAA0B,CAAC;AACvE,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,sBAAsB,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAC7F,OAAO,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACpF,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAChF,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAyC,2BAA2B,EAAE,MAAM,yBAAyB,CAAC;AAGhJ,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,yBAAyB,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,8BAA8B,EAAE,MAAM,8BAA8B,CAAC;AAC9E,OAAO,EAAE,iBAAiB,EAAE,MAAM,gFAAgF,CAAC;AACnH,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AAGpD,OAAO,EAAkB,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,gEAAgE,CAAC;AAa1I,eAAO,MAAM,mBAAmB,eAAgC,CAAC;AACjE,MAAM,WAAW,mBAAmB;IAChC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,MAAM,CAAC,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,YAAY,CAAC,QAAQ,EAAE,gBAAgB,EAAE,sBAAsB,GAAG,YAAY,CAAC;CACnI;AAED,qBACa,oBAAoB;IAsCI,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,mBAAmB;IACtD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,sBAAsB;IACzD,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,wBAAwB;IAC9D,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,yBAAyB;IACjD,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,yBAAyB;IAC3D,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,eAAe;IACjC,SAAS,CAAC,QAAQ,CAAC,qBAAqB,EAAE,2BAA2B;IAC/E,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB;IAC9C,SAAS,CAAC,QAAQ,CAAC,oBAAoB,EAAE,0BAA0B;IACvG,8BAA8B;IACH,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB;IACvD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB;IA7CtF,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,oBAAoB,CAAC,mBAAmB,CAAC,CAAC;IAGxE,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,qBAAqB,CAAC;IAG1D,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,oBAAoB,CAAC;IAGlD,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAG1D,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAGhD,SAAS,CAAC,QAAQ,CAAC,eAAe,EAAE,qBAAqB,CAAC;IAG1D,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,8BAA8B,CAAC;IAGrE,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,2BAA2B,CAAC;IAEpE,SAAS,CAAC,QAAQ,EAAE,YAAY,GAAG,SAAS,CAAC;IAC7C;;;;OAIG;IACH,IAAI,OAAO,IAAI,YAAY,GAAG,SAAS,CAEtC;gBAGmD,iBAAiB,EAAE,mBAAmB,EACnC,gBAAgB,EAAE,sBAAsB,EACtC,kBAAkB,EAAE,wBAAwB,EAC3C,GAAG,EAAE,yBAAyB,EAC9B,GAAG,EAAE,yBAAyB,EACxC,SAAS,EAAE,eAAe,EACd,qBAAqB,EAAE,2BAA2B,EAC5D,iBAAiB,EAAE,iBAAiB,EAC3B,oBAAoB,EAAE,0BAA0B;IACvG,8BAA8B;IACgB,iBAAiB,EAAE,iBAAiB,EACpC,iBAAiB,EAAE,iBAAiB;cAOtE,QAAQ,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,oBAAoB,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAczF,GAAG,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,YAAY,CAAC;cAK1B,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,EAAE,CAC9C,QAAQ,EAAE,sBAAsB,EAAE,SAAS,EAAE,oBAAoB,KAAK,OAAO,CAAC,YAAY,CAAC,GAC5F,OAAO,CAAC,YAAY,CAAC;IA2CxB;;OAEG;cACa,aAAa,CAAC,SAAS,EAAE,MAAM,CAAC,GAAG,GAAG,MAAM,EAAE,aAAa,CAAC,EAAE,mBAAmB,GAAG,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC;IA0B1I,SAAS,CAAC,wBAAwB,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;IAe9D,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,sBAAsB,EAAE,SAAS,EAAE,oBAAoB,GAAG,OAAO,CAAC,YAAY,CAAC;IAO1H,SAAS,KAAK,kBAAkB,IAAI,MAAM,EAAE,CAE3C;cACe,kBAAkB,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,sBAAsB,EAAE,SAAS,EAAE,oBAAoB,GAAG,OAAO,CAAC,YAAY,CAAC;IAgBtI,SAAS,CAAC,yBAAyB,CAAC,KAAK,EAAE,iBAAiB,GAAG,YAAY,CAAC,QAAQ;IAOpF,SAAS,CAAC,yBAAyB,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,CAAC,EAAE,sBAAsB,GAAG,IAAI;IAe/F,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,wBAAwB,GAAG,OAAO;cActE,YAAY,CAAC,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,wBAAwB,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,8BAA8B,EAAE,CAAC;IAuB5I,SAAS,KAAK,sBAAsB,IAAI,MAAM,EAAE,CAE/C;cACe,sBAAsB,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,sBAAsB,EAAE,SAAS,EAAE,oBAAoB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAuB9I,SAAS,CAAC,6BAA6B,CAAC,QAAQ,EAAE,iBAAiB,EAAE,QAAQ,EAAE,iBAAiB,GAAG,gBAAgB,CAAC,QAAQ;IAM5H,SAAS,CAAC,6BAA6B,CAAC,MAAM,EAAE,gBAAgB,EAAE,KAAK,CAAC,EAAE,sBAAsB,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI;IAc7H,kEAAkE;IAClE,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,GAAG;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE;IACjF,SAAS,CAAC,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,GAAG;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE;IAU7G,SAAS,CAAC,SAAS,CAAC,cAAc,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,OAAO,GAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAA;KAAO,GAAG;QAChH,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC;KACvB;IAKD,SAAS,CAAC,YAAY,CAAC,cAAc,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,MAAM;IAQ1E,SAAS,CAAC,WAAW,CAAC,GAAG,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,GAAG,GAAE,MAAU,GAAG,IAAI;IAYvG,gBAAgB,CAAC,MAAM,EAAE,UAAU,GAAG,aAAa;IAO7C,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,YAAY,CAAC,QAAQ,GAAG,OAAO,CAAC,YAAY,CAAC;IA4BvG,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,0BAA0B,CAqB5D;CAEL"}
1
+ {"version":3,"file":"monaco-editor-provider.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-editor-provider.ts"],"names":[],"mappings":"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"}
package/lib/browser/monaco-editor-provider.js CHANGED
@@ -225,7 +225,7 @@ let MonacoEditorProvider = MonacoEditorProvider_1 = class MonacoEditorProvider {
225
225
  if (event) {
226
226
  const preferenceName = event.preferenceName;
227
227
  const overrideIdentifier = editor.document.languageId;
228
- const newValue = this.preferenceValidator.validateByName(preferenceName, this.editorPreferences.get({ preferenceName, overrideIdentifier }, undefined, editor.uri.toString()));
228
+ const newValue = this.editorPreferences.get({ preferenceName, overrideIdentifier }, undefined, editor.uri.toString());
229
229
  editor.getControl().updateOptions(this.setOption(preferenceName, newValue, this.preferencePrefixes));
230
230
  }
231
231
  else {
@@ -254,7 +254,7 @@ let MonacoEditorProvider = MonacoEditorProvider_1 = class MonacoEditorProvider {
254
254
  }
255
255
  const overrideIdentifier = editor.document.languageId;
256
256
  const uri = editor.uri.toString();
257
- const formatOnSave = this.preferenceValidator.validateByName('editor.formatOnSave', this.editorPreferences.get({ preferenceName: 'editor.formatOnSave', overrideIdentifier }, undefined, uri));
257
+ const formatOnSave = this.editorPreferences.get({ preferenceName: 'editor.formatOnSave', overrideIdentifier }, undefined, uri);
258
258
  if (formatOnSave) {
259
259
  const formatOnSaveTimeout = this.editorPreferences.get({ preferenceName: 'editor.formatOnSaveTimeout', overrideIdentifier }, undefined, uri);
260
260
  await Promise.race([
@@ -295,7 +295,7 @@ let MonacoEditorProvider = MonacoEditorProvider_1 = class MonacoEditorProvider {
295
295
  if (event) {
296
296
  const preferenceName = event.preferenceName;
297
297
  const overrideIdentifier = editor.document.languageId;
298
- const newValue = this.preferenceValidator.validateByName(preferenceName, this.editorPreferences.get({ preferenceName, overrideIdentifier }, undefined, resourceUri));
298
+ const newValue = this.editorPreferences.get({ preferenceName, overrideIdentifier }, undefined, resourceUri);
299
299
  editor.diffEditor.updateOptions(this.setOption(preferenceName, newValue, this.diffPreferencePrefixes));
300
300
  }
301
301
  else {
@@ -308,8 +308,7 @@ let MonacoEditorProvider = MonacoEditorProvider_1 = class MonacoEditorProvider {
308
308
  for (const preferenceName of Object.keys(this.editorPreferences)) {
309
309
  flat[preferenceName] = this.editorPreferences.get({ preferenceName, overrideIdentifier }, undefined, uri);
310
310
  }
311
- const valid = this.preferenceValidator.validateOptions(flat);
312
- return Object.entries(valid).reduce((tree, [preferenceName, value]) => this.setOption(preferenceName, (0, common_1.deepClone)(value), prefixes, tree), {});
311
+ return Object.entries(flat).reduce((tree, [preferenceName, value]) => this.setOption(preferenceName, (0, common_1.deepClone)(value), prefixes, tree), {});
313
312
  }
314
313
  setOption(preferenceName, value, prefixes, options = {}) {
315
314
  const optionName = this.toOptionName(preferenceName, prefixes);
@@ -414,10 +413,6 @@ __decorate([
414
413
  (0, inversify_1.inject)(monaco_quick_input_service_1.MonacoQuickInputImplementation),
415
414
  __metadata("design:type", monaco_quick_input_service_1.MonacoQuickInputImplementation)
416
415
  ], MonacoEditorProvider.prototype, "quickInputService", void 0);
417
- __decorate([
418
- (0, inversify_1.inject)(browser_2.PreferenceValidationService),
419
- __metadata("design:type", browser_2.PreferenceValidationService)
420
- ], MonacoEditorProvider.prototype, "preferenceValidator", void 0);
421
416
  MonacoEditorProvider = MonacoEditorProvider_1 = __decorate([
422
417
  (0, inversify_1.injectable)(),
423
418
  __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":"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"}
package/lib/browser/monaco-frontend-application-contribution.d.ts CHANGED
@@ -17,5 +17,11 @@ export declare class MonacoFrontendApplicationContribution implements FrontendAp
17
17
  protected init(): void;
18
18
  initialize(): void;
19
19
  registerThemeStyle(theme: ColorTheme, collector: CssStyleCollector): void;
20
+ /**
21
+ * For reasons that are unclear, while most preferences that apply in editors are validated, a few are not.
22
+ * There is a utility in `examples/api-samples/src/browser/monaco-editor-preferences/monaco-editor-preference-extractor.ts` to help determine which are not.
23
+ * Check `src/vs/editor/common/config/editorOptions.ts` for constructor arguments and to make sure that the preference names used to extract constructors are still accurate.
24
+ */
25
+ protected addAdditionalPreferenceValidations(): void;
20
26
  }
21
27
  //# sourceMappingURL=monaco-frontend-application-contribution.d.ts.map
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;AAGhE,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;IA2BtB,UAAU,IAAI,IAAI;IAElB,kBAAkB,CAAC,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,iBAAiB,GAAG,IAAI;CA2C5E"}
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;IA4BtB,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
@@ -41,8 +41,12 @@ const contextView_1 = require("@theia/monaco-editor-core/esm/vs/platform/context
41
41
  const monaco_context_menu_1 = require("./monaco-context-menu");
42
42
  const monaco_theming_service_1 = require("./monaco-theming-service");
43
43
  const theme_1 = require("@theia/core/lib/common/theme");
44
+ const editorOptions_1 = require("@theia/monaco-editor-core/esm/vs/editor/common/config/editorOptions");
45
+ const core_1 = require("@theia/core");
46
+ const editor_generated_preference_schema_1 = require("@theia/editor/lib/browser/editor-generated-preference-schema");
44
47
  let MonacoFrontendApplicationContribution = class MonacoFrontendApplicationContribution {
45
48
  init() {
49
+ this.addAdditionalPreferenceValidations();
46
50
  const { codeEditorService, textModelService, contextKeyService, contextMenuService } = this;
47
51
  standaloneServices_1.StandaloneServices.initialize({
48
52
  [codeEditorService_1.ICodeEditorService.toString()]: codeEditorService,
@@ -109,6 +113,36 @@ let MonacoFrontendApplicationContribution = class MonacoFrontendApplicationContr
109
113
  `);
110
114
  }
111
115
  }
116
+ /**
117
+ * For reasons that are unclear, while most preferences that apply in editors are validated, a few are not.
118
+ * There is a utility in `examples/api-samples/src/browser/monaco-editor-preferences/monaco-editor-preference-extractor.ts` to help determine which are not.
119
+ * Check `src/vs/editor/common/config/editorOptions.ts` for constructor arguments and to make sure that the preference names used to extract constructors are still accurate.
120
+ */
121
+ addAdditionalPreferenceValidations() {
122
+ let editorIntConstructor;
123
+ let editorBoolConstructor;
124
+ let editorStringEnumConstructor;
125
+ for (const validator of editorOptions_1.editorOptionsRegistry) {
126
+ /* eslint-disable @typescript-eslint/no-explicit-any,max-len */
127
+ if (editorIntConstructor && editorBoolConstructor && editorStringEnumConstructor) {
128
+ break;
129
+ }
130
+ if (validator.name === 'acceptSuggestionOnCommitCharacter') {
131
+ editorBoolConstructor = validator.constructor;
132
+ }
133
+ else if (validator.name === 'acceptSuggestionOnEnter') {
134
+ editorStringEnumConstructor = validator.constructor;
135
+ }
136
+ else if (validator.name === 'accessibilityPageSize') {
137
+ editorIntConstructor = validator.constructor;
138
+ }
139
+ /* eslint-enable @typescript-eslint/no-explicit-any */
140
+ }
141
+ if (editorIntConstructor && editorBoolConstructor && editorStringEnumConstructor) {
142
+ let id = 200; // Needs to be bigger than the biggest index in the EditorOption enum.
143
+ editorOptions_1.editorOptionsRegistry.push(new editorIntConstructor(id++, 'tabSize', 4, 1, core_1.MAX_SAFE_INTEGER, editor_generated_preference_schema_1.editorGeneratedPreferenceProperties['editor.tabSize']), new editorBoolConstructor(id++, 'insertSpaces', true, editor_generated_preference_schema_1.editorGeneratedPreferenceProperties['editor.insertSpaces']), new editorBoolConstructor(id++, 'detectIndentation', true, editor_generated_preference_schema_1.editorGeneratedPreferenceProperties['editor.detectIndentation']), new editorBoolConstructor(id++, 'trimAutoWhitespace', true, editor_generated_preference_schema_1.editorGeneratedPreferenceProperties['editor.trimAutoWhitespace']), new editorBoolConstructor(id++, 'largeFileOptimizations', true, editor_generated_preference_schema_1.editorGeneratedPreferenceProperties['editor.largeFileOptimizations']), new editorBoolConstructor(id++, 'wordBasedSuggestions', true, editor_generated_preference_schema_1.editorGeneratedPreferenceProperties['editor.wordBasedSuggestions']), new editorStringEnumConstructor(id++, 'wordBasedSuggestionsMode', 'matchingDocuments', editor_generated_preference_schema_1.editorGeneratedPreferenceProperties['editor.wordBasedSuggestionsMode'].enum, editor_generated_preference_schema_1.editorGeneratedPreferenceProperties['editor.wordBasedSuggestionsMode']), new editorBoolConstructor(id++, 'stablePeek', false, editor_generated_preference_schema_1.editorGeneratedPreferenceProperties['editor.stablePeek']), new editorIntConstructor(id++, 'maxTokenizationLength', 20000, 1, core_1.MAX_SAFE_INTEGER, editor_generated_preference_schema_1.editorGeneratedPreferenceProperties['editor.maxTokenizationLength']));
144
+ }
145
+ }
112
146
  };
113
147
  __decorate([
114
148
  (0, inversify_1.inject)(monaco_editor_service_1.MonacoEditorService),
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":"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"}
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/package.json CHANGED
@@ -1,14 +1,14 @@
1
1
  {
2
2
  "name": "@theia/monaco",
3
- "version": "1.27.0-next.52+ce012845316",
3
+ "version": "1.27.0-next.56+9a0ae2ed858",
4
4
  "description": "Theia - Monaco Extension",
5
5
  "dependencies": {
6
- "@theia/core": "1.27.0-next.52+ce012845316",
7
- "@theia/editor": "1.27.0-next.52+ce012845316",
8
- "@theia/filesystem": "1.27.0-next.52+ce012845316",
9
- "@theia/markers": "1.27.0-next.52+ce012845316",
6
+ "@theia/core": "1.27.0-next.56+9a0ae2ed858",
7
+ "@theia/editor": "1.27.0-next.56+9a0ae2ed858",
8
+ "@theia/filesystem": "1.27.0-next.56+9a0ae2ed858",
9
+ "@theia/markers": "1.27.0-next.56+9a0ae2ed858",
10
10
  "@theia/monaco-editor-core": "1.65.2",
11
- "@theia/outline-view": "1.27.0-next.52+ce012845316",
11
+ "@theia/outline-view": "1.27.0-next.56+9a0ae2ed858",
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": "ce0128453165d9a9493a7a958fcfaa4b0a2c6e9e"
57
+ "gitHead": "9a0ae2ed858c2cac36cb05a9307268f11d807180"
58
58
  }
package/src/browser/monaco-editor-provider.ts CHANGED
@@ -33,7 +33,7 @@ import { MonacoWorkspace } from './monaco-workspace';
33
33
  import { MonacoBulkEditService } from './monaco-bulk-edit-service';
34
34
  import { ApplicationServer } from '@theia/core/lib/common/application-protocol';
35
35
  import { ContributionProvider } from '@theia/core';
36
- import { KeybindingRegistry, OpenerService, open, WidgetOpenerOptions, FormatType, PreferenceValidationService } from '@theia/core/lib/browser';
36
+ import { KeybindingRegistry, OpenerService, open, WidgetOpenerOptions, FormatType } from '@theia/core/lib/browser';
37
37
  import { MonacoResolvedKeybinding } from './monaco-resolved-keybinding';
38
38
  import { HttpOpenHandlerOptions } from '@theia/core/lib/browser/http-open-handler';
39
39
  import { MonacoToProtocolConverter } from './monaco-to-protocol-converter';
@@ -88,9 +88,6 @@ export class MonacoEditorProvider {
88
88
  @inject(MonacoQuickInputImplementation)
89
89
  protected readonly quickInputService: MonacoQuickInputImplementation;
90
90
 
91
- @inject(PreferenceValidationService)
92
- protected readonly preferenceValidator: PreferenceValidationService;
93
-
94
91
  protected _current: MonacoEditor | undefined;
95
92
  /**
96
93
  * Returns the last focused MonacoEditor.
@@ -265,9 +262,7 @@ export class MonacoEditorProvider {
265
262
  if (event) {
266
263
  const preferenceName = event.preferenceName;
267
264
  const overrideIdentifier = editor.document.languageId;
268
- const newValue = this.preferenceValidator.validateByName(preferenceName,
269
- this.editorPreferences.get({ preferenceName, overrideIdentifier }, undefined, editor.uri.toString())
270
- );
265
+ const newValue = this.editorPreferences.get({ preferenceName, overrideIdentifier }, undefined, editor.uri.toString());
271
266
  editor.getControl().updateOptions(this.setOption(preferenceName, newValue, this.preferencePrefixes));
272
267
  } else {
273
268
  const options = this.createMonacoEditorOptions(editor.document);
@@ -296,9 +291,7 @@ export class MonacoEditorProvider {
296
291
  }
297
292
  const overrideIdentifier = editor.document.languageId;
298
293
  const uri = editor.uri.toString();
299
- const formatOnSave = this.preferenceValidator.validateByName('editor.formatOnSave',
300
- this.editorPreferences.get({ preferenceName: 'editor.formatOnSave', overrideIdentifier }, undefined, uri)!
301
- );
294
+ const formatOnSave = this.editorPreferences.get({ preferenceName: 'editor.formatOnSave', overrideIdentifier }, undefined, uri);
302
295
  if (formatOnSave) {
303
296
  const formatOnSaveTimeout = this.editorPreferences.get({ preferenceName: 'editor.formatOnSaveTimeout', overrideIdentifier }, undefined, uri)!;
304
297
  await Promise.race([
@@ -349,9 +342,7 @@ export class MonacoEditorProvider {
349
342
  if (event) {
350
343
  const preferenceName = event.preferenceName;
351
344
  const overrideIdentifier = editor.document.languageId;
352
- const newValue = this.preferenceValidator.validateByName(preferenceName,
353
- this.editorPreferences.get({ preferenceName, overrideIdentifier }, undefined, resourceUri)
354
- );
345
+ const newValue = this.editorPreferences.get({ preferenceName, overrideIdentifier }, undefined, resourceUri);
355
346
  editor.diffEditor.updateOptions(this.setOption(preferenceName, newValue, this.diffPreferencePrefixes));
356
347
  } else {
357
348
  const options = this.createMonacoDiffEditorOptions(editor.originalModel, editor.modifiedModel);
@@ -367,8 +358,7 @@ export class MonacoEditorProvider {
367
358
  for (const preferenceName of Object.keys(this.editorPreferences)) {
368
359
  flat[preferenceName] = (<any>this.editorPreferences).get({ preferenceName, overrideIdentifier }, undefined, uri);
369
360
  }
370
- const valid = this.preferenceValidator.validateOptions(flat);
371
- return Object.entries(valid).reduce((tree, [preferenceName, value]) => this.setOption(preferenceName, deepClone(value), prefixes, tree), {});
361
+ return Object.entries(flat).reduce((tree, [preferenceName, value]) => this.setOption(preferenceName, deepClone(value), prefixes, tree), {});
372
362
  }
373
363
 
374
364
  protected setOption(preferenceName: string, value: any, prefixes: string[], options: { [name: string]: any } = {}): {
package/src/browser/monaco-frontend-application-contribution.ts CHANGED
@@ -31,6 +31,9 @@ import { IContextMenuService } from '@theia/monaco-editor-core/esm/vs/platform/c
31
31
  import { MonacoContextMenuService } from './monaco-context-menu';
32
32
  import { MonacoThemingService } from './monaco-theming-service';
33
33
  import { isHighContrast } from '@theia/core/lib/common/theme';
34
+ import { editorOptionsRegistry, IEditorOption } from '@theia/monaco-editor-core/esm/vs/editor/common/config/editorOptions';
35
+ import { MAX_SAFE_INTEGER } from '@theia/core';
36
+ import { editorGeneratedPreferenceProperties } from '@theia/editor/lib/browser/editor-generated-preference-schema';
34
37
 
35
38
  @injectable()
36
39
  export class MonacoFrontendApplicationContribution implements FrontendApplicationContribution, StylingParticipant {
@@ -60,6 +63,7 @@ export class MonacoFrontendApplicationContribution implements FrontendApplicatio
60
63
 
61
64
  @postConstruct()
62
65
  protected init(): void {
66
+ this.addAdditionalPreferenceValidations();
63
67
  const { codeEditorService, textModelService, contextKeyService, contextMenuService } = this;
64
68
  StandaloneServices.initialize({
65
69
  [ICodeEditorService.toString()]: codeEditorService,
@@ -131,4 +135,40 @@ export class MonacoFrontendApplicationContribution implements FrontendApplicatio
131
135
  }
132
136
  }
133
137
 
138
+ /**
139
+ * For reasons that are unclear, while most preferences that apply in editors are validated, a few are not.
140
+ * There is a utility in `examples/api-samples/src/browser/monaco-editor-preferences/monaco-editor-preference-extractor.ts` to help determine which are not.
141
+ * Check `src/vs/editor/common/config/editorOptions.ts` for constructor arguments and to make sure that the preference names used to extract constructors are still accurate.
142
+ */
143
+ protected addAdditionalPreferenceValidations(): void {
144
+ let editorIntConstructor: undefined | (new (...args: unknown[]) => IEditorOption<number, number>);
145
+ let editorBoolConstructor: undefined | (new (...args: unknown[]) => IEditorOption<number, boolean>);
146
+ let editorStringEnumConstructor: undefined | (new (...args: unknown[]) => IEditorOption<number, string>);
147
+ for (const validator of editorOptionsRegistry) {
148
+ /* eslint-disable @typescript-eslint/no-explicit-any,max-len */
149
+ if (editorIntConstructor && editorBoolConstructor && editorStringEnumConstructor) { break; }
150
+ if (validator.name === 'acceptSuggestionOnCommitCharacter') {
151
+ editorBoolConstructor = validator.constructor as any;
152
+ } else if (validator.name === 'acceptSuggestionOnEnter') {
153
+ editorStringEnumConstructor = validator.constructor as any;
154
+ } else if (validator.name === 'accessibilityPageSize') {
155
+ editorIntConstructor = validator.constructor as any;
156
+ }
157
+ /* eslint-enable @typescript-eslint/no-explicit-any */
158
+ }
159
+ if (editorIntConstructor && editorBoolConstructor && editorStringEnumConstructor) {
160
+ let id = 200; // Needs to be bigger than the biggest index in the EditorOption enum.
161
+ editorOptionsRegistry.push(
162
+ new editorIntConstructor(id++, 'tabSize', 4, 1, MAX_SAFE_INTEGER, editorGeneratedPreferenceProperties['editor.tabSize']),
163
+ new editorBoolConstructor(id++, 'insertSpaces', true, editorGeneratedPreferenceProperties['editor.insertSpaces']),
164
+ new editorBoolConstructor(id++, 'detectIndentation', true, editorGeneratedPreferenceProperties['editor.detectIndentation']),
165
+ new editorBoolConstructor(id++, 'trimAutoWhitespace', true, editorGeneratedPreferenceProperties['editor.trimAutoWhitespace']),
166
+ new editorBoolConstructor(id++, 'largeFileOptimizations', true, editorGeneratedPreferenceProperties['editor.largeFileOptimizations']),
167
+ new editorBoolConstructor(id++, 'wordBasedSuggestions', true, editorGeneratedPreferenceProperties['editor.wordBasedSuggestions']),
168
+ new editorStringEnumConstructor(id++, 'wordBasedSuggestionsMode', 'matchingDocuments', editorGeneratedPreferenceProperties['editor.wordBasedSuggestionsMode'].enum, editorGeneratedPreferenceProperties['editor.wordBasedSuggestionsMode']),
169
+ new editorBoolConstructor(id++, 'stablePeek', false, editorGeneratedPreferenceProperties['editor.stablePeek']),
170
+ new editorIntConstructor(id++, 'maxTokenizationLength', 20000, 1, MAX_SAFE_INTEGER, editorGeneratedPreferenceProperties['editor.maxTokenizationLength']),
171
+ );
172
+ }
173
+ }
134
174
  }