@opensumi/ide-file-search 2.17.9 → 2.18.1
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":"file-search.service.d.ts","sourceRoot":"","sources":["../../src/node/file-search.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"file-search.service.d.ts","sourceRoot":"","sources":["../../src/node/file-search.service.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,iBAAiB,EAAiC,MAAM,2BAA2B,CAAC;AAC7F,OAAO,EAAgB,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAGxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAI/C,qBACa,iBAAkB,YAAW,kBAAkB;IAE1D,cAAc,EAAE,eAAe,CAAC;IAGhC,MAAM,EAAE,WAAW,CAAC;IAEd,IAAI,CACR,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,kBAAkB,CAAC,OAAO,EACnC,WAAW,CAAC,EAAE,iBAAiB,GAC9B,OAAO,CAAC,MAAM,EAAE,CAAC;IAgFpB,OAAO,CAAC,MAAM;IA+Bd,OAAO,CAAC,aAAa;CAwBtB"}
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.FileSearchService = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const path_1 = tslib_1.__importDefault(require("path"));
|
|
6
5
|
const readline_1 = tslib_1.__importDefault(require("readline"));
|
|
7
6
|
const fuzzy_1 = tslib_1.__importDefault(require("fuzzy"));
|
|
8
7
|
const di_1 = require("@opensumi/di");
|
|
@@ -10,6 +9,7 @@ const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
|
10
9
|
const ide_core_node_1 = require("@opensumi/ide-core-node");
|
|
11
10
|
const ide_process_1 = require("@opensumi/ide-process");
|
|
12
11
|
const vscode_ripgrep_1 = require("@opensumi/vscode-ripgrep");
|
|
12
|
+
const { replaceAsarInPath } = ide_core_common_1.path;
|
|
13
13
|
let FileSearchService = class FileSearchService {
|
|
14
14
|
async find(searchPattern, options, clientToken) {
|
|
15
15
|
const cancellationSource = new ide_core_common_1.CancellationTokenSource();
|
|
@@ -52,7 +52,7 @@ let FileSearchService = class FileSearchService {
|
|
|
52
52
|
const rootUri = new ide_core_node_1.URI(root);
|
|
53
53
|
const rootOptions = roots[root];
|
|
54
54
|
await this.doFind(rootUri, rootOptions, (candidate) => {
|
|
55
|
-
const fileUri = ide_core_node_1.FileUri.create(
|
|
55
|
+
const fileUri = ide_core_node_1.FileUri.create(ide_core_common_1.path.join(rootUri.codeUri.fsPath, candidate)).toString();
|
|
56
56
|
if (exactMatches.has(fileUri) || fuzzyMatches.has(fileUri)) {
|
|
57
57
|
return;
|
|
58
58
|
}
|
|
@@ -81,7 +81,7 @@ let FileSearchService = class FileSearchService {
|
|
|
81
81
|
try {
|
|
82
82
|
const cwd = ide_core_node_1.FileUri.fsPath(rootUri);
|
|
83
83
|
const args = this.getSearchArgs(options);
|
|
84
|
-
const process = this.processFactory.create({ command:
|
|
84
|
+
const process = this.processFactory.create({ command: replaceAsarInPath(vscode_ripgrep_1.rgPath), args, options: { cwd } });
|
|
85
85
|
process.onError(reject);
|
|
86
86
|
process.outputStream.on('close', resolve);
|
|
87
87
|
const lineReader = readline_1.default.createInterface({
|
|
@@ -103,7 +103,7 @@ let FileSearchService = class FileSearchService {
|
|
|
103
103
|
});
|
|
104
104
|
}
|
|
105
105
|
getSearchArgs(options) {
|
|
106
|
-
const args = ['--files', '--case-sensitive'];
|
|
106
|
+
const args = ['--files', '--hidden', '--case-sensitive'];
|
|
107
107
|
if (options.includePatterns) {
|
|
108
108
|
for (const includePattern of options.includePatterns) {
|
|
109
109
|
if (includePattern) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-search.service.js","sourceRoot":"","sources":["../../src/node/file-search.service.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"file-search.service.js","sourceRoot":"","sources":["../../src/node/file-search.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opensumi/ide-file-search",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.18.1",
|
|
4
4
|
"files": [
|
|
5
5
|
"lib"
|
|
6
6
|
],
|
|
@@ -16,15 +16,15 @@
|
|
|
16
16
|
"url": "git@github.com:opensumi/core.git"
|
|
17
17
|
},
|
|
18
18
|
"dependencies": {
|
|
19
|
-
"@opensumi/ide-core-common": "2.
|
|
20
|
-
"@opensumi/ide-core-node": "2.
|
|
21
|
-
"@opensumi/ide-process": "2.
|
|
19
|
+
"@opensumi/ide-core-common": "2.18.1",
|
|
20
|
+
"@opensumi/ide-core-node": "2.18.1",
|
|
21
|
+
"@opensumi/ide-process": "2.18.1",
|
|
22
22
|
"@opensumi/vscode-ripgrep": "^1.4.0",
|
|
23
23
|
"fuzzy": "^0.1.3"
|
|
24
24
|
},
|
|
25
25
|
"devDependencies": {
|
|
26
|
-
"@opensumi/ide-core-browser": "2.
|
|
26
|
+
"@opensumi/ide-core-browser": "2.18.1",
|
|
27
27
|
"@opensumi/ide-dev-tool": "^1.3.1"
|
|
28
28
|
},
|
|
29
|
-
"gitHead": "
|
|
29
|
+
"gitHead": "30a9b3305261c41d9f1c674b9ff72384998a9c11"
|
|
30
30
|
}
|