development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-28 05:19:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #45816 only search for package.json files when auto detection is enabled

Browse source
This commit is contained in:
Erich Gamma 2018-03-25 18:34:27 +02:00
parent 9f59119581
commit ba9da35ec8
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
extensions/npm/src/main.ts
View file

@ -100,17 +100,22 @@ async function provideNpmScripts(): Promise<vscode.Task[]> {
let emptyTasks: vscode.Task[] = [];
let allTasks: vscode.Task[] = [];
let paths = await vscode.workspace.findFiles('**/package.json', '**/node_modules/**');
if (paths.length === 0) {
let folders = vscode.workspace.workspaceFolders;
if (!folders) {
return emptyTasks;
}
try {
for (let i = 0; i < paths.length; i++) {
let folder = vscode.workspace.getWorkspaceFolder(paths[i]);
if (folder && isEnabled(folder) && !isExcluded(folder, paths[i])) {
let tasks = await provideNpmScriptsForFolder(paths[i]);
allTasks.push(...tasks);
for (let i = 0; i < folders.length; i++) {
let folder = folders[i];
if (isEnabled(folder)) {
let relativePattern = new vscode.RelativePattern(folder, '**/package.json');
let paths = await vscode.workspace.findFiles(relativePattern, '**/node_modules/**');
for (let j = 0; j < paths.length; j++) {
if (!isExcluded(folder, paths[j])) {
let tasks = await provideNpmScriptsForFolder(paths[j]);
allTasks.push(...tasks);
}
}
}
}
return allTasks;