@theia/file-search 1.70.0-next.6 → 1.70.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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quick-file-select-service.d.ts","sourceRoot":"","sources":["../../src/browser/quick-file-select-service.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACjG,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAe,iBAAiB,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,yDAAyD,CAAC;AACpI,OAAO,EAAE,iBAAiB,EAAO,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACvG,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AACxE,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAG7C,OAAO,EAAY,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,yBAAyB,EAAE,MAAM,kEAAkE,CAAC;AAC7G,OAAO,EAAE,gBAAgB,EAAE,MAAM,gDAAgD,CAAC;AAClF,OAAO,EAAE,4BAA4B,EAAE,MAAM,8BAA8B,CAAC;AAC5E,OAAO,EAAE,iBAAiB,EAA8B,MAAM,+BAA+B,CAAC;AAE9F,MAAM,WAAW,cAAc;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,KAAK,CAAC;CACjB;AAED,MAAM,WAAW,sBAAsB;IACnC,6DAA6D;IAC7D,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,0CAA0C;IAC1C,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,iBAAiB,KAAK,IAAI,CAAC;CAChD;AAID,MAAM,MAAM,iBAAiB,GAAG,aAAa,GAAG;IAAE,GAAG,EAAE,GAAG,CAAA;CAAE,CAAC;AAE7D,yBAAiB,iBAAiB,CAAC;IAC/B,SAAgB,EAAE,CAAC,GAAG,EAAE,aAAa,GAAG,kBAAkB,GAAG,GAAG,IAAI,iBAAiB,CAEpF;CACJ;AAED,qBACa,sBAAsB;IAG/B,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAE1D,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAEtD,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAEhD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAExD,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IAE5D,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAExD,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAEhD,SAAS,CAAC,QAAQ,CAAC,yBAAyB,EAAE,yBAAyB,CAAC;IAExE,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAElD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,iBAAiB,CAAC;IAElD,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,4BAA4B,CAAC;IAErE;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAI5B;IAEI,QAAQ,CACV,UAAU,GAAE,MAAW,EACvB,KAAK,GAAE,iBAA0C,EACjD,OAAO,GAAE,sBAER,GACF,OAAO,CAAC,UAAU,CAAC;IAwEtB,SAAS,CAAC,kBAAkB,IAAI,MAAM,EAAE;IAIxC,SAAS,CAAC,YAAY,CAClB,IAAI,EAAE,iBAAiB,EACvB,KAAK,EAAE,iBAAiB,EACxB,UAAU,EAAE,MAAM,GACnB,MAAM;
|
|
1
|
+
{"version":3,"file":"quick-file-select-service.d.ts","sourceRoot":"","sources":["../../src/browser/quick-file-select-service.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AACjG,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAe,iBAAiB,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,yDAAyD,CAAC;AACpI,OAAO,EAAE,iBAAiB,EAAO,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AACvG,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AACxE,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAG7C,OAAO,EAAY,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,yBAAyB,EAAE,MAAM,kEAAkE,CAAC;AAC7G,OAAO,EAAE,gBAAgB,EAAE,MAAM,gDAAgD,CAAC;AAClF,OAAO,EAAE,4BAA4B,EAAE,MAAM,8BAA8B,CAAC;AAC5E,OAAO,EAAE,iBAAiB,EAA8B,MAAM,+BAA+B,CAAC;AAE9F,MAAM,WAAW,cAAc;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,KAAK,CAAC;CACjB;AAED,MAAM,WAAW,sBAAsB;IACnC,6DAA6D;IAC7D,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,0CAA0C;IAC1C,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,iBAAiB,KAAK,IAAI,CAAC;CAChD;AAID,MAAM,MAAM,iBAAiB,GAAG,aAAa,GAAG;IAAE,GAAG,EAAE,GAAG,CAAA;CAAE,CAAC;AAE7D,yBAAiB,iBAAiB,CAAC;IAC/B,SAAgB,EAAE,CAAC,GAAG,EAAE,aAAa,GAAG,kBAAkB,GAAG,GAAG,IAAI,iBAAiB,CAEpF;CACJ;AAED,qBACa,sBAAsB;IAG/B,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAE1D,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAEtD,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAEhD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAExD,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IAE5D,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAExD,SAAS,CAAC,QAAQ,CAAC,aAAa,EAAE,aAAa,CAAC;IAEhD,SAAS,CAAC,QAAQ,CAAC,yBAAyB,EAAE,yBAAyB,CAAC;IAExE,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAElD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,iBAAiB,CAAC;IAElD,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,4BAA4B,CAAC;IAErE;;OAEG;IACH,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAI5B;IAEI,QAAQ,CACV,UAAU,GAAE,MAAW,EACvB,KAAK,GAAE,iBAA0C,EACjD,OAAO,GAAE,sBAER,GACF,OAAO,CAAC,UAAU,CAAC;IAwEtB,SAAS,CAAC,kBAAkB,IAAI,MAAM,EAAE;IAIxC,SAAS,CAAC,YAAY,CAClB,IAAI,EAAE,iBAAiB,EACvB,KAAK,EAAE,iBAAiB,EACxB,UAAU,EAAE,MAAM,GACnB,MAAM;IAgDT,OAAO,CAAC,MAAM;IAsBd,OAAO,CAAC,kBAAkB;IAQ1B,OAAO,CAAC,kBAAkB;IAI1B;;;;;OAKG;IACH,SAAS,CAAC,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,cAAc;CAsBpE"}
|
|
@@ -47,8 +47,8 @@ let QuickFileSelectService = class QuickFileSelectService {
|
|
|
47
47
|
*/
|
|
48
48
|
static { this.Scores = {
|
|
49
49
|
max: 1000, // represents the maximum score from fuzzy matching (Infinity).
|
|
50
|
-
exact:
|
|
51
|
-
partial:
|
|
50
|
+
exact: 5000, // represents the score assigned to exact matching.
|
|
51
|
+
partial: 2000 // represents the score assigned to partial matching.
|
|
52
52
|
}; }
|
|
53
53
|
async getPicks(fileFilter = '', token = common_1.CancellationToken.None, options = {
|
|
54
54
|
hideIgnoredFiles: true
|
|
@@ -128,9 +128,10 @@ let QuickFileSelectService = class QuickFileSelectService {
|
|
|
128
128
|
if (!str) {
|
|
129
129
|
return 0;
|
|
130
130
|
}
|
|
131
|
+
const lowerStr = str.toLowerCase();
|
|
131
132
|
let exactMatch = true;
|
|
132
133
|
const partialMatches = querySplit.reduce((matched, part) => {
|
|
133
|
-
const partMatches =
|
|
134
|
+
const partMatches = lowerStr.includes(part);
|
|
134
135
|
exactMatch = exactMatch && partMatches;
|
|
135
136
|
return partMatches ? matched + QuickFileSelectService_1.Scores.partial : matched;
|
|
136
137
|
}, 0);
|
|
@@ -146,10 +147,10 @@ let QuickFileSelectService = class QuickFileSelectService {
|
|
|
146
147
|
const querySplit = query.split(file_search_service_1.WHITESPACE_QUERY_SEPARATOR);
|
|
147
148
|
const queryJoin = querySplit.join('');
|
|
148
149
|
const compareByLabelScore = (l, r) => score(r.label) - score(l.label);
|
|
149
|
-
const compareByLabelIndex = (l, r) => r.label.indexOf(query) - l.label.indexOf(query);
|
|
150
|
+
const compareByLabelIndex = (l, r) => r.label.toLowerCase().indexOf(query) - l.label.toLowerCase().indexOf(query);
|
|
150
151
|
const compareByLabel = (l, r) => l.label.localeCompare(r.label);
|
|
151
152
|
const compareByPathScore = (l, r) => score(r.uri.path.toString()) - score(l.uri.path.toString());
|
|
152
|
-
const compareByPathIndex = (l, r) => r.uri.path.toString().indexOf(query) - l.uri.path.toString().indexOf(query);
|
|
153
|
+
const compareByPathIndex = (l, r) => r.uri.path.toString().toLowerCase().indexOf(query) - l.uri.path.toString().toLowerCase().indexOf(query);
|
|
153
154
|
const compareByPathLabel = (l, r) => l.uri.path.toString().localeCompare(r.uri.path.toString());
|
|
154
155
|
return compareWithDiscriminators(left, right, compareByLabelScore, compareByLabelIndex, compareByLabel, compareByPathScore, compareByPathIndex, compareByPathLabel);
|
|
155
156
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"quick-file-select-service.js","sourceRoot":"","sources":["../../src/browser/quick-file-select-service.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,gFAAgF;AAChF,gFAAgF;;;;;AAEhF,qDAAiG;AACjG,2EAAuE;AACvE,iGAAoI;AACpI,mDAAuG;AACvG,4EAAwE;AACxE,oDAA6C;AAC7C,kDAAkD;AAClD,4DAA4E;AAC5E,uDAA4D;AAC5D,kHAA6G;AAC7G,sFAAkF;AAClF,0DAA4E;AAC5E,uEAA8F;AAc9F,sDAAsD;AACtD,MAAM,kBAAkB,GAAG,gDAAgD,CAAC;AAG5E,IAAiB,iBAAiB,CAIjC;AAJD,WAAiB,iBAAiB;IAC9B,SAAgB,EAAE,CAAC,GAAuC;QACtD,OAAO,GAAG,IAAI,KAAK,IAAI,GAAG,CAAC;IAC/B,CAAC;IAFe,oBAAE,KAEjB,CAAA;AACL,CAAC,EAJgB,iBAAiB,iCAAjB,iBAAiB,QAIjC;AAGM,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;;IAyB/B;;OAEG;aACqB,WAAM,GAAG;QAC7B,GAAG,EAAE,IAAI,EAAG,+DAA+D;QAC3E,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"quick-file-select-service.js","sourceRoot":"","sources":["../../src/browser/quick-file-select-service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/file-search",
|
|
3
|
-
"version": "1.70.0-next.
|
|
3
|
+
"version": "1.70.0-next.61+d13baea89",
|
|
4
4
|
"description": "Theia - File Search Extension",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.70.0-next.
|
|
7
|
-
"@theia/editor": "1.70.0-next.
|
|
8
|
-
"@theia/filesystem": "1.70.0-next.
|
|
9
|
-
"@theia/process": "1.70.0-next.
|
|
10
|
-
"@theia/workspace": "1.70.0-next.
|
|
6
|
+
"@theia/core": "1.70.0-next.61+d13baea89",
|
|
7
|
+
"@theia/editor": "1.70.0-next.61+d13baea89",
|
|
8
|
+
"@theia/filesystem": "1.70.0-next.61+d13baea89",
|
|
9
|
+
"@theia/process": "1.70.0-next.61+d13baea89",
|
|
10
|
+
"@theia/workspace": "1.70.0-next.61+d13baea89",
|
|
11
11
|
"@vscode/ripgrep": "^1.14.2",
|
|
12
12
|
"tslib": "^2.6.2"
|
|
13
13
|
},
|
|
@@ -51,5 +51,5 @@
|
|
|
51
51
|
"nyc": {
|
|
52
52
|
"extends": "../../configs/nyc.json"
|
|
53
53
|
},
|
|
54
|
-
"gitHead": "
|
|
54
|
+
"gitHead": "d13baea893dbdfe4c1df677a9b00b11289e71fa7"
|
|
55
55
|
}
|
|
@@ -81,8 +81,8 @@ export class QuickFileSelectService {
|
|
|
81
81
|
*/
|
|
82
82
|
private static readonly Scores = {
|
|
83
83
|
max: 1000, // represents the maximum score from fuzzy matching (Infinity).
|
|
84
|
-
exact:
|
|
85
|
-
partial:
|
|
84
|
+
exact: 5000, // represents the score assigned to exact matching.
|
|
85
|
+
partial: 2000 // represents the score assigned to partial matching.
|
|
86
86
|
};
|
|
87
87
|
|
|
88
88
|
async getPicks(
|
|
@@ -184,9 +184,10 @@ export class QuickFileSelectService {
|
|
|
184
184
|
return 0;
|
|
185
185
|
}
|
|
186
186
|
|
|
187
|
+
const lowerStr = str.toLowerCase();
|
|
187
188
|
let exactMatch = true;
|
|
188
189
|
const partialMatches = querySplit.reduce((matched, part) => {
|
|
189
|
-
const partMatches =
|
|
190
|
+
const partMatches = lowerStr.includes(part);
|
|
190
191
|
exactMatch = exactMatch && partMatches;
|
|
191
192
|
return partMatches ? matched + QuickFileSelectService.Scores.partial : matched;
|
|
192
193
|
}, 0);
|
|
@@ -206,11 +207,13 @@ export class QuickFileSelectService {
|
|
|
206
207
|
const queryJoin = querySplit.join('');
|
|
207
208
|
|
|
208
209
|
const compareByLabelScore = (l: FileQuickPickItem, r: FileQuickPickItem) => score(r.label) - score(l.label);
|
|
209
|
-
const compareByLabelIndex = (l: FileQuickPickItem, r: FileQuickPickItem) =>
|
|
210
|
+
const compareByLabelIndex = (l: FileQuickPickItem, r: FileQuickPickItem) =>
|
|
211
|
+
r.label.toLowerCase().indexOf(query) - l.label.toLowerCase().indexOf(query);
|
|
210
212
|
const compareByLabel = (l: FileQuickPickItem, r: FileQuickPickItem) => l.label.localeCompare(r.label);
|
|
211
213
|
|
|
212
214
|
const compareByPathScore = (l: FileQuickPickItem, r: FileQuickPickItem) => score(r.uri.path.toString()) - score(l.uri.path.toString());
|
|
213
|
-
const compareByPathIndex = (l: FileQuickPickItem, r: FileQuickPickItem) =>
|
|
215
|
+
const compareByPathIndex = (l: FileQuickPickItem, r: FileQuickPickItem) =>
|
|
216
|
+
r.uri.path.toString().toLowerCase().indexOf(query) - l.uri.path.toString().toLowerCase().indexOf(query);
|
|
214
217
|
const compareByPathLabel = (l: FileQuickPickItem, r: FileQuickPickItem) => l.uri.path.toString().localeCompare(r.uri.path.toString());
|
|
215
218
|
|
|
216
219
|
return compareWithDiscriminators(left, right, compareByLabelScore, compareByLabelIndex, compareByLabel, compareByPathScore, compareByPathIndex, compareByPathLabel);
|