@theia/preferences 1.46.0-next.226 → 1.46.0-next.233
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.
|
@@ -30,6 +30,7 @@ export declare class PreferenceTreeModel extends TreeModelImpl {
|
|
|
30
30
|
readonly onFilterChanged: Event<PreferenceFilterChangeEvent>;
|
|
31
31
|
protected lastSearchedFuzzy: string;
|
|
32
32
|
protected lastSearchedLiteral: string;
|
|
33
|
+
protected lastSearchedTags: string[];
|
|
33
34
|
protected _currentScope: number;
|
|
34
35
|
protected _isFiltered: boolean;
|
|
35
36
|
protected _currentRows: Map<string, PreferenceTreeNodeRow>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preference-tree-model.d.ts","sourceRoot":"","sources":["../../src/browser/preference-tree-model.ts"],"names":[],"mappings":"AAiBA,OAAO,EACH,aAAa,EACb,UAAU,EACV,iBAAiB,EAEjB,QAAQ,EACR,wBAAwB,EACxB,sBAAsB,EACtB,SAAS,EAET,kBAAkB,EAClB,iBAAiB,EACpB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAC;AACjF,OAAO,EAAE,uBAAuB,EAAgC,MAAM,kCAAkC,CAAC;AAEzG,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAChF,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAE/C,MAAM,WAAW,uBAAwB,SAAQ,SAAS;IACtD,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,qBAAsB,SAAQ,QAAQ,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,uBAAuB;IAChG,IAAI,EAAE,UAAU,CAAC,QAAQ,CAAC;CAC7B;AACD,oBAAY,4BAA4B;IACpC,MAAM,IAAA;IACN,MAAM,IAAA;IACN,KAAK,IAAA;CACR;AACD,MAAM,WAAW,2BAA2B;IACxC,MAAM,EAAE,4BAA4B,CAAA;CACvC;AAED,qBACa,mBAAoB,SAAQ,aAAa;IAEhB,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,wBAAwB,CAAC;IAC1D,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,0BAA0B,CAAC;IAC9D,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,uBAAuB,CAAC;IAC3D,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,sBAAsB,CAAC;IAC7D,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAEnF,SAAS,CAAC,QAAQ,CAAC,0BAA0B,uCAA8C;IAC3F,QAAQ,CAAC,eAAe,qCAAyC;IAEjE,SAAS,CAAC,iBAAiB,EAAE,MAAM,CAAM;IACzC,SAAS,CAAC,mBAAmB,EAAE,MAAM,CAAM;IAC3C,SAAS,CAAC,aAAa,EAAE,MAAM,CAA0C;IACzE,SAAS,CAAC,WAAW,EAAE,OAAO,CAAS;IACvC,SAAS,CAAC,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAa;IACvE,SAAS,CAAC,mBAAmB,SAAK;IAElC,IAAI,WAAW,IAAI,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,qBAAqB,CAAC,CAAC,CAE9D;IAED,IAAI,kBAAkB,IAAI,MAAM,CAE/B;IAED,IAAI,UAAU,IAAI,OAAO,CAExB;IAED,IAAI,YAAY,IAAI;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,sBAAsB,CAAC;KAAE,CAE7D;IAED,IAAI,YAAY,IAAI,UAAU,CAAC,oBAAoB,CAElD;IAED,IAAI,eAAe,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAE9C;cAGkB,IAAI,IAAI,IAAI;cAIf,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"preference-tree-model.d.ts","sourceRoot":"","sources":["../../src/browser/preference-tree-model.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,6 +38,7 @@ let PreferenceTreeModel = class PreferenceTreeModel extends browser_1.TreeModelI
|
|
|
38
38
|
this.onFilterChanged = this.onTreeFilterChangedEmitter.event;
|
|
39
39
|
this.lastSearchedFuzzy = '';
|
|
40
40
|
this.lastSearchedLiteral = '';
|
|
41
|
+
this.lastSearchedTags = [];
|
|
41
42
|
this._currentScope = Number(preference_types_1.Preference.DEFAULT_SCOPE.scope);
|
|
42
43
|
this._isFiltered = false;
|
|
43
44
|
this._currentRows = new Map();
|
|
@@ -73,8 +74,10 @@ let PreferenceTreeModel = class PreferenceTreeModel extends browser_1.TreeModelI
|
|
|
73
74
|
this.updateFilteredRows(PreferenceFilterChangeSource.Scope);
|
|
74
75
|
}),
|
|
75
76
|
this.filterInput.onFilterChanged(newSearchTerm => {
|
|
76
|
-
this.
|
|
77
|
-
|
|
77
|
+
this.lastSearchedTags = Array.from(newSearchTerm.matchAll(/@tag:([^\s]+)/g)).map(match => match[0].slice(5));
|
|
78
|
+
const newSearchTermWithoutTags = newSearchTerm.replace(/@tag:[^\s]+/g, '');
|
|
79
|
+
this.lastSearchedLiteral = newSearchTermWithoutTags;
|
|
80
|
+
this.lastSearchedFuzzy = newSearchTermWithoutTags.replace(/\s/g, '');
|
|
78
81
|
this._isFiltered = newSearchTerm.length > 2;
|
|
79
82
|
if (this.isFiltered) {
|
|
80
83
|
this.expandAll();
|
|
@@ -142,6 +145,9 @@ let PreferenceTreeModel = class PreferenceTreeModel extends browser_1.TreeModelI
|
|
|
142
145
|
if (node.id.startsWith(preference_tree_generator_1.COMMONLY_USED_SECTION_PREFIX)) {
|
|
143
146
|
return false;
|
|
144
147
|
}
|
|
148
|
+
if (!this.lastSearchedTags.every(tag => { var _a; return (_a = node.preference.data.tags) === null || _a === void 0 ? void 0 : _a.includes(tag); })) {
|
|
149
|
+
return false;
|
|
150
|
+
}
|
|
145
151
|
return fuzzy.test(this.lastSearchedFuzzy, prefID) // search matches preference name.
|
|
146
152
|
// search matches description. Fuzzy isn't ideal here because the score depends on the order of discovery.
|
|
147
153
|
|| ((_a = node.preference.data.description) !== null && _a !== void 0 ? _a : '').includes(this.lastSearchedLiteral);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preference-tree-model.js","sourceRoot":"","sources":["../../src/browser/preference-tree-model.ts"],"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,qDAYiC;AACjC,sCAAsC;AACtC,qFAAiF;AACjF,gFAAyG;AACzG,kDAAkD;AAClD,2FAAgF;AAChF,8DAAqD;AAWrD,IAAY,4BAIX;AAJD,WAAY,4BAA4B;IACpC,mFAAM,CAAA;IACN,mFAAM,CAAA;IACN,iFAAK,CAAA;AACT,CAAC,EAJW,4BAA4B,4CAA5B,4BAA4B,QAIvC;AAMM,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,uBAAa;IAA/C;;QAQgB,+BAA0B,GAAG,IAAI,cAAO,EAA+B,CAAC;QAClF,oBAAe,GAAG,IAAI,CAAC,0BAA0B,CAAC,KAAK,CAAC;QAEvD,sBAAiB,GAAW,EAAE,CAAC;QAC/B,wBAAmB,GAAW,EAAE,CAAC;QACjC,kBAAa,GAAW,MAAM,CAAC,6BAAU,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC/D,gBAAW,GAAY,KAAK,CAAC;QAC7B,iBAAY,GAAuC,IAAI,GAAG,EAAE,CAAC;QAC7D,wBAAmB,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"preference-tree-model.js","sourceRoot":"","sources":["../../src/browser/preference-tree-model.ts"],"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,qDAYiC;AACjC,sCAAsC;AACtC,qFAAiF;AACjF,gFAAyG;AACzG,kDAAkD;AAClD,2FAAgF;AAChF,8DAAqD;AAWrD,IAAY,4BAIX;AAJD,WAAY,4BAA4B;IACpC,mFAAM,CAAA;IACN,mFAAM,CAAA;IACN,iFAAK,CAAA;AACT,CAAC,EAJW,4BAA4B,4CAA5B,4BAA4B,QAIvC;AAMM,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,uBAAa;IAA/C;;QAQgB,+BAA0B,GAAG,IAAI,cAAO,EAA+B,CAAC;QAClF,oBAAe,GAAG,IAAI,CAAC,0BAA0B,CAAC,KAAK,CAAC;QAEvD,sBAAiB,GAAW,EAAE,CAAC;QAC/B,wBAAmB,GAAW,EAAE,CAAC;QACjC,qBAAgB,GAAa,EAAE,CAAC;QAChC,kBAAa,GAAW,MAAM,CAAC,6BAAU,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC/D,gBAAW,GAAY,KAAK,CAAC;QAC7B,iBAAY,GAAuC,IAAI,GAAG,EAAE,CAAC;QAC7D,wBAAmB,GAAG,CAAC,CAAC;IAsLtC,CAAC;IApLG,IAAI,WAAW;QACX,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IAED,IAAI,kBAAkB;QAClB,OAAO,IAAI,CAAC,mBAAmB,CAAC;IACpC,CAAC;IAED,IAAI,UAAU;QACV,OAAO,IAAI,CAAC,WAAW,CAAC;IAC5B,CAAC;IAED,IAAI,YAAY;QACZ,OAAO,IAAI,CAAC,cAAc,CAAC,iBAAiB,EAAE,CAAC,UAAU,CAAC;IAC9D,CAAC;IAED,IAAI,YAAY;QACZ,OAAO,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC;IAC1C,CAAC;IAED,IAAI,eAAe;QACf,OAAO,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC;IAC9C,CAAC;IAGkB,IAAI;QACnB,IAAI,CAAC,MAAM,EAAE,CAAC;IAClB,CAAC;IAES,KAAK,CAAC,MAAM;QAClB,KAAK,CAAC,IAAI,EAAE,CAAC;QACb,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC;YACnB,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;YAC5E,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,YAAY,CAAC,EAAE;gBAC5C,IAAI,CAAC,aAAa,GAAG,YAAY,CAAC,KAAK,CAAC;gBACxC,IAAI,CAAC,kBAAkB,CAAC,4BAA4B,CAAC,KAAK,CAAC,CAAC;YAChE,CAAC,CAAC;YACF,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,aAAa,CAAC,EAAE;gBAC7C,IAAI,CAAC,gBAAgB,GAAG,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC7G,MAAM,wBAAwB,GAAG,aAAa,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;gBAC3E,IAAI,CAAC,mBAAmB,GAAG,wBAAwB,CAAC;gBACpD,IAAI,CAAC,iBAAiB,GAAG,wBAAwB,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;gBACrE,IAAI,CAAC,WAAW,GAAG,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC;gBAC5C,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;oBAClB,IAAI,CAAC,SAAS,EAAE,CAAC;gBACrB,CAAC;qBAAM,IAAI,2BAAiB,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;oBACzC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAChC,CAAC;gBACD,IAAI,CAAC,kBAAkB,CAAC,4BAA4B,CAAC,MAAM,CAAC,CAAC;YACjE,CAAC,CAAC;YACF,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE;gBACtB,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;YAClE,CAAC,CAAC;YACF,IAAI,CAAC,0BAA0B;SAClC,CAAC,CAAC;QACH,MAAM,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC;QACnC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAClD,CAAC;IAEO,eAAe,CAAC,OAA0B;QAC9C,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC;QACpB,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YAClB,IAAI,CAAC,SAAS,EAAE,CAAC;QACrB,CAAC;QACD,IAAI,CAAC,kBAAkB,CAAC,4BAA4B,CAAC,MAAM,CAAC,CAAC;IACjE,CAAC;IAES,UAAU;QAChB,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACvB,IAAI,CAAC,YAAY,GAAG,IAAI,GAAG,EAAE,CAAC;QAC9B,IAAI,IAAI,EAAE,CAAC;YACP,IAAI,CAAC,mBAAmB,GAAG,CAAC,CAAC;YAC7B,IAAI,KAAK,GAAG,CAAC,CAAC;YAEd,KAAK,MAAM,IAAI,IAAI,IAAI,6BAAmB,CAAC,IAAI,EAAE;gBAC7C,cAAc,EAAE,KAAK;gBACrB,aAAa,EAAE,IAAI;aACtB,CAAC,EAAE,CAAC;gBACD,IAAI,kBAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,6BAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC3D,MAAM,EAAE,EAAE,EAAE,GAAG,6BAAU,CAAC,QAAQ,CAAC,uBAAuB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;oBACpE,IAAI,2BAAiB,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC;wBACpE,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;wBAEjC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE;4BAC3B,KAAK,EAAE,KAAK,EAAE;4BACd,IAAI;4BACJ,KAAK,EAAE,IAAI,CAAC,KAAK;4BACjB,eAAe,EAAE,CAAC;yBACrB,CAAC,CAAC;oBACP,CAAC;gBACL,CAAC;YACL,CAAC;QACL,CAAC;IACL,CAAC;IAES,kBAAkB,CAAC,MAAoC;QAC7D,IAAI,CAAC,UAAU,EAAE,CAAC;QAClB,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;IACrD,CAAC;IAES,oBAAoB,CAAC,IAAyB,EAAE,MAAc;;QACpE,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;YAClE,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACpB,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,gKAAgK;QAChK,gJAAgJ;QAChJ,yJAAyJ;QACzJ,IAAI,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,wDAA4B,CAAC,EAAE,CAAC;YACnD,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,WAAC,OAAA,MAAA,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,0CAAE,QAAQ,CAAC,GAAG,CAAC,CAAA,EAAA,CAAC,EAAE,CAAC;YAChF,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC,kCAAkC;YAChF,0GAA0G;eACvG,CAAC,MAAA,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,mCAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IACvF,CAAC;IAEkB,uBAAuB,CAAC,IAAc;;QACrD,OAAO,2BAAiB,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA,MAAA,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,0CAAE,eAAe,CAAA,CAAC;IAC3F,CAAC;IAES,qBAAqB,CAAC,IAAc;;QAC1C,IAAI,CAAC,2BAAiB,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;YAC9B,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC3B,IAAI,UAAU,GAAG,CAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,EAAE,KAAI,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,MAAA,IAAI,CAAC,MAAM,0CAAE,EAAE,CAAC,CAAC;YAC3E,OAAO,UAAU,IAAI,UAAU,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,EAAE,CAAC;gBACjD,IAAI,UAAU,EAAE,CAAC;oBACb,UAAU,CAAC,eAAe,IAAI,CAAC,CAAC;gBACpC,CAAC;gBACD,UAAU,GAAG,CAAA,MAAA,UAAU,CAAC,IAAI,CAAC,MAAM,0CAAE,EAAE,KAAI,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,MAAA,UAAU,CAAC,IAAI,CAAC,MAAM,0CAAE,EAAE,CAAC,CAAC;gBAC7F,IAAI,UAAU,EAAE,CAAC;oBACb,UAAU,CAAC,YAAY,GAAG,IAAI,CAAC;gBACnC,CAAC;YACL,CAAC;QACL,CAAC;IACL,CAAC;IAED,iBAAiB,CAAC,QAA8B;QAC5C,IAAI,4BAAkB,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC;YAClC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAC9B,CAAC;QACD,IAAI,2BAAiB,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAClC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBAC/B,IAAI,KAAK,KAAK,QAAQ,IAAI,4BAAkB,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC;oBACrD,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;gBAC7B,CAAC;YACL,CAAC,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IAES,SAAS;QACf,IAAI,2BAAiB,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAClC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBAC/B,IAAI,4BAAkB,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC/B,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;gBAC3B,CAAC;YACL,CAAC,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IAED,uBAAuB,CAAC,EAAU;QAC9B,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC;QAC5D,OAAO,IAAI,IAAI,6BAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IACnE,CAAC;IAED;;OAEG;IACH,mBAAmB,CAAC,IAAwB;QACxC,MAAM,iBAAiB,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QAChD,IAAI,IAAI,KAAK,iBAAiB,EAAE,CAAC;YAC7B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YACtB,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;CACJ,CAAA;AAvMY,kDAAmB;AAEyB;IAApD,IAAA,kBAAM,EAAC,kCAAwB,CAAC;sCAAoC,kCAAwB;2DAAC;AACvC;IAAtD,IAAA,kBAAM,EAAC,wDAA0B,CAAC;sCAAiC,wDAA0B;wDAAC;AAC3C;IAAnD,IAAA,kBAAM,EAAC,mDAAuB,CAAC;sCAAmC,mDAAuB;0DAAC;AACxC;IAAlD,IAAA,kBAAM,EAAC,uDAAsB,CAAC;sCAAkC,uDAAsB;yDAAC;AAC1C;IAA7C,IAAA,kBAAM,EAAC,2BAAiB,CAAC;;8DAAyD;AAsChE;IADlB,IAAA,yBAAa,GAAE;;;;+CAGf;8BA9CQ,mBAAmB;IAD/B,IAAA,sBAAU,GAAE;GACA,mBAAmB,CAuM/B"}
|
package/package.json
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/preferences",
|
|
3
|
-
"version": "1.46.0-next.
|
|
3
|
+
"version": "1.46.0-next.233+fdfb59d92",
|
|
4
4
|
"description": "Theia - Preferences Extension",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.46.0-next.
|
|
7
|
-
"@theia/editor": "1.46.0-next.
|
|
8
|
-
"@theia/filesystem": "1.46.0-next.
|
|
9
|
-
"@theia/monaco": "1.46.0-next.
|
|
6
|
+
"@theia/core": "1.46.0-next.233+fdfb59d92",
|
|
7
|
+
"@theia/editor": "1.46.0-next.233+fdfb59d92",
|
|
8
|
+
"@theia/filesystem": "1.46.0-next.233+fdfb59d92",
|
|
9
|
+
"@theia/monaco": "1.46.0-next.233+fdfb59d92",
|
|
10
10
|
"@theia/monaco-editor-core": "1.83.101",
|
|
11
|
-
"@theia/userstorage": "1.46.0-next.
|
|
12
|
-
"@theia/workspace": "1.46.0-next.
|
|
11
|
+
"@theia/userstorage": "1.46.0-next.233+fdfb59d92",
|
|
12
|
+
"@theia/workspace": "1.46.0-next.233+fdfb59d92",
|
|
13
13
|
"async-mutex": "^0.3.1",
|
|
14
14
|
"fast-deep-equal": "^3.1.3",
|
|
15
15
|
"jsonc-parser": "^2.2.0",
|
|
@@ -55,5 +55,5 @@
|
|
|
55
55
|
"nyc": {
|
|
56
56
|
"extends": "../../configs/nyc.json"
|
|
57
57
|
},
|
|
58
|
-
"gitHead": "
|
|
58
|
+
"gitHead": "fdfb59d92e7ff8bf9fc1573910d4b8300857f455"
|
|
59
59
|
}
|
|
@@ -67,6 +67,7 @@ export class PreferenceTreeModel extends TreeModelImpl {
|
|
|
67
67
|
|
|
68
68
|
protected lastSearchedFuzzy: string = '';
|
|
69
69
|
protected lastSearchedLiteral: string = '';
|
|
70
|
+
protected lastSearchedTags: string[] = [];
|
|
70
71
|
protected _currentScope: number = Number(Preference.DEFAULT_SCOPE.scope);
|
|
71
72
|
protected _isFiltered: boolean = false;
|
|
72
73
|
protected _currentRows: Map<string, PreferenceTreeNodeRow> = new Map();
|
|
@@ -110,8 +111,10 @@ export class PreferenceTreeModel extends TreeModelImpl {
|
|
|
110
111
|
this.updateFilteredRows(PreferenceFilterChangeSource.Scope);
|
|
111
112
|
}),
|
|
112
113
|
this.filterInput.onFilterChanged(newSearchTerm => {
|
|
113
|
-
this.
|
|
114
|
-
|
|
114
|
+
this.lastSearchedTags = Array.from(newSearchTerm.matchAll(/@tag:([^\s]+)/g)).map(match => match[0].slice(5));
|
|
115
|
+
const newSearchTermWithoutTags = newSearchTerm.replace(/@tag:[^\s]+/g, '');
|
|
116
|
+
this.lastSearchedLiteral = newSearchTermWithoutTags;
|
|
117
|
+
this.lastSearchedFuzzy = newSearchTermWithoutTags.replace(/\s/g, '');
|
|
115
118
|
this._isFiltered = newSearchTerm.length > 2;
|
|
116
119
|
if (this.isFiltered) {
|
|
117
120
|
this.expandAll();
|
|
@@ -183,6 +186,9 @@ export class PreferenceTreeModel extends TreeModelImpl {
|
|
|
183
186
|
if (node.id.startsWith(COMMONLY_USED_SECTION_PREFIX)) {
|
|
184
187
|
return false;
|
|
185
188
|
}
|
|
189
|
+
if (!this.lastSearchedTags.every(tag => node.preference.data.tags?.includes(tag))) {
|
|
190
|
+
return false;
|
|
191
|
+
}
|
|
186
192
|
return fuzzy.test(this.lastSearchedFuzzy, prefID) // search matches preference name.
|
|
187
193
|
// search matches description. Fuzzy isn't ideal here because the score depends on the order of discovery.
|
|
188
194
|
|| (node.preference.data.description ?? '').includes(this.lastSearchedLiteral);
|