Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/ui/configuration/nodeDebugConfigurationProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
ResolvingTerminalConfiguration,
} from '../../configuration';
import { findScripts } from '../debugNpmScript';
import { getPackageManager } from '../getRunScriptCommand';
import { getScriptRunner } from '../getRunScriptCommand';
import { BaseConfigurationProvider } from './baseConfigurationProvider';
import { createLaunchConfigFromContext } from './nodeDebugConfigurationResolver';

Expand Down Expand Up @@ -98,7 +98,7 @@ export class NodeDynamicDebugConfigurationProvider extends BaseConfigurationProv
return [openTerminal];
}

const packageManager = await getPackageManager(folder);
const packageManager = await getScriptRunner(folder);
return scripts
.map<DynamicConfig>(script => ({
type: getPreferredOrDebugType(DebugType.Terminal),
Expand Down
16 changes: 11 additions & 5 deletions src/ui/getRunScriptCommand.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,22 @@ import { commands, WorkspaceFolder } from 'vscode';
/**
* Gets the package manager the user configured in the folder.
*/
export const getPackageManager = async (folder: WorkspaceFolder | undefined) => {
export const getScriptRunner = async (folder: WorkspaceFolder | undefined) => {
try {
return await commands.executeCommand('npm.packageManager', folder?.uri);
return await commands.executeCommand('npm.scriptRunner', folder?.uri);
} catch {
return 'npm';
try {
return await commands.executeCommand('npm.packageManager', folder?.uri);
} catch {
return 'npm';
}
}
};

/**
* Gets a command to run a script
*/
export const getRunScriptCommand = async (name: string, folder?: WorkspaceFolder) =>
`${await getPackageManager(folder)} run ${name}`;
export const getRunScriptCommand = async (name: string, folder?: WorkspaceFolder) => {
const scriptRunner = await getScriptRunner(folder);
return `${scriptRunner} ${scriptRunner === 'node' ? '--run' : 'run'} ${name}`;
};