@opensumi/ide-file-search 3.8.3-next-1741917543.0 → 3.8.3-next-1741920696.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.
- package/lib/common/file-search.d.ts +1 -0
- package/lib/common/file-search.d.ts.map +1 -1
- package/lib/node/file-search.service.d.ts.map +1 -1
- package/lib/node/file-search.service.js +22 -1
- package/lib/node/file-search.service.js.map +1 -1
- package/package.json +7 -7
- package/src/common/file-search.ts +1 -0
- package/src/node/file-search.service.ts +27 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-search.d.ts","sourceRoot":"","sources":["../../src/common/file-search.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAE9D,eAAO,MAAM,qBAAqB,0BAA0B,CAAC;AAE7D;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC;;;OAGG;IACH,IAAI,CACF,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,kBAAkB,CAAC,OAAO,EACnC,iBAAiB,CAAC,EAAE,iBAAiB,GACpC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;CACtB;AAED,eAAO,MAAM,kBAAkB,eAA8B,CAAC;AAE9D,yBAAiB,kBAAkB,CAAC;IAClC,UAAiB,WAAW;QAC1B,YAAY,CAAC,EAAE,OAAO,CAAC;QACvB,cAAc,CAAC,EAAE,OAAO,CAAC;QACzB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;QAC3B,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"file-search.d.ts","sourceRoot":"","sources":["../../src/common/file-search.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAE9D,eAAO,MAAM,qBAAqB,0BAA0B,CAAC;AAE7D;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC;;;OAGG;IACH,IAAI,CACF,aAAa,EAAE,MAAM,EACrB,OAAO,EAAE,kBAAkB,CAAC,OAAO,EACnC,iBAAiB,CAAC,EAAE,iBAAiB,GACpC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;CACtB;AAED,eAAO,MAAM,kBAAkB,eAA8B,CAAC;AAE9D,yBAAiB,kBAAkB,CAAC;IAClC,UAAiB,WAAW;QAC1B,YAAY,CAAC,EAAE,OAAO,CAAC;QACvB,cAAc,CAAC,EAAE,OAAO,CAAC;QACzB,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;QAC3B,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;QAC3B,WAAW,CAAC,EAAE,OAAO,CAAC;KACvB;IACD,UAAiB,WAAW;QAC1B,CAAC,OAAO,EAAE,MAAM,GAAG,WAAW,CAAC;KAChC;IACD,UAAiB,OAAQ,SAAQ,WAAW;QAC1C,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;QACpB,WAAW,CAAC,EAAE,WAAW,CAAC;QAC1B,UAAU,CAAC,EAAE,OAAO,CAAC;QACrB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf;;;;WAIG;QACH,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;KAClC;CACF"}
|
|
@@ -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;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;
|
|
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;IAkHpB,OAAO,CAAC,MAAM;IAoCd,OAAO,CAAC,aAAa;CA8BtB"}
|
|
@@ -26,6 +26,7 @@ let FileSearchService = class FileSearchService {
|
|
|
26
26
|
fuzzyMatch: true,
|
|
27
27
|
limit: Number.MAX_SAFE_INTEGER,
|
|
28
28
|
useGitIgnore: true,
|
|
29
|
+
onlyFolders: false,
|
|
29
30
|
...options,
|
|
30
31
|
};
|
|
31
32
|
const roots = options.rootOptions || {};
|
|
@@ -68,6 +69,18 @@ let FileSearchService = class FileSearchService {
|
|
|
68
69
|
const rootOptions = roots[cwd];
|
|
69
70
|
await this.doFind(cwd, rootOptions, (candidate) => {
|
|
70
71
|
const fileUri = ide_core_common_1.path.join(cwd, candidate);
|
|
72
|
+
if (opts.onlyFolders) {
|
|
73
|
+
try {
|
|
74
|
+
const fs = require('fs');
|
|
75
|
+
const stat = fs.statSync(fileUri);
|
|
76
|
+
if (!stat.isDirectory()) {
|
|
77
|
+
return;
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
catch (e) {
|
|
81
|
+
return;
|
|
82
|
+
}
|
|
83
|
+
}
|
|
71
84
|
if (exactMatches.has(fileUri) || fuzzyMatches.has(fileUri)) {
|
|
72
85
|
return;
|
|
73
86
|
}
|
|
@@ -90,7 +103,7 @@ let FileSearchService = class FileSearchService {
|
|
|
90
103
|
}));
|
|
91
104
|
const sortedExactMatches = Array.from(exactMatches).sort((a, b) => {
|
|
92
105
|
const depthA = Path.pathDepth(a);
|
|
93
|
-
const depthB = Path.pathDepth(
|
|
106
|
+
const depthB = Path.pathDepth(b);
|
|
94
107
|
if (depthA === depthB) {
|
|
95
108
|
const dirA = dirname(a);
|
|
96
109
|
const dirB = dirname(b);
|
|
@@ -106,6 +119,10 @@ let FileSearchService = class FileSearchService {
|
|
|
106
119
|
return new Promise((resolve, reject) => {
|
|
107
120
|
try {
|
|
108
121
|
const args = this.getSearchArgs(options);
|
|
122
|
+
if (options.onlyFolders) {
|
|
123
|
+
args.push('--type-list', 'd:dir');
|
|
124
|
+
args.push('--type', 'd');
|
|
125
|
+
}
|
|
109
126
|
const process = this.processFactory.create({ command: replaceAsarInPath(vscode_ripgrep_1.rgPath), args, options: { cwd } });
|
|
110
127
|
process.onError(reject);
|
|
111
128
|
process.outputStream.on('close', resolve);
|
|
@@ -129,6 +146,10 @@ let FileSearchService = class FileSearchService {
|
|
|
129
146
|
}
|
|
130
147
|
getSearchArgs(options) {
|
|
131
148
|
const args = ['--files', '--hidden', '--case-sensitive', '--no-require-git'];
|
|
149
|
+
if (options.onlyFolders) {
|
|
150
|
+
args.push('--type-list', 'd:dir');
|
|
151
|
+
args.push('--type', 'd');
|
|
152
|
+
}
|
|
132
153
|
if (options.includePatterns) {
|
|
133
154
|
for (const includePattern of options.includePatterns) {
|
|
134
155
|
if (includePattern) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-search.service.js","sourceRoot":"","sources":["../../src/node/file-search.service.ts"],"names":[],"mappings":"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
|
|
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.8.3-next-
|
|
3
|
+
"version": "3.8.3-next-1741920696.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.8.3-next-
|
|
21
|
-
"@opensumi/ide-core-node": "3.8.3-next-
|
|
22
|
-
"@opensumi/ide-process": "3.8.3-next-
|
|
20
|
+
"@opensumi/ide-core-common": "3.8.3-next-1741920696.0",
|
|
21
|
+
"@opensumi/ide-core-node": "3.8.3-next-1741920696.0",
|
|
22
|
+
"@opensumi/ide-process": "3.8.3-next-1741920696.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.8.3-next-
|
|
28
|
-
"@opensumi/ide-dev-tool": "3.8.3-next-
|
|
27
|
+
"@opensumi/ide-core-browser": "3.8.3-next-1741920696.0",
|
|
28
|
+
"@opensumi/ide-dev-tool": "3.8.3-next-1741920696.0"
|
|
29
29
|
},
|
|
30
|
-
"gitHead": "
|
|
30
|
+
"gitHead": "82ddf9af7acbcc85ea154022753c8c060b6f84ce"
|
|
31
31
|
}
|
|
@@ -40,6 +40,7 @@ export class FileSearchService implements IFileSearchService {
|
|
|
40
40
|
fuzzyMatch: true,
|
|
41
41
|
limit: Number.MAX_SAFE_INTEGER,
|
|
42
42
|
useGitIgnore: true,
|
|
43
|
+
onlyFolders: false,
|
|
43
44
|
...options,
|
|
44
45
|
};
|
|
45
46
|
|
|
@@ -92,6 +93,19 @@ export class FileSearchService implements IFileSearchService {
|
|
|
92
93
|
rootOptions,
|
|
93
94
|
(candidate) => {
|
|
94
95
|
const fileUri = path.join(cwd, candidate);
|
|
96
|
+
|
|
97
|
+
if (opts.onlyFolders) {
|
|
98
|
+
try {
|
|
99
|
+
const fs = require('fs');
|
|
100
|
+
const stat = fs.statSync(fileUri);
|
|
101
|
+
if (!stat.isDirectory()) {
|
|
102
|
+
return;
|
|
103
|
+
}
|
|
104
|
+
} catch (e) {
|
|
105
|
+
return;
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
|
|
95
109
|
if (exactMatches.has(fileUri) || fuzzyMatches.has(fileUri)) {
|
|
96
110
|
return;
|
|
97
111
|
}
|
|
@@ -117,7 +131,7 @@ export class FileSearchService implements IFileSearchService {
|
|
|
117
131
|
);
|
|
118
132
|
const sortedExactMatches = Array.from(exactMatches).sort((a, b) => {
|
|
119
133
|
const depthA = Path.pathDepth(a);
|
|
120
|
-
const depthB = Path.pathDepth(
|
|
134
|
+
const depthB = Path.pathDepth(b);
|
|
121
135
|
if (depthA === depthB) {
|
|
122
136
|
const dirA = dirname(a);
|
|
123
137
|
const dirB = dirname(b);
|
|
@@ -139,6 +153,12 @@ export class FileSearchService implements IFileSearchService {
|
|
|
139
153
|
return new Promise((resolve, reject) => {
|
|
140
154
|
try {
|
|
141
155
|
const args = this.getSearchArgs(options);
|
|
156
|
+
|
|
157
|
+
if (options.onlyFolders) {
|
|
158
|
+
args.push('--type-list', 'd:dir');
|
|
159
|
+
args.push('--type', 'd');
|
|
160
|
+
}
|
|
161
|
+
|
|
142
162
|
const process = this.processFactory.create({ command: replaceAsarInPath(rgPath), args, options: { cwd } });
|
|
143
163
|
process.onError(reject);
|
|
144
164
|
process.outputStream.on('close', resolve);
|
|
@@ -162,6 +182,12 @@ export class FileSearchService implements IFileSearchService {
|
|
|
162
182
|
|
|
163
183
|
private getSearchArgs(options: IFileSearchService.BaseOptions): string[] {
|
|
164
184
|
const args = ['--files', '--hidden', '--case-sensitive', '--no-require-git'];
|
|
185
|
+
|
|
186
|
+
if (options.onlyFolders) {
|
|
187
|
+
args.push('--type-list', 'd:dir');
|
|
188
|
+
args.push('--type', 'd');
|
|
189
|
+
}
|
|
190
|
+
|
|
165
191
|
if (options.includePatterns) {
|
|
166
192
|
for (const includePattern of options.includePatterns) {
|
|
167
193
|
if (includePattern) {
|