@theia/preferences 1.53.0-next.4 → 1.53.0-next.55

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 (74) hide show
  1. package/README.md +81 -81
  2. package/lib/browser/preference-tree-model.d.ts.map +1 -1
  3. package/lib/browser/preference-tree-model.js +5 -2
  4. package/lib/browser/preference-tree-model.js.map +1 -1
  5. package/lib/browser/util/preference-layout.d.ts.map +1 -1
  6. package/lib/browser/util/preference-layout.js +4 -0
  7. package/lib/browser/util/preference-layout.js.map +1 -1
  8. package/lib/browser/util/preference-tree-generator.d.ts +14 -2
  9. package/lib/browser/util/preference-tree-generator.d.ts.map +1 -1
  10. package/lib/browser/util/preference-tree-generator.js +89 -26
  11. package/lib/browser/util/preference-tree-generator.js.map +1 -1
  12. package/lib/browser/util/preference-tree-label-provider.d.ts.map +1 -1
  13. package/lib/browser/util/preference-tree-label-provider.js +4 -11
  14. package/lib/browser/util/preference-tree-label-provider.js.map +1 -1
  15. package/lib/browser/util/preference-types.d.ts +4 -2
  16. package/lib/browser/util/preference-types.d.ts.map +1 -1
  17. package/lib/browser/util/preference-types.js.map +1 -1
  18. package/lib/browser/views/preference-tree-widget.d.ts +2 -0
  19. package/lib/browser/views/preference-tree-widget.d.ts.map +1 -1
  20. package/lib/browser/views/preference-tree-widget.js +10 -1
  21. package/lib/browser/views/preference-tree-widget.js.map +1 -1
  22. package/package.json +9 -9
  23. package/src/browser/abstract-resource-preference-provider.spec.ts +95 -95
  24. package/src/browser/abstract-resource-preference-provider.ts +232 -232
  25. package/src/browser/folder-preference-provider.ts +58 -58
  26. package/src/browser/folders-preferences-provider.ts +244 -244
  27. package/src/browser/index.ts +23 -23
  28. package/src/browser/monaco-jsonc-editor.ts +67 -67
  29. package/src/browser/package.spec.ts +28 -28
  30. package/src/browser/preference-bindings.ts +65 -65
  31. package/src/browser/preference-frontend-contribution.ts +38 -38
  32. package/src/browser/preference-frontend-module.ts +66 -66
  33. package/src/browser/preference-open-handler.ts +53 -53
  34. package/src/browser/preference-transaction-manager.ts +287 -287
  35. package/src/browser/preference-tree-model.ts +260 -257
  36. package/src/browser/preferences-contribution.ts +263 -263
  37. package/src/browser/preferences-json-schema-contribution.ts +86 -86
  38. package/src/browser/preferences-monaco-contribution.ts +27 -27
  39. package/src/browser/section-preference-provider.ts +83 -83
  40. package/src/browser/style/index.css +506 -506
  41. package/src/browser/style/preference-array.css +94 -94
  42. package/src/browser/style/preference-context-menu.css +74 -74
  43. package/src/browser/style/preference-file.css +31 -31
  44. package/src/browser/style/preference-object.css +49 -49
  45. package/src/browser/style/search-input.css +66 -66
  46. package/src/browser/user-configs-preference-provider.ts +127 -127
  47. package/src/browser/user-preference-provider.ts +35 -35
  48. package/src/browser/util/preference-layout.ts +381 -377
  49. package/src/browser/util/preference-scope-command-manager.ts +75 -75
  50. package/src/browser/util/preference-tree-generator.ts +260 -190
  51. package/src/browser/util/preference-tree-label-provider.spec.ts +110 -110
  52. package/src/browser/util/preference-tree-label-provider.ts +72 -78
  53. package/src/browser/util/preference-types.ts +177 -175
  54. package/src/browser/views/components/preference-array-input.ts +174 -174
  55. package/src/browser/views/components/preference-boolean-input.ts +69 -69
  56. package/src/browser/views/components/preference-file-input.ts +104 -104
  57. package/src/browser/views/components/preference-json-input.ts +78 -78
  58. package/src/browser/views/components/preference-markdown-renderer.ts +68 -68
  59. package/src/browser/views/components/preference-node-renderer-creator.ts +141 -141
  60. package/src/browser/views/components/preference-node-renderer.ts +477 -477
  61. package/src/browser/views/components/preference-number-input.ts +147 -147
  62. package/src/browser/views/components/preference-select-input.ts +131 -131
  63. package/src/browser/views/components/preference-string-input.ts +76 -76
  64. package/src/browser/views/preference-editor-widget.ts +349 -349
  65. package/src/browser/views/preference-scope-tabbar-widget.tsx +344 -344
  66. package/src/browser/views/preference-searchbar-widget.tsx +183 -183
  67. package/src/browser/views/preference-tree-widget.tsx +102 -93
  68. package/src/browser/views/preference-widget-bindings.ts +102 -102
  69. package/src/browser/views/preference-widget.tsx +118 -118
  70. package/src/browser/workspace-file-preference-provider.ts +100 -100
  71. package/src/browser/workspace-preference-provider.ts +134 -134
  72. package/src/common/cli-preferences.ts +22 -22
  73. package/src/node/preference-backend-module.ts +33 -33
  74. package/src/node/preference-cli-contribution.ts +48 -48
@@ -1 +1 @@
1
- {"version":3,"file":"preference-types.d.ts","sourceRoot":"","sources":["../../../src/browser/util/preference-types.ts"],"names":[],"mappings":"AAgBA,OAAO,EACH,sBAAsB,EAEtB,QAAQ,IAAI,YAAY,EACxB,kBAAkB,EAClB,kBAAkB,EAClB,oBAAoB,EAEvB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,wCAAwC,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAE9D,yBAAiB,UAAU,CAAC;IAExB,UAAiB,iBAAiB;QAC9B,EAAE,EAAE,MAAM,CAAC;QACX,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;KAC7B;IAED,UAAiB,iBAAiB,CAAC;QAC/B,SAAgB,EAAE,CAAC,UAAU,EAAE,iBAAiB,GAAG,UAAU,IAAI,iBAAiB,CAEjF;KACJ;IAEM,MAAM,IAAI,eAA4B,CAAC;IAC9C,KAAY,IAAI,GAAG,QAAQ,CAAC;IAE5B,KAAY,QAAQ,GAAG,iBAAiB,GAAG,QAAQ,CAAC;IAEpD,UAAiB,QAAQ,CAAC;QACf,MAAM,EAAE,SAAU,YAAY,GAAG,QAAQ,qBAAsC,CAAC;QAChF,MAAM,UAAU,SAAU,YAAY,KAAG,OAG/C,CAAC;QACK,MAAM,uBAAuB,WAAY,MAAM,KAAG;YAAE,KAAK,EAAE,MAAM,CAAC;YAAC,EAAE,EAAE,MAAM,CAAA;SAKnF,CAAC;KACL;IAED,UAAiB,iBAAkB,SAAQ,kBAAkB,EAAE,kBAAkB;QAC7E,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,CAAC,EAAE,MAAM,CAAC;KAClB;IAED,UAAiB,iBAAiB,CAAC;QACxB,MAAM,EAAE,SAAU,QAAQ,8BAAkD,CAAC;KACvF;IAED,UAAiB,QAAS,SAAQ,YAAY;QAC1C,KAAK,EAAE,MAAM,CAAC;QACd,UAAU,EAAE;YAAE,IAAI,EAAE,sBAAsB,CAAA;SAAE,CAAC;QAC7C,YAAY,EAAE,MAAM,CAAC;KACxB;IAED,UAAiB,QAAQ,CAAC;QACf,MAAM,EAAE,SAAU,YAAY,GAAG,QAAQ,qBAAqE,CAAC;QAE/G,MAAM,OAAO,SAAU,YAAY,GAAG,QAAQ,KAAG,QAAQ,GAAG,SAEpD,CAAC;KACnB;IAEM,MAAM,eAAe,wCAAyC,qBAAqB,CAAC,CAAC,GAAG,SAAS,SAAS,MAAM,KAAG,CAAC,GAAG,SAc7H,CAAC;IAEF,UAAiB,oBAAoB;QACjC,KAAK,EAAE,MAAM,CAAC;QACd,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;QACxB,mBAAmB,EAAE,OAAO,CAAC;KAChC;IAEM,MAAM,aAAa,EAAE,oBAI3B,CAAC;CAEL;AAED,yBAAiB,mBAAmB,CAAC;IAC1B,MAAM,6BAA6B,EAAE,OAG3C,CAAC;IACK,MAAM,cAAc,SAGzB,CAAC;IACI,MAAM,gBAAgB,SAG3B,CAAC;IAEI,MAAM,eAAe,SAG1B,CAAC;IAEI,MAAM,qBAAqB,SAIhC,CAAC;IAEI,MAAM,0BAA0B,SAIrC,CAAC;IAEI,MAAM,uBAAuB,SAIlC,CAAC;IAEI,MAAM,0BAA0B,SAIrC,CAAC;IAEI,MAAM,+BAA+B,SAI1C,CAAC;IAEI,MAAM,4BAA4B,SAIvC,CAAC;CACN;AAED,yBAAiB,eAAe,CAAC;IACtB,MAAM,8BAA8B,EAAE,QAA6C,CAAC;IACpF,MAAM,8BAA8B,EAAE,QAAqF,CAAC;IAC5H,MAAM,sBAAsB,UAA6B,CAAC;CACpE"}
1
+ {"version":3,"file":"preference-types.d.ts","sourceRoot":"","sources":["../../../src/browser/util/preference-types.ts"],"names":[],"mappings":"AAgBA,OAAO,EACH,sBAAsB,EAEtB,QAAQ,IAAI,YAAY,EACxB,iBAAiB,IAAI,qBAAqB,EAC1C,kBAAkB,EAClB,oBAAoB,EAEvB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,wCAAwC,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,MAAM,oCAAoC,CAAC;AAE9D,yBAAiB,UAAU,CAAC;IAExB,UAAiB,iBAAiB;QAC9B,EAAE,EAAE,MAAM,CAAC;QACX,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;KAC7B;IAED,UAAiB,iBAAiB,CAAC;QAC/B,SAAgB,EAAE,CAAC,UAAU,EAAE,iBAAiB,GAAG,UAAU,IAAI,iBAAiB,CAEjF;KACJ;IAEM,MAAM,IAAI,eAA4B,CAAC;IAC9C,KAAY,IAAI,GAAG,QAAQ,CAAC;IAE5B,KAAY,QAAQ,GAAG,iBAAiB,GAAG,QAAQ,CAAC;IAEpD,UAAiB,QAAQ,CAAC;QACf,MAAM,EAAE,SAAU,YAAY,GAAG,QAAQ,qBAAsC,CAAC;QAChF,MAAM,UAAU,SAAU,YAAY,KAAG,OAG/C,CAAC;QACK,MAAM,uBAAuB,WAAY,MAAM,KAAG;YAAE,KAAK,EAAE,MAAM,CAAC;YAAC,EAAE,EAAE,MAAM,CAAA;SAKnF,CAAC;KACL;IAED,UAAiB,iBAAkB,SAAQ,qBAAqB,EAAE,kBAAkB;QAChF,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,CAAC,EAAE,MAAM,CAAC;KAClB;IAED,UAAiB,iBAAiB,CAAC;QACxB,MAAM,EAAE,SAAU,QAAQ,8BAAkD,CAAC;KACvF;IAED,UAAiB,QAAS,SAAQ,YAAY;QAC1C,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,KAAK,EAAE,MAAM,CAAC;QACd,UAAU,EAAE;YAAE,IAAI,EAAE,sBAAsB,CAAA;SAAE,CAAC;QAC7C,YAAY,EAAE,MAAM,CAAC;KACxB;IAED,UAAiB,QAAQ,CAAC;QACf,MAAM,EAAE,SAAU,YAAY,GAAG,QAAQ,qBAAqE,CAAC;QAE/G,MAAM,OAAO,SAAU,YAAY,GAAG,QAAQ,KAAG,QAAQ,GAAG,SAEpD,CAAC;KACnB;IAEM,MAAM,eAAe,wCAAyC,qBAAqB,CAAC,CAAC,GAAG,SAAS,SAAS,MAAM,KAAG,CAAC,GAAG,SAc7H,CAAC;IAEF,UAAiB,oBAAoB;QACjC,KAAK,EAAE,MAAM,CAAC;QACd,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;QACxB,mBAAmB,EAAE,OAAO,CAAC;KAChC;IAEM,MAAM,aAAa,EAAE,oBAI3B,CAAC;CAEL;AAED,yBAAiB,mBAAmB,CAAC;IAC1B,MAAM,6BAA6B,EAAE,OAG3C,CAAC;IACK,MAAM,cAAc,SAGzB,CAAC;IACI,MAAM,gBAAgB,SAG3B,CAAC;IAEI,MAAM,eAAe,SAG1B,CAAC;IAEI,MAAM,qBAAqB,SAIhC,CAAC;IAEI,MAAM,0BAA0B,SAIrC,CAAC;IAEI,MAAM,uBAAuB,SAIlC,CAAC;IAEI,MAAM,0BAA0B,SAIrC,CAAC;IAEI,MAAM,+BAA+B,SAI1C,CAAC;IAEI,MAAM,4BAA4B,SAIvC,CAAC;CACN;AAED,yBAAiB,eAAe,CAAC;IACtB,MAAM,8BAA8B,EAAE,QAA6C,CAAC;IACpF,MAAM,8BAA8B,EAAE,QAAqF,CAAC;IAC5H,MAAM,sBAAsB,UAA6B,CAAC;CACpE"}
@@ -1 +1 @@
1
- {"version":3,"file":"preference-types.js","sourceRoot":"","sources":["../../../src/browser/util/preference-types.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"preference-types.js","sourceRoot":"","sources":["../../../src/browser/util/preference-types.ts"],"names":[],"mappings":"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"}
@@ -2,6 +2,7 @@
2
2
  import { TreeNode, TreeProps, TreeWidget } from '@theia/core/lib/browser';
3
3
  import React = require('@theia/core/shared/react');
4
4
  import { PreferenceTreeModel, PreferenceTreeNodeRow, PreferenceTreeNodeProps } from '../preference-tree-model';
5
+ import { Preference } from '../util/preference-types';
5
6
  export declare class PreferencesTreeWidget extends TreeWidget {
6
7
  static ID: string;
7
8
  protected shouldFireSelectionEvents: boolean;
@@ -10,6 +11,7 @@ export declare class PreferencesTreeWidget extends TreeWidget {
10
11
  protected readonly treeProps: TreeProps;
11
12
  init(): void;
12
13
  doUpdateRows(): void;
14
+ protected isVisibleNode(node: Preference.TreeNode): boolean;
13
15
  protected doRenderNodeRow({ depth, visibleChildren, node, isExpansible }: PreferenceTreeNodeRow): React.ReactNode;
14
16
  protected renderNode(node: TreeNode, props: PreferenceTreeNodeProps): React.ReactNode;
15
17
  protected renderExpansionToggle(node: TreeNode, props: PreferenceTreeNodeProps): React.ReactNode;
@@ -1 +1 @@
1
- {"version":3,"file":"preference-tree-widget.d.ts","sourceRoot":"","sources":["../../../src/browser/views/preference-tree-widget.tsx"],"names":[],"mappings":";AAiBA,OAAO,EAEH,QAAQ,EACR,SAAS,EACT,UAAU,EAEb,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,GAAG,QAAQ,0BAA0B,CAAC,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AAE/G,qBACa,qBAAsB,SAAQ,UAAU;IACjD,MAAM,CAAC,EAAE,SAAsB;IAE/B,SAAS,CAAC,yBAAyB,EAAE,OAAO,CAAQ;IACpD,SAAS,CAAC,sBAAsB,EAAE,MAAM,CAAC;IAEzC,SAA+C,KAAK,EAAE,mBAAmB,CAAC;IACvD,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAGlD,IAAI,IAAI,IAAI;IAUZ,YAAY,IAAI,IAAI;cAWV,eAAe,CAAC,EAAE,KAAK,EAAE,eAAe,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,qBAAqB,GAAG,KAAK,CAAC,SAAS;cAIvG,UAAU,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,uBAAuB,GAAG,KAAK,CAAC,SAAS;cAc3E,qBAAqB,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,uBAAuB,GAAG,KAAK,CAAC,SAAS;cAOtF,UAAU,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM;CAQxD"}
1
+ {"version":3,"file":"preference-tree-widget.d.ts","sourceRoot":"","sources":["../../../src/browser/views/preference-tree-widget.tsx"],"names":[],"mappings":";AAiBA,OAAO,EAEH,QAAQ,EACR,SAAS,EACT,UAAU,EAEb,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,GAAG,QAAQ,0BAA0B,CAAC,CAAC;AACnD,OAAO,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AAC/G,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEtD,qBACa,qBAAsB,SAAQ,UAAU;IACjD,MAAM,CAAC,EAAE,SAAsB;IAE/B,SAAS,CAAC,yBAAyB,EAAE,OAAO,CAAQ;IACpD,SAAS,CAAC,sBAAsB,EAAE,MAAM,CAAC;IAEzC,SAA+C,KAAK,EAAE,mBAAmB,CAAC;IACvD,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC;IAGlD,IAAI,IAAI,IAAI;IAUZ,YAAY,IAAI,IAAI;IAW7B,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,UAAU,CAAC,QAAQ,GAAG,OAAO;cAQxC,eAAe,CAAC,EAAE,KAAK,EAAE,eAAe,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,qBAAqB,GAAG,KAAK,CAAC,SAAS;cAIvG,UAAU,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,uBAAuB,GAAG,KAAK,CAAC,SAAS;cAc3E,qBAAqB,CAAC,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,uBAAuB,GAAG,KAAK,CAAC,SAAS;cAOtF,UAAU,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM;CAQxD"}
@@ -22,6 +22,7 @@ const inversify_1 = require("@theia/core/shared/inversify");
22
22
  const browser_1 = require("@theia/core/lib/browser");
23
23
  const React = require("@theia/core/shared/react");
24
24
  const preference_tree_model_1 = require("../preference-tree-model");
25
+ const preference_types_1 = require("../util/preference-types");
25
26
  let PreferencesTreeWidget = PreferencesTreeWidget_1 = class PreferencesTreeWidget extends browser_1.TreeWidget {
26
27
  constructor() {
27
28
  super(...arguments);
@@ -40,12 +41,20 @@ let PreferencesTreeWidget = PreferencesTreeWidget_1 = class PreferencesTreeWidge
40
41
  this.rows = new Map();
41
42
  let index = 0;
42
43
  for (const [id, nodeRow] of this.model.currentRows.entries()) {
43
- if (nodeRow.visibleChildren > 0 && (browser_1.ExpandableTreeNode.is(nodeRow.node) || browser_1.ExpandableTreeNode.isExpanded(nodeRow.node.parent))) {
44
+ if (nodeRow.visibleChildren > 0 && this.isVisibleNode(nodeRow.node)) {
44
45
  this.rows.set(id, { ...nodeRow, index: index++ });
45
46
  }
46
47
  }
47
48
  this.updateScrollToRow();
48
49
  }
50
+ isVisibleNode(node) {
51
+ if (preference_types_1.Preference.TreeNode.isTopLevel(node)) {
52
+ return true;
53
+ }
54
+ else {
55
+ return browser_1.ExpandableTreeNode.isExpanded(node.parent) && preference_types_1.Preference.TreeNode.is(node.parent) && this.isVisibleNode(node.parent);
56
+ }
57
+ }
49
58
  doRenderNodeRow({ depth, visibleChildren, node, isExpansible }) {
50
59
  return this.renderNode(node, { depth, visibleChildren, isExpansible });
51
60
  }
@@ -1 +1 @@
1
- {"version":3,"file":"preference-tree-widget.js","sourceRoot":"","sources":["../../../src/browser/views/preference-tree-widget.tsx"],"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,gFAAgF;AAChF,gFAAgF;;;;;AAEhF,4DAAiF;AACjF,qDAMiC;AACjC,kDAAmD;AACnD,oEAA+G;AAGxG,IAAM,qBAAqB,6BAA3B,MAAM,qBAAsB,SAAQ,oBAAU;IAA9C;;QAGO,8BAAyB,GAAY,IAAI,CAAC;IA6DxD,CAAC;IAtDY,IAAI;QACT,KAAK,CAAC,IAAI,EAAE,CAAC;QACb,IAAI,CAAC,EAAE,GAAG,uBAAqB,CAAC,EAAE,CAAC;QACnC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;YACnB,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,EAAE;gBAC5B,IAAI,CAAC,UAAU,EAAE,CAAC;YACtB,CAAC,CAAC;SACL,CAAC,CAAC;IACP,CAAC;IAEQ,YAAY;QACjB,IAAI,CAAC,IAAI,GAAG,IAAI,GAAG,EAAE,CAAC;QACtB,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,KAAK,MAAM,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC;YAC3D,IAAI,OAAO,CAAC,eAAe,GAAG,CAAC,IAAI,CAAC,4BAAkB,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,4BAAkB,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;gBAC7H,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;YACtD,CAAC;QACL,CAAC;QACD,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC7B,CAAC;IAEkB,eAAe,CAAC,EAAE,KAAK,EAAE,eAAe,EAAE,IAAI,EAAE,YAAY,EAAyB;QACpG,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,CAAC,CAAC;IAC3E,CAAC;IAEkB,UAAU,CAAC,IAAc,EAAE,KAA8B;QACxE,IAAI,CAAC,kBAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;YAC5B,OAAO,SAAS,CAAC;QACrB,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAE1D,MAAM,OAAO,GAAG,6BAAK,SAAS,EAAE,iCAAuB;YAClD,IAAI,CAAC,qBAAqB,CAAC,IAAI,EAAE,KAAK,CAAC;YACvC,IAAI,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,CAC9B,CAAC;QACP,OAAO,KAAK,CAAC,aAAa,CAAC,KAAK,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;IAC3D,CAAC;IAEkB,qBAAqB,CAAC,IAAc,EAAE,KAA8B;QACnF,IAAI,4BAAkB,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC;YACrD,OAAO,6BAAK,SAAS,EAAC,yBAAyB,GAAG,CAAC;QACvD,CAAC;QACD,OAAO,KAAK,CAAC,qBAAqB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACpD,CAAC;IAEkB,UAAU,CAAC,IAAc;;QACxC,MAAM,eAAe,GAAG,MAAA,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,0CAAE,eAAe,CAAC;QAC7E,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAClD,MAAM,8BAA8B,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,IAAI,eAAe,KAAK,SAAS;YACzF,CAAC,CAAC,GAAG,QAAQ,KAAK,eAAe,GAAG;YACpC,CAAC,CAAC,QAAQ,CAAC;QACf,OAAO,8BAA8B,CAAC;IAC1C,CAAC;;AA/DQ,sDAAqB;AACvB,wBAAE,GAAG,kBAAkB,AAArB,CAAsB;AAKgB;IAA9C,IAAA,kBAAM,EAAC,2CAAmB,CAAC;sCAA0B,2CAAmB;oDAAC;AACpC;IAArC,IAAA,kBAAM,EAAC,mBAAS,CAAC;;wDAAyC;AAGlD;IADR,IAAA,yBAAa,GAAE;;;;iDASf;gCAlBQ,qBAAqB;IADjC,IAAA,sBAAU,GAAE;GACA,qBAAqB,CAgEjC"}
1
+ {"version":3,"file":"preference-tree-widget.js","sourceRoot":"","sources":["../../../src/browser/views/preference-tree-widget.tsx"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,15 +1,15 @@
1
1
  {
2
2
  "name": "@theia/preferences",
3
- "version": "1.53.0-next.4+9e9124118",
3
+ "version": "1.53.0-next.55+d1a989a68c",
4
4
  "description": "Theia - Preferences Extension",
5
5
  "dependencies": {
6
- "@theia/core": "1.53.0-next.4+9e9124118",
7
- "@theia/editor": "1.53.0-next.4+9e9124118",
8
- "@theia/filesystem": "1.53.0-next.4+9e9124118",
9
- "@theia/monaco": "1.53.0-next.4+9e9124118",
6
+ "@theia/core": "1.53.0-next.55+d1a989a68c",
7
+ "@theia/editor": "1.53.0-next.55+d1a989a68c",
8
+ "@theia/filesystem": "1.53.0-next.55+d1a989a68c",
9
+ "@theia/monaco": "1.53.0-next.55+d1a989a68c",
10
10
  "@theia/monaco-editor-core": "1.83.101",
11
- "@theia/userstorage": "1.53.0-next.4+9e9124118",
12
- "@theia/workspace": "1.53.0-next.4+9e9124118",
11
+ "@theia/userstorage": "1.53.0-next.55+d1a989a68c",
12
+ "@theia/workspace": "1.53.0-next.55+d1a989a68c",
13
13
  "async-mutex": "^0.3.1",
14
14
  "fast-deep-equal": "^3.1.3",
15
15
  "jsonc-parser": "^2.2.0",
@@ -50,10 +50,10 @@
50
50
  "watch": "theiaext watch"
51
51
  },
52
52
  "devDependencies": {
53
- "@theia/ext-scripts": "1.52.0"
53
+ "@theia/ext-scripts": "1.53.0"
54
54
  },
55
55
  "nyc": {
56
56
  "extends": "../../configs/nyc.json"
57
57
  },
58
- "gitHead": "9e912411843f32b2a549ef6580b07872edd95e8b"
58
+ "gitHead": "d1a989a68c1b5ec1f9098e9126653c6346844769"
59
59
  }
@@ -1,95 +1,95 @@
1
- // *****************************************************************************
2
- // Copyright (C) 2021 Ericsson and others.
3
- //
4
- // This program and the accompanying materials are made available under the
5
- // terms of the Eclipse Public License v. 2.0 which is available at
6
- // http://www.eclipse.org/legal/epl-2.0.
7
- //
8
- // This Source Code may also be made available under the following Secondary
9
- // Licenses when the conditions for such availability set forth in the Eclipse
10
- // Public License v. 2.0 are satisfied: GNU General Public License, version 2
11
- // with the GNU Classpath Exception which is available at
12
- // https://www.gnu.org/software/classpath/license.html.
13
- //
14
- // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
15
- // *****************************************************************************
16
-
17
- /* eslint-disable @typescript-eslint/no-explicit-any */
18
-
19
- import { enableJSDOM } from '@theia/core/lib/browser/test/jsdom';
20
- const disableJSDOM = enableJSDOM();
21
-
22
- import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider';
23
- FrontendApplicationConfigProvider.set({});
24
-
25
- import { expect } from 'chai';
26
- import { Container } from '@theia/core/shared/inversify';
27
- import { AbstractResourcePreferenceProvider } from './abstract-resource-preference-provider';
28
- import { FileService } from '@theia/filesystem/lib/browser/file-service';
29
- import { bindPreferenceService } from '@theia/core/lib/browser/frontend-application-bindings';
30
- import { bindMockPreferenceProviders } from '@theia/core/lib/browser/preferences/test';
31
- import { Deferred } from '@theia/core/lib/common/promise-util';
32
- import { Disposable, MessageService } from '@theia/core/lib/common';
33
- import { MonacoWorkspace } from '@theia/monaco/lib/browser/monaco-workspace';
34
- import { PreferenceSchemaProvider } from '@theia/core/lib/browser';
35
- import { EditorManager } from '@theia/editor/lib/browser';
36
- import { PreferenceTransactionFactory } from './preference-transaction-manager';
37
-
38
- disableJSDOM();
39
-
40
- class MockFileService {
41
- releaseContent = new Deferred();
42
- async read(): Promise<{ value: string }> {
43
- await this.releaseContent.promise;
44
- return { value: JSON.stringify({ 'editor.fontSize': 20 }) };
45
- }
46
- watch = RETURN_DISPOSABLE;
47
- onDidFilesChange = RETURN_DISPOSABLE;
48
- }
49
-
50
- const RETURN_DISPOSABLE = () => Disposable.NULL;
51
-
52
- const mockSchemaProvider = { getCombinedSchema: () => ({ properties: {} }) };
53
-
54
- class LessAbstractPreferenceProvider extends AbstractResourcePreferenceProvider {
55
- getUri(): any { }
56
- getScope(): any { }
57
- }
58
-
59
- describe('AbstractResourcePreferenceProvider', () => {
60
- let provider: AbstractResourcePreferenceProvider;
61
- let fileService: MockFileService;
62
-
63
- beforeEach(() => {
64
- fileService = new MockFileService();
65
- const testContainer = new Container();
66
- bindPreferenceService(testContainer.bind.bind(testContainer));
67
- bindMockPreferenceProviders(testContainer.bind.bind(testContainer), testContainer.unbind.bind(testContainer));
68
- testContainer.rebind(<any>PreferenceSchemaProvider).toConstantValue(mockSchemaProvider);
69
- testContainer.bind(<any>FileService).toConstantValue(fileService);
70
- testContainer.bind(<any>MessageService).toConstantValue(undefined);
71
- testContainer.bind(<any>MonacoWorkspace).toConstantValue(undefined);
72
- testContainer.bind(<any>EditorManager).toConstantValue(undefined);
73
- testContainer.bind(<any>PreferenceTransactionFactory).toConstantValue(undefined);
74
- provider = testContainer.resolve(<any>LessAbstractPreferenceProvider);
75
- });
76
-
77
- it('should not store any preferences before it is ready.', async () => {
78
- const resolveWhenFinished = new Deferred();
79
- const errorIfReadyFirst = provider.ready.then(() => Promise.reject());
80
-
81
- expect(provider.get('editor.fontSize')).to.be.undefined;
82
-
83
- resolveWhenFinished.resolve();
84
- fileService.releaseContent.resolve(); // Allow the initialization to run
85
-
86
- // This promise would reject if the provider had declared itself ready before we resolve `resolveWhenFinished`
87
- await Promise.race([resolveWhenFinished.promise, errorIfReadyFirst]);
88
- });
89
-
90
- it('should report values in file when `ready` resolves.', async () => {
91
- fileService.releaseContent.resolve();
92
- await provider.ready;
93
- expect(provider.get('editor.fontSize')).to.equal(20); // The value provided by the mock FileService implementation.
94
- });
95
- });
1
+ // *****************************************************************************
2
+ // Copyright (C) 2021 Ericsson and others.
3
+ //
4
+ // This program and the accompanying materials are made available under the
5
+ // terms of the Eclipse Public License v. 2.0 which is available at
6
+ // http://www.eclipse.org/legal/epl-2.0.
7
+ //
8
+ // This Source Code may also be made available under the following Secondary
9
+ // Licenses when the conditions for such availability set forth in the Eclipse
10
+ // Public License v. 2.0 are satisfied: GNU General Public License, version 2
11
+ // with the GNU Classpath Exception which is available at
12
+ // https://www.gnu.org/software/classpath/license.html.
13
+ //
14
+ // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
15
+ // *****************************************************************************
16
+
17
+ /* eslint-disable @typescript-eslint/no-explicit-any */
18
+
19
+ import { enableJSDOM } from '@theia/core/lib/browser/test/jsdom';
20
+ const disableJSDOM = enableJSDOM();
21
+
22
+ import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider';
23
+ FrontendApplicationConfigProvider.set({});
24
+
25
+ import { expect } from 'chai';
26
+ import { Container } from '@theia/core/shared/inversify';
27
+ import { AbstractResourcePreferenceProvider } from './abstract-resource-preference-provider';
28
+ import { FileService } from '@theia/filesystem/lib/browser/file-service';
29
+ import { bindPreferenceService } from '@theia/core/lib/browser/frontend-application-bindings';
30
+ import { bindMockPreferenceProviders } from '@theia/core/lib/browser/preferences/test';
31
+ import { Deferred } from '@theia/core/lib/common/promise-util';
32
+ import { Disposable, MessageService } from '@theia/core/lib/common';
33
+ import { MonacoWorkspace } from '@theia/monaco/lib/browser/monaco-workspace';
34
+ import { PreferenceSchemaProvider } from '@theia/core/lib/browser';
35
+ import { EditorManager } from '@theia/editor/lib/browser';
36
+ import { PreferenceTransactionFactory } from './preference-transaction-manager';
37
+
38
+ disableJSDOM();
39
+
40
+ class MockFileService {
41
+ releaseContent = new Deferred();
42
+ async read(): Promise<{ value: string }> {
43
+ await this.releaseContent.promise;
44
+ return { value: JSON.stringify({ 'editor.fontSize': 20 }) };
45
+ }
46
+ watch = RETURN_DISPOSABLE;
47
+ onDidFilesChange = RETURN_DISPOSABLE;
48
+ }
49
+
50
+ const RETURN_DISPOSABLE = () => Disposable.NULL;
51
+
52
+ const mockSchemaProvider = { getCombinedSchema: () => ({ properties: {} }) };
53
+
54
+ class LessAbstractPreferenceProvider extends AbstractResourcePreferenceProvider {
55
+ getUri(): any { }
56
+ getScope(): any { }
57
+ }
58
+
59
+ describe('AbstractResourcePreferenceProvider', () => {
60
+ let provider: AbstractResourcePreferenceProvider;
61
+ let fileService: MockFileService;
62
+
63
+ beforeEach(() => {
64
+ fileService = new MockFileService();
65
+ const testContainer = new Container();
66
+ bindPreferenceService(testContainer.bind.bind(testContainer));
67
+ bindMockPreferenceProviders(testContainer.bind.bind(testContainer), testContainer.unbind.bind(testContainer));
68
+ testContainer.rebind(<any>PreferenceSchemaProvider).toConstantValue(mockSchemaProvider);
69
+ testContainer.bind(<any>FileService).toConstantValue(fileService);
70
+ testContainer.bind(<any>MessageService).toConstantValue(undefined);
71
+ testContainer.bind(<any>MonacoWorkspace).toConstantValue(undefined);
72
+ testContainer.bind(<any>EditorManager).toConstantValue(undefined);
73
+ testContainer.bind(<any>PreferenceTransactionFactory).toConstantValue(undefined);
74
+ provider = testContainer.resolve(<any>LessAbstractPreferenceProvider);
75
+ });
76
+
77
+ it('should not store any preferences before it is ready.', async () => {
78
+ const resolveWhenFinished = new Deferred();
79
+ const errorIfReadyFirst = provider.ready.then(() => Promise.reject());
80
+
81
+ expect(provider.get('editor.fontSize')).to.be.undefined;
82
+
83
+ resolveWhenFinished.resolve();
84
+ fileService.releaseContent.resolve(); // Allow the initialization to run
85
+
86
+ // This promise would reject if the provider had declared itself ready before we resolve `resolveWhenFinished`
87
+ await Promise.race([resolveWhenFinished.promise, errorIfReadyFirst]);
88
+ });
89
+
90
+ it('should report values in file when `ready` resolves.', async () => {
91
+ fileService.releaseContent.resolve();
92
+ await provider.ready;
93
+ expect(provider.get('editor.fontSize')).to.equal(20); // The value provided by the mock FileService implementation.
94
+ });
95
+ });