@opensumi/ide-file-search 3.7.1-next-1739439717.0 → 3.7.1-next-1739448958.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,6 +5,7 @@ import { IFileSearchService } from '../common';
|
|
|
5
5
|
export declare class FileSearchService implements IFileSearchService {
|
|
6
6
|
processFactory: IProcessFactory;
|
|
7
7
|
logger: INodeLogger;
|
|
8
|
+
private isAbsolutePathPattern;
|
|
8
9
|
find(searchPattern: string, options: IFileSearchService.Options, clientToken?: CancellationToken): Promise<string[]>;
|
|
9
10
|
private doFind;
|
|
10
11
|
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;IAEpB,OAAO,CAAC,qBAAqB;IAMvB,IAAI,CACR,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,kBAAkB,CAAC,OAAO,EACnC,WAAW,CAAC,EAAE,iBAAiB,GAC9B,OAAO,CAAC,MAAM,EAAE,CAAC;IAoGpB,OAAO,CAAC,MAAM;IA8Bd,OAAO,CAAC,aAAa;CAwBtB"}
|
|
@@ -11,6 +11,9 @@ 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
|
+
}
|
|
14
17
|
// 这里应该返回文件的 `fsPath` 而非 `file://` 协议文件路径
|
|
15
18
|
// 否则在 Windows 下，盘符路径会被隐藏
|
|
16
19
|
async find(searchPattern, options, clientToken) {
|
|
@@ -26,6 +29,13 @@ let FileSearchService = class FileSearchService {
|
|
|
26
29
|
...options,
|
|
27
30
|
};
|
|
28
31
|
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
|
+
}
|
|
29
39
|
if (options.rootUris) {
|
|
30
40
|
for (const rootUri of options.rootUris) {
|
|
31
41
|
if (!roots[rootUri]) {
|
|
@@ -53,7 +63,6 @@ let FileSearchService = class FileSearchService {
|
|
|
53
63
|
}
|
|
54
64
|
const exactMatches = new Set();
|
|
55
65
|
const fuzzyMatches = new Set();
|
|
56
|
-
const stringPattern = searchPattern.toLocaleLowerCase();
|
|
57
66
|
await Promise.all(Object.keys(roots).map(async (cwd) => {
|
|
58
67
|
try {
|
|
59
68
|
const rootOptions = roots[cwd];
|
|
@@ -119,7 +128,7 @@ let FileSearchService = class FileSearchService {
|
|
|
119
128
|
});
|
|
120
129
|
}
|
|
121
130
|
getSearchArgs(options) {
|
|
122
|
-
const args = ['--files', '--hidden', '--case-sensitive'];
|
|
131
|
+
const args = ['--files', '--hidden', '--case-sensitive', '--no-require-git'];
|
|
123
132
|
if (options.includePatterns) {
|
|
124
133
|
for (const includePattern of options.includePatterns) {
|
|
125
134
|
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-1739448958.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-1739448958.0",
|
|
21
|
+
"@opensumi/ide-core-node": "3.7.1-next-1739448958.0",
|
|
22
|
+
"@opensumi/ide-process": "3.7.1-next-1739448958.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-1739448958.0",
|
|
28
|
+
"@opensumi/ide-dev-tool": "3.7.1-next-1739448958.0"
|
|
29
29
|
},
|
|
30
|
-
"gitHead": "
|
|
30
|
+
"gitHead": "e8a6a7e571c8613a4e48f206433a0513225948f2"
|
|
31
31
|
}
|
|
@@ -20,6 +20,10 @@ 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
|
+
|
|
23
27
|
// 这里应该返回文件的 `fsPath` 而非 `file://` 协议文件路径
|
|
24
28
|
// 否则在 Windows 下，盘符路径会被隐藏
|
|
25
29
|
async find(
|
|
@@ -40,6 +44,15 @@ export class FileSearchService implements IFileSearchService {
|
|
|
40
44
|
};
|
|
41
45
|
|
|
42
46
|
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
|
+
|
|
43
56
|
if (options.rootUris) {
|
|
44
57
|
for (const rootUri of options.rootUris) {
|
|
45
58
|
if (!roots[rootUri]) {
|
|
@@ -47,6 +60,7 @@ export class FileSearchService implements IFileSearchService {
|
|
|
47
60
|
}
|
|
48
61
|
}
|
|
49
62
|
}
|
|
63
|
+
|
|
50
64
|
// eslint-disable-next-line guard-for-in
|
|
51
65
|
for (const rootUri in roots) {
|
|
52
66
|
const rootOptions = roots[rootUri];
|
|
@@ -68,7 +82,7 @@ export class FileSearchService implements IFileSearchService {
|
|
|
68
82
|
|
|
69
83
|
const exactMatches = new Set<string>();
|
|
70
84
|
const fuzzyMatches = new Set<string>();
|
|
71
|
-
|
|
85
|
+
|
|
72
86
|
await Promise.all(
|
|
73
87
|
Object.keys(roots).map(async (cwd) => {
|
|
74
88
|
try {
|
|
@@ -147,7 +161,7 @@ export class FileSearchService implements IFileSearchService {
|
|
|
147
161
|
}
|
|
148
162
|
|
|
149
163
|
private getSearchArgs(options: IFileSearchService.BaseOptions): string[] {
|
|
150
|
-
const args = ['--files', '--hidden', '--case-sensitive'];
|
|
164
|
+
const args = ['--files', '--hidden', '--case-sensitive', '--no-require-git'];
|
|
151
165
|
if (options.includePatterns) {
|
|
152
166
|
for (const includePattern of options.includePatterns) {
|
|
153
167
|
if (includePattern) {
|