maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Only getPackageManager once per folder

Browse source 
Part of #115384
This commit is contained in:
Alex Ross 2021-02-04 16:43:38 +01:00
parent 900f1a1c5f
commit 3973012a9c
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extensions/npm/src/npmView.ts
View file

@ -194,7 +194,7 @@ export class NpmScriptsTreeDataProvider implements TreeDataProvider<TreeItem> {
if (!uri) { if (!uri) {
return; return;
} }
let task = await createTask(this.extensionContext, 'install', ['install'], selection.folder.workspaceFolder, uri, true, undefined, []); let task = await createTask(await getPackageManager(this.context, selection.folder.workspaceFolder.uri, true), 'install', ['install'], selection.folder.workspaceFolder, uri, undefined, []);
tasks.executeTask(task); tasks.executeTask(task);
} }

4
extensions/npm/src/scriptHover.ts
View file

@ -8,7 +8,7 @@ import {
workspace, tasks, Range, HoverProvider, Hover, Position, MarkdownString, Uri workspace, tasks, Range, HoverProvider, Hover, Position, MarkdownString, Uri
} from 'vscode'; } from 'vscode';
import { import {
createTask, startDebugging, findAllScriptRanges createTask, startDebugging, findAllScriptRanges, getPackageManager
} from './tasks'; } from './tasks';
import * as nls from 'vscode-nls'; import * as nls from 'vscode-nls';
import { dirname } from 'path'; import { dirname } from 'path';
@ -103,7 +103,7 @@ export class NpmScriptHoverProvider implements HoverProvider {
let documentUri = args.documentUri; let documentUri = args.documentUri;
let folder = workspace.getWorkspaceFolder(documentUri); let folder = workspace.getWorkspaceFolder(documentUri);
if (folder) { if (folder) {
let task = await createTask(this.context, script, ['run', script], folder, documentUri); let task = await createTask(await getPackageManager(this.context, folder.uri), script, ['run', script], folder, documentUri);
await tasks.executeTask(task); await tasks.executeTask(task);
} }
} }

14
extensions/npm/src/tasks.ts
View file

@ -57,7 +57,7 @@ export class NpmTaskProvider implements TaskProvider {
return tasks.map(task => task.task); return tasks.map(task => task.task);
} }
public resolveTask(_task: Task): Promise<Task> | undefined { public async resolveTask(_task: Task): Promise<Task | undefined> {
const npmTask = (<any>_task.definition).script; const npmTask = (<any>_task.definition).script;
if (npmTask) { if (npmTask) {
const kind: NpmTaskDefinition = (<any>_task.definition); const kind: NpmTaskDefinition = (<any>_task.definition);
@ -75,7 +75,7 @@ export class NpmTaskProvider implements TaskProvider {
if (kind.script !== INSTALL_SCRIPT) { if (kind.script !== INSTALL_SCRIPT) {
cmd.unshift('run'); cmd.unshift('run');
} }
return createTask(this.context, kind, cmd, _task.scope, packageJsonUri); return createTask(await getPackageManager(this.context, _task.scope.uri), kind, cmd, _task.scope, packageJsonUri);
} }
return undefined; return undefined;
} }
@ -278,10 +278,11 @@ async function provideNpmScriptsForFolder(context: ExtensionContext, packageJson
const result: TaskWithLocation[] = []; const result: TaskWithLocation[] = [];
const prePostScripts = getPrePostScripts(scripts); const prePostScripts = getPrePostScripts(scripts);
const packageManager = await getPackageManager(context, folder.uri, showWarning);
for (const each of scripts.keys()) { for (const each of scripts.keys()) {
const scriptValue = scripts.get(each)!; const scriptValue = scripts.get(each)!;
const task = await createTask(context, each, ['run', each], folder!, packageJsonUri, showWarning, scriptValue.script); const task = await createTask(packageManager, each, ['run', each], folder!, packageJsonUri, scriptValue.script);
const lowerCaseTaskName = each.toLowerCase(); const lowerCaseTaskName = each.toLowerCase();
if (isBuildTask(lowerCaseTaskName)) { if (isBuildTask(lowerCaseTaskName)) {
task.group = TaskGroup.Build; task.group = TaskGroup.Build;
@ -300,7 +301,7 @@ async function provideNpmScriptsForFolder(context: ExtensionContext, packageJson
} }
// always add npm install (without a problem matcher) // always add npm install (without a problem matcher)
result.push({ task: await createTask(context, INSTALL_SCRIPT, [INSTALL_SCRIPT], folder, packageJsonUri, showWarning, 'install dependencies from package', []) }); result.push({ task: await createTask(packageManager, INSTALL_SCRIPT, [INSTALL_SCRIPT], folder, packageJsonUri, 'install dependencies from package', []) });
return result; return result;
} }
@ -311,7 +312,7 @@ export function getTaskName(script: string, relativePath: string | undefined) {
return script; return script;
} }
export async function createTask(context: ExtensionContext, script: NpmTaskDefinition | string, cmd: string[], folder: WorkspaceFolder, packageJsonUri: Uri, showWarning: boolean = true, detail?: string, matcher?: any): Promise<Task> { export async function createTask(packageManager: string, script: NpmTaskDefinition | string, cmd: string[], folder: WorkspaceFolder, packageJsonUri: Uri, detail?: string, matcher?: any): Promise<Task> {
let kind: NpmTaskDefinition; let kind: NpmTaskDefinition;
if (typeof script === 'string') { if (typeof script === 'string') {
kind = { type: 'npm', script: script }; kind = { type: 'npm', script: script };
@ -319,7 +320,6 @@ export async function createTask(context: ExtensionContext, script: NpmTaskDefin
kind = script; kind = script;
} }
const packageManager = await getPackageManager(context, folder.uri, showWarning);
function getCommandLine(cmd: string[]): (string | ShellQuotedString)[] { function getCommandLine(cmd: string[]): (string | ShellQuotedString)[] {
const result: (string | ShellQuotedString)[] = new Array(cmd.length); const result: (string | ShellQuotedString)[] = new Array(cmd.length);
for (let i = 0; i < cmd.length; i++) { for (let i = 0; i < cmd.length; i++) {
@ -392,7 +392,7 @@ export async function runScript(context: ExtensionContext, script: string, docum
let uri = document.uri; let uri = document.uri;
let folder = workspace.getWorkspaceFolder(uri); let folder = workspace.getWorkspaceFolder(uri);
if (folder) { if (folder) {
let task = await createTask(context, script, ['run', script], folder, uri); const task = await createTask(await getPackageManager(context, folder.uri), script, ['run', script], folder, uri);
tasks.executeTask(task); tasks.executeTask(task);
} }
} }