@opensumi/ide-file-search 3.7.1-next-1739430207.0 → 3.7.1-next-1739439717.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.
|
@@ -5,7 +5,6 @@ import { IFileSearchService } from '../common';
|
|
|
5
5
|
export declare class FileSearchService implements IFileSearchService {
|
|
6
6
|
processFactory: IProcessFactory;
|
|
7
7
|
logger: INodeLogger;
|
|
8
|
-
private isAbsolutePathPattern;
|
|
9
8
|
find(searchPattern: string, options: IFileSearchService.Options, clientToken?: CancellationToken): Promise<string[]>;
|
|
10
9
|
private doFind;
|
|
11
10
|
private getSearchArgs;
|
|
@@ -1 +1 @@
|
|
|
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,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,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;
|
|
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,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,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;IAId,IAAI,CACR,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,kBAAkB,CAAC,OAAO,EACnC,WAAW,CAAC,EAAE,iBAAiB,GAC9B,OAAO,CAAC,MAAM,EAAE,CAAC;IA0FpB,OAAO,CAAC,MAAM;IA8Bd,OAAO,CAAC,aAAa;CAwBtB"}
|
|
@@ -11,9 +11,6 @@ const ide_process_1 = require("@opensumi/ide-process");
|
|
|
11
11
|
const vscode_ripgrep_1 = require("@opensumi/vscode-ripgrep");
|
|
12
12
|
const { replaceAsarInPath, Path, dirname } = ide_core_common_1.path;
|
|
13
13
|
let FileSearchService = class FileSearchService {
|
|
14
|
-
isAbsolutePathPattern(pattern) {
|
|
15
|
-
return ide_core_common_1.path.isAbsolute(pattern) || pattern.startsWith('/') || pattern.startsWith('\\');
|
|
16
|
-
}
|
|
17
14
|
// 这里应该返回文件的 `fsPath` 而非 `file://` 协议文件路径
|
|
18
15
|
// 否则在 Windows 下，盘符路径会被隐藏
|
|
19
16
|
async find(searchPattern, options, clientToken) {
|
|
@@ -29,13 +26,6 @@ let FileSearchService = class FileSearchService {
|
|
|
29
26
|
...options,
|
|
30
27
|
};
|
|
31
28
|
const roots = options.rootOptions || {};
|
|
32
|
-
let stringPattern = searchPattern.toLocaleLowerCase();
|
|
33
|
-
// 如果传入绝对路径，则将父级目录作为根目录
|
|
34
|
-
if (this.isAbsolutePathPattern(searchPattern)) {
|
|
35
|
-
const parent = ide_core_common_1.path.dirname(searchPattern);
|
|
36
|
-
roots[parent] = {};
|
|
37
|
-
stringPattern = ide_core_common_1.path.basename(searchPattern).toLocaleLowerCase();
|
|
38
|
-
}
|
|
39
29
|
if (options.rootUris) {
|
|
40
30
|
for (const rootUri of options.rootUris) {
|
|
41
31
|
if (!roots[rootUri]) {
|
|
@@ -63,6 +53,7 @@ let FileSearchService = class FileSearchService {
|
|
|
63
53
|
}
|
|
64
54
|
const exactMatches = new Set();
|
|
65
55
|
const fuzzyMatches = new Set();
|
|
56
|
+
const stringPattern = searchPattern.toLocaleLowerCase();
|
|
66
57
|
await Promise.all(Object.keys(roots).map(async (cwd) => {
|
|
67
58
|
try {
|
|
68
59
|
const rootOptions = roots[cwd];
|
|
@@ -128,7 +119,7 @@ let FileSearchService = class FileSearchService {
|
|
|
128
119
|
});
|
|
129
120
|
}
|
|
130
121
|
getSearchArgs(options) {
|
|
131
|
-
const args = ['--files', '--hidden', '--case-sensitive'
|
|
122
|
+
const args = ['--files', '--hidden', '--case-sensitive'];
|
|
132
123
|
if (options.includePatterns) {
|
|
133
124
|
for (const includePattern of options.includePatterns) {
|
|
134
125
|
if (includePattern) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-search.service.js","sourceRoot":"","sources":["../../src/node/file-search.service.ts"],"names":[],"mappings":";;;;AAAA,gEAAgC;AAEhC,0DAA0B;AAE1B,qCAAqD;AACrD,+DAA6F;AAC7F,2DAAsD;AACtD,uDAAwD;AACxD,6DAAkD;AAIlD,MAAM,EAAE,iBAAiB,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,sBAAI,CAAC;AAG3C,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;
|
|
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": "3.7.1-next-
|
|
3
|
+
"version": "3.7.1-next-1739439717.0",
|
|
4
4
|
"files": [
|
|
5
5
|
"lib",
|
|
6
6
|
"src"
|
|
@@ -17,15 +17,15 @@
|
|
|
17
17
|
"url": "git@github.com:opensumi/core.git"
|
|
18
18
|
},
|
|
19
19
|
"dependencies": {
|
|
20
|
-
"@opensumi/ide-core-common": "3.7.1-next-
|
|
21
|
-
"@opensumi/ide-core-node": "3.7.1-next-
|
|
22
|
-
"@opensumi/ide-process": "3.7.1-next-
|
|
20
|
+
"@opensumi/ide-core-common": "3.7.1-next-1739439717.0",
|
|
21
|
+
"@opensumi/ide-core-node": "3.7.1-next-1739439717.0",
|
|
22
|
+
"@opensumi/ide-process": "3.7.1-next-1739439717.0",
|
|
23
23
|
"@opensumi/vscode-ripgrep": "^1.4.0",
|
|
24
24
|
"fuzzy": "^0.1.3"
|
|
25
25
|
},
|
|
26
26
|
"devDependencies": {
|
|
27
|
-
"@opensumi/ide-core-browser": "3.7.1-next-
|
|
28
|
-
"@opensumi/ide-dev-tool": "3.7.1-next-
|
|
27
|
+
"@opensumi/ide-core-browser": "3.7.1-next-1739439717.0",
|
|
28
|
+
"@opensumi/ide-dev-tool": "3.7.1-next-1739439717.0"
|
|
29
29
|
},
|
|
30
|
-
"gitHead": "
|
|
30
|
+
"gitHead": "d49745f5d5fb4faab59de4729c7bea9809217a63"
|
|
31
31
|
}
|
|
@@ -20,10 +20,6 @@ export class FileSearchService implements IFileSearchService {
|
|
|
20
20
|
@Autowired(INodeLogger)
|
|
21
21
|
logger: INodeLogger;
|
|
22
22
|
|
|
23
|
-
private isAbsolutePathPattern(pattern: string): boolean {
|
|
24
|
-
return path.isAbsolute(pattern) || pattern.startsWith('/') || pattern.startsWith('\\');
|
|
25
|
-
}
|
|
26
|
-
|
|
27
23
|
// 这里应该返回文件的 `fsPath` 而非 `file://` 协议文件路径
|
|
28
24
|
// 否则在 Windows 下，盘符路径会被隐藏
|
|
29
25
|
async find(
|
|
@@ -44,15 +40,6 @@ export class FileSearchService implements IFileSearchService {
|
|
|
44
40
|
};
|
|
45
41
|
|
|
46
42
|
const roots: IFileSearchService.RootOptions = options.rootOptions || {};
|
|
47
|
-
let stringPattern = searchPattern.toLocaleLowerCase();
|
|
48
|
-
|
|
49
|
-
// 如果传入绝对路径，则将父级目录作为根目录
|
|
50
|
-
if (this.isAbsolutePathPattern(searchPattern)) {
|
|
51
|
-
const parent = path.dirname(searchPattern);
|
|
52
|
-
roots[parent] = {};
|
|
53
|
-
stringPattern = path.basename(searchPattern).toLocaleLowerCase();
|
|
54
|
-
}
|
|
55
|
-
|
|
56
43
|
if (options.rootUris) {
|
|
57
44
|
for (const rootUri of options.rootUris) {
|
|
58
45
|
if (!roots[rootUri]) {
|
|
@@ -60,7 +47,6 @@ export class FileSearchService implements IFileSearchService {
|
|
|
60
47
|
}
|
|
61
48
|
}
|
|
62
49
|
}
|
|
63
|
-
|
|
64
50
|
// eslint-disable-next-line guard-for-in
|
|
65
51
|
for (const rootUri in roots) {
|
|
66
52
|
const rootOptions = roots[rootUri];
|
|
@@ -82,7 +68,7 @@ export class FileSearchService implements IFileSearchService {
|
|
|
82
68
|
|
|
83
69
|
const exactMatches = new Set<string>();
|
|
84
70
|
const fuzzyMatches = new Set<string>();
|
|
85
|
-
|
|
71
|
+
const stringPattern = searchPattern.toLocaleLowerCase();
|
|
86
72
|
await Promise.all(
|
|
87
73
|
Object.keys(roots).map(async (cwd) => {
|
|
88
74
|
try {
|
|
@@ -161,7 +147,7 @@ export class FileSearchService implements IFileSearchService {
|
|
|
161
147
|
}
|
|
162
148
|
|
|
163
149
|
private getSearchArgs(options: IFileSearchService.BaseOptions): string[] {
|
|
164
|
-
const args = ['--files', '--hidden', '--case-sensitive'
|
|
150
|
+
const args = ['--files', '--hidden', '--case-sensitive'];
|
|
165
151
|
if (options.includePatterns) {
|
|
166
152
|
for (const includePattern of options.includePatterns) {
|
|
167
153
|
if (includePattern) {
|