@opensumi/ide-editor 2.22.1 → 2.22.2-next-1675868047.0

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 (29) hide show
  1. package/lib/browser/menu/open-type-menu.contribution.d.ts +1 -0
  2. package/lib/browser/menu/open-type-menu.contribution.d.ts.map +1 -1
  3. package/lib/browser/menu/open-type-menu.contribution.js +19 -15
  4. package/lib/browser/menu/open-type-menu.contribution.js.map +1 -1
  5. package/lib/browser/merge-editor/merge-editor.provider.d.ts +2 -0
  6. package/lib/browser/merge-editor/merge-editor.provider.d.ts.map +1 -1
  7. package/lib/browser/merge-editor/merge-editor.provider.js +18 -0
  8. package/lib/browser/merge-editor/merge-editor.provider.js.map +1 -1
  9. package/lib/browser/preference/schema.d.ts.map +1 -1
  10. package/lib/browser/preference/schema.js +230 -230
  11. package/lib/browser/preference/schema.js.map +1 -1
  12. package/lib/browser/quick-open/workspace-symbol-quickopen.js +1 -1
  13. package/lib/browser/quick-open/workspace-symbol-quickopen.js.map +1 -1
  14. package/lib/browser/types.d.ts +2 -2
  15. package/lib/browser/types.d.ts.map +1 -1
  16. package/lib/browser/types.js.map +1 -1
  17. package/lib/browser/workbench-editor.service.d.ts.map +1 -1
  18. package/lib/browser/workbench-editor.service.js +1 -0
  19. package/lib/browser/workbench-editor.service.js.map +1 -1
  20. package/lib/common/editor.d.ts +1 -1
  21. package/lib/common/editor.d.ts.map +1 -1
  22. package/package.json +13 -13
  23. package/src/browser/menu/open-type-menu.contribution.ts +21 -17
  24. package/src/browser/merge-editor/merge-editor.provider.ts +18 -0
  25. package/src/browser/preference/schema.ts +278 -545
  26. package/src/browser/quick-open/workspace-symbol-quickopen.ts +1 -1
  27. package/src/browser/types.ts +2 -1
  28. package/src/browser/workbench-editor.service.ts +2 -0
  29. package/src/common/editor.ts +1 -1
@@ -5,6 +5,7 @@ export declare class OpenTypeMenuContribution extends Disposable implements Comm
5
5
  private readonly menuRegistry;
6
6
  registerCommands(commands: CommandRegistry): void;
7
7
  constructor();
8
+ registerEditorOpenTypes(): void;
8
9
  registerMenus(menuRegistry: IMenuRegistry): void;
9
10
  private registerMenuItem;
10
11
  }
@@ -1 +1 @@
1
- {"version":3,"file":"open-type-menu.contribution.d.ts","sourceRoot":"","sources":["../../../src/browser/menu/open-type-menu.contribution.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,aAAa,EAGb,gBAAgB,EAGjB,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAW,mBAAmB,EAAE,eAAe,EAAE,UAAU,EAAY,MAAM,2BAA2B,CAAC;AAchH,qBACa,wBAAyB,SAAQ,UAAW,YAAW,mBAAmB,EAAE,gBAAgB;IAEvG,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAA6B;IAGpE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgB;IAE7C,gBAAgB,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI;;IAgCjD,aAAa,CAAC,YAAY,EAAE,aAAa;IAEzC,OAAO,CAAC,gBAAgB;CAuBzB"}
1
+ {"version":3,"file":"open-type-menu.contribution.d.ts","sourceRoot":"","sources":["../../../src/browser/menu/open-type-menu.contribution.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,aAAa,EAGb,gBAAgB,EAGjB,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAW,mBAAmB,EAAE,eAAe,EAAE,UAAU,EAAY,MAAM,2BAA2B,CAAC;AAchH,qBACa,wBAAyB,SAAQ,UAAW,YAAW,mBAAmB,EAAE,gBAAgB;IAEvG,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAA6B;IAGpE,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAgB;IAE7C,gBAAgB,CAAC,QAAQ,EAAE,eAAe,GAAG,IAAI;;IAoBjD,uBAAuB;IAgBvB,aAAa,CAAC,YAAY,EAAE,aAAa;IAEzC,OAAO,CAAC,gBAAgB;CAuBzB"}
@@ -18,9 +18,10 @@ var OPEN_TYPE_COMMANDS;
18
18
  let OpenTypeMenuContribution = class OpenTypeMenuContribution extends ide_core_common_1.Disposable {
19
19
  registerCommands(commands) {
20
20
  commands.registerCommand(OPEN_TYPE_COMMANDS.EDITOR_OPEN_TYPE, {
21
- execute: (id) => {
22
- if (id) {
23
- this.workbenchEditorService.currentEditorGroup.changeOpenType(id);
21
+ execute: (...args) => {
22
+ const tailArg = args[args.length - 1];
23
+ if (tailArg && typeof tailArg === 'string') {
24
+ this.workbenchEditorService.currentEditorGroup.changeOpenType(tailArg);
24
25
  }
25
26
  },
26
27
  });
@@ -28,20 +29,23 @@ let OpenTypeMenuContribution = class OpenTypeMenuContribution extends ide_core_c
28
29
  constructor() {
29
30
  super();
30
31
  this.disposables.push(this.workbenchEditorService.onActiveResourceChange((e) => {
31
- const openTypes = this.workbenchEditorService.currentEditorGroup.availableOpenTypes;
32
- // 如果打开方式没有两个以上,则不需要展示
33
- const preMenu = this.menuRegistry
34
- .getMenuItems(next_1.MenuId.OpenTypeSubmenuContext)
35
- .map((e) => e.command);
36
- preMenu.forEach((c) => {
37
- this.menuRegistry.unregisterMenuItem(next_1.MenuId.OpenTypeSubmenuContext, c.id);
38
- });
39
- this.menuRegistry.unregisterMenuItem(next_1.MenuId.EditorTitle, next_1.MenuId.OpenTypeSubmenuContext);
40
- if (openTypes.length >= 2) {
41
- this.registerMenuItem(openTypes);
42
- }
32
+ this.registerEditorOpenTypes();
43
33
  }));
44
34
  }
35
+ registerEditorOpenTypes() {
36
+ const openTypes = this.workbenchEditorService.currentEditorGroup.availableOpenTypes;
37
+ // 如果打开方式没有两个以上,则不需要展示
38
+ const preMenu = this.menuRegistry
39
+ .getMenuItems(next_1.MenuId.OpenTypeSubmenuContext)
40
+ .map((e) => e.command);
41
+ preMenu.forEach((c) => {
42
+ this.menuRegistry.unregisterMenuItem(next_1.MenuId.OpenTypeSubmenuContext, c.id);
43
+ });
44
+ this.menuRegistry.unregisterMenuItem(next_1.MenuId.EditorTitle, next_1.MenuId.OpenTypeSubmenuContext);
45
+ if (openTypes.length >= 2) {
46
+ this.registerMenuItem(openTypes);
47
+ }
48
+ }
45
49
  registerMenus(menuRegistry) { }
46
50
  registerMenuItem(openTypes) {
47
51
  const openTypeMenus = {
@@ -1 +1 @@
1
- {"version":3,"file":"open-type-menu.contribution.js","sourceRoot":"","sources":["../../../src/browser/menu/open-type-menu.contribution.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"open-type-menu.contribution.js","sourceRoot":"","sources":["../../../src/browser/menu/open-type-menu.contribution.ts"],"names":[],"mappings":";;;;AAAA,qCAAyC;AACzC,iEAAqD;AACrD,mEAOkD;AAClD,+DAAgH;AAChH,uEAAiE;AAEjE,oCAAkD;AAGlD,4EAA2E;AAE3E,IAAU,kBAAkB,CAI3B;AAJD,WAAU,kBAAkB;IACb,mCAAgB,GAAY;QACvC,EAAE,EAAE,iBAAiB;KACtB,CAAC;AACJ,CAAC,EAJS,kBAAkB,KAAlB,kBAAkB,QAI3B;AAGM,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,4BAAU;IAOtD,gBAAgB,CAAC,QAAyB;QACxC,QAAQ,CAAC,eAAe,CAAC,kBAAkB,CAAC,gBAAgB,EAAE;YAC5D,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE;gBACnB,MAAM,OAAO,GAAW,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;gBAC9C,IAAI,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;oBAC1C,IAAI,CAAC,sBAAsB,CAAC,kBAAkB,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;iBACxE;YACH,CAAC;SACF,CAAC,CAAC;IACL,CAAC;IAED;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,WAAW,CAAC,IAAI,CACnB,IAAI,CAAC,sBAAsB,CAAC,sBAAsB,CAAC,CAAC,CAAC,EAAE,EAAE;YACvD,IAAI,CAAC,uBAAuB,EAAE,CAAC;QACjC,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAED,uBAAuB;QACrB,MAAM,SAAS,GAAG,IAAI,CAAC,sBAAsB,CAAC,kBAAkB,CAAC,kBAAkB,CAAC;QACpF,sBAAsB;QACtB,MAAM,OAAO,GAAG,IAAI,CAAC,YAAY;aAC9B,YAAY,CAAC,aAAM,CAAC,sBAAsB,CAAC;aAC3C,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAE,CAAe,CAAC,OAA0B,CAAC,CAAC;QAC3D,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACpB,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,aAAM,CAAC,sBAAsB,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QAC5E,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC,aAAM,CAAC,WAAW,EAAE,aAAM,CAAC,sBAAsB,CAAC,CAAC;QAExF,IAAI,SAAS,CAAC,MAAM,IAAI,CAAC,EAAE;YACzB,IAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;SAClC;IACH,CAAC;IAED,aAAa,CAAC,YAA2B,IAAG,CAAC;IAErC,gBAAgB,CAAC,SAA4B;QACnD,MAAM,aAAa,GAAG;YACpB,OAAO,EAAE,aAAM,CAAC,sBAAsB;YACtC,KAAK,EAAE,IAAA,0BAAQ,EAAC,iBAAiB,CAAC;YAClC,KAAK,EAAE,YAAY;YACnB,KAAK,EAAE,MAAM,CAAC,gBAAgB;YAC9B,SAAS,EAAE,IAAA,0BAAO,EAAC,SAAS,CAAC;YAC7B,IAAI,EAAE,SAAS;SACA,CAAC;QAElB,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,aAAM,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;QAEtE,SAAS,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;;YACzB,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,aAAM,CAAC,sBAAsB,EAAE;gBAChE,OAAO,EAAE;oBACP,EAAE,EAAE,kBAAkB,CAAC,gBAAgB,CAAC,EAAE;oBAC1C,KAAK,EAAE,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,IAAI;iBACnD;gBACD,aAAa,EAAE,CAAC,MAAA,IAAI,CAAC,WAAW,mCAAI,IAAI,CAAC,IAAI,CAAC;gBAC9C,KAAK,EAAE,YAAY;aACpB,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAnEC;IAAC,IAAA,cAAS,EAAC,8BAAsB,CAAC;sCACO,qDAA0B;wEAAC;AAEpE;IAAC,IAAA,cAAS,EAAC,oBAAa,CAAC;sCACM,oBAAa;8DAAC;AALlC,wBAAwB;IADpC,IAAA,kBAAM,EAAC,qCAAmB,EAAE,uBAAgB,CAAC;;GACjC,wBAAwB,CAoEpC;AApEY,4DAAwB"}
@@ -3,6 +3,8 @@ import { IResourceProvider, IResource } from '../../common';
3
3
  export declare class MergeEditorResourceProvider extends WithEventBus implements IResourceProvider {
4
4
  scheme: string;
5
5
  private readonly labelService;
6
+ private readonly mergeEditorService;
6
7
  provideResource(uri: URI): MaybePromise<IResource<any>>;
8
+ shouldCloseResource(resource: IResource<any>, openedResources: IResource<any>[][]): MaybePromise<boolean>;
7
9
  }
8
10
  //# sourceMappingURL=merge-editor.provider.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"merge-editor.provider.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor.provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE,YAAY,EAAgB,MAAM,4BAA4B,CAAC;AAE3F,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE5D,qBACa,2BAA4B,SAAQ,YAAa,YAAW,iBAAiB;IACxF,MAAM,SAAiB;IAGvB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;IAErC,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,YAAY,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;CAuB/D"}
1
+ {"version":3,"file":"merge-editor.provider.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor.provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE,YAAY,EAAgB,MAAM,4BAA4B,CAAC;AAG3F,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE5D,qBACa,2BAA4B,SAAQ,YAAa,YAAW,iBAAiB;IACxF,MAAM,SAAiB;IAGvB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAe;IAG5C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAqB;IAEjD,eAAe,CAAC,GAAG,EAAE,GAAG,GAAG,YAAY,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAwBvD,mBAAmB,CAAC,QAAQ,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,eAAe,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,YAAY,CAAC,OAAO,CAAC;CAajH"}
@@ -4,6 +4,7 @@ exports.MergeEditorResourceProvider = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  const di_1 = require("@opensumi/di");
6
6
  const ide_core_browser_1 = require("@opensumi/ide-core-browser");
7
+ const merge_editor_service_1 = require("@opensumi/ide-monaco/lib/browser/contrib/merge-editor/merge-editor.service");
7
8
  let MergeEditorResourceProvider = class MergeEditorResourceProvider extends ide_core_browser_1.WithEventBus {
8
9
  constructor() {
9
10
  super(...arguments);
@@ -32,11 +33,28 @@ let MergeEditorResourceProvider = class MergeEditorResourceProvider extends ide_
32
33
  throw Error('invalid merge editor resource parse');
33
34
  }
34
35
  }
36
+ shouldCloseResource(resource, openedResources) {
37
+ const { openMetadata } = resource.uri.getParsedQuery();
38
+ try {
39
+ const parseMetaData = JSON.parse(openMetadata);
40
+ const { output } = parseMetaData;
41
+ const outputUri = new ide_core_browser_1.URI(output);
42
+ this.mergeEditorService.fireRestoreState(outputUri);
43
+ return true;
44
+ }
45
+ catch (error) {
46
+ throw Error('invalid merge editor resource parse');
47
+ }
48
+ }
35
49
  };
36
50
  tslib_1.__decorate([
37
51
  (0, di_1.Autowired)(ide_core_browser_1.LabelService),
38
52
  tslib_1.__metadata("design:type", ide_core_browser_1.LabelService)
39
53
  ], MergeEditorResourceProvider.prototype, "labelService", void 0);
54
+ tslib_1.__decorate([
55
+ (0, di_1.Autowired)(merge_editor_service_1.MergeEditorService),
56
+ tslib_1.__metadata("design:type", merge_editor_service_1.MergeEditorService)
57
+ ], MergeEditorResourceProvider.prototype, "mergeEditorService", void 0);
40
58
  MergeEditorResourceProvider = tslib_1.__decorate([
41
59
  (0, di_1.Injectable)()
42
60
  ], MergeEditorResourceProvider);
@@ -1 +1 @@
1
- {"version":3,"file":"merge-editor.provider.js","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor.provider.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,iEAA2F;AAKpF,IAAM,2BAA2B,GAAjC,MAAM,2BAA4B,SAAQ,+BAAY;IAAtD;;QACL,WAAM,GAAG,aAAa,CAAC;IA4BzB,CAAC;IAvBQ,eAAe,CAAC,GAAQ;QAC7B,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,cAAc,EAAE,CAAC;QAEpD,IAAI;YACF,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YAC/C,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC;YAC3D,MAAM,eAAe,GAAG,IAAI,sBAAG,CAAC,MAAM,CAAC,CAAC;YACxC,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;YACxD,OAAO;gBACL,IAAI;gBACJ,IAAI;gBACJ,GAAG;gBACH,QAAQ,EAAE;oBACR,QAAQ;oBACR,MAAM;oBACN,MAAM;oBACN,MAAM;iBACP;aACF,CAAC;SACH;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,KAAK,CAAC,qCAAqC,CAAC,CAAC;SACpD;IACH,CAAC;CACF,CAAA;AA1BC;IAAC,IAAA,cAAS,EAAC,+BAAY,CAAC;sCACO,+BAAY;iEAAC;AAJjC,2BAA2B;IADvC,IAAA,eAAU,GAAE;GACA,2BAA2B,CA6BvC;AA7BY,kEAA2B"}
1
+ {"version":3,"file":"merge-editor.provider.js","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor.provider.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,iEAA2F;AAC3F,qHAAgH;AAKzG,IAAM,2BAA2B,GAAjC,MAAM,2BAA4B,SAAQ,+BAAY;IAAtD;;QACL,WAAM,GAAG,aAAa,CAAC;IA6CzB,CAAC;IArCQ,eAAe,CAAC,GAAQ;QAC7B,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,cAAc,EAAE,CAAC;QAEpD,IAAI;YACF,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YAC/C,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC;YAC3D,MAAM,eAAe,GAAG,IAAI,sBAAG,CAAC,MAAM,CAAC,CAAC;YACxC,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;YACxD,OAAO;gBACL,IAAI;gBACJ,IAAI;gBACJ,GAAG;gBACH,QAAQ,EAAE;oBACR,QAAQ;oBACR,MAAM;oBACN,MAAM;oBACN,MAAM;iBACP;aACF,CAAC;SACH;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,KAAK,CAAC,qCAAqC,CAAC,CAAC;SACpD;IACH,CAAC;IAEM,mBAAmB,CAAC,QAAwB,EAAE,eAAmC;QACtF,MAAM,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC;QAEvD,IAAI;YACF,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YAC/C,MAAM,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC;YACjC,MAAM,SAAS,GAAG,IAAI,sBAAG,CAAC,MAAM,CAAC,CAAC;YAClC,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;YACpD,OAAO,IAAI,CAAC;SACb;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,KAAK,CAAC,qCAAqC,CAAC,CAAC;SACpD;IACH,CAAC;CACF,CAAA;AA3CC;IAAC,IAAA,cAAS,EAAC,+BAAY,CAAC;sCACO,+BAAY;iEAAC;AAE5C;IAAC,IAAA,cAAS,EAAC,yCAAkB,CAAC;sCACO,yCAAkB;uEAAC;AAP7C,2BAA2B;IADvC,IAAA,eAAU,GAAE;GACA,2BAA2B,CA8CvC;AA9CY,kEAA2B"}
@@ -1 +1 @@
1
- {"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/browser/preference/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,gBAAgB,EAEhB,eAAe,EAChB,MAAM,4BAA4B,CAAC;AAEpC,eAAO,MAAM,qBAAqB,sCAAsC,CAAC;AAMzE,eAAO,MAAM,oBAAoB;;;;;;;;;;;;CAYhC,CAAC;AAEF,eAAO,MAAM,qBAAqB;;;;;;;CAOjC,CAAC;AAEF,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwCnC,CAAC;AAEF,eAAO,MAAM,8BAA8B;;CAE1C,CAAC;AAEF,0BAAkB,cAAc;IAC9B;;OAEG;IACH,IAAI,IAAI;IACR;;OAEG;IACH,IAAI,IAAI;IACR;;OAEG;IACH,MAAM,IAAI;IACV;;OAEG;IACH,UAAU,IAAI;CACf;AAED,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuI3B,CAAC;AA2mDF,eAAO,MAAM,sBAAsB,EAAE,gBAMpC,CAAC;AAEF,eAAO,MAAM,iBAAiB,eAA6B,CAAC;AAC5D,MAAM,MAAM,iBAAiB,GAAG,eAAe,CAAC;IAC9C,sBAAsB,EAAE,MAAM,EAAE,CAAC;IACjC,oBAAoB,EAAE,OAAO,CAAC;IAC9B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC,CAAC"}
1
+ {"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../src/browser/preference/schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,gBAAgB,EAEhB,eAAe,EAChB,MAAM,4BAA4B,CAAC;AAEpC,eAAO,MAAM,qBAAqB,sCAAsC,CAAC;AAMzE,eAAO,MAAM,oBAAoB;;;;;;;;;;;;CAYhC,CAAC;AAEF,eAAO,MAAM,qBAAqB;;;;;;;CAOjC,CAAC;AAEF,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwCnC,CAAC;AAEF,eAAO,MAAM,8BAA8B;;CAE1C,CAAC;AAEF,0BAAkB,cAAc;IAC9B;;OAEG;IACH,IAAI,IAAI;IACR;;OAEG;IACH,IAAI,IAAI;IACR;;OAEG;IACH,MAAM,IAAI;IACV;;OAEG;IACH,UAAU,IAAI;CACf;AAED,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuI3B,CAAC;AAg2CF,eAAO,MAAM,sBAAsB,EAAE,gBAMpC,CAAC;AAEF,eAAO,MAAM,iBAAiB,eAA6B,CAAC;AAC5D,MAAM,MAAM,iBAAiB,GAAG,eAAe,CAAC;IAC9C,sBAAsB,EAAE,MAAM,EAAE,CAAC;IACjC,oBAAoB,EAAE,OAAO,CAAC;IAC9B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,iBAAiB,EAAE,MAAM,CAAC;CAC3B,CAAC,CAAC"}