development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-07-17 02:57:19 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

fix: debug buttons in a nested package.json

Browse source 
Fixes #108000
This commit is contained in:
Connor Peet 2020-10-02 14:16:53 -07:00
parent 7701642b26
commit 916de64d89
No known key found for this signature in database
GPG key ID: CF8FD2EA0DBC61BD
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -137,7 +137,7 @@ export class NpmScriptsTreeDataProvider implements TreeDataProvider<TreeItem> {
}
private async debugScript(script: NpmScript) {
startDebugging(script.task.name, script.getFolder());
startDebugging(script.task.definition.script, path.dirname(script.package.resourceUri!.fsPath), script.getFolder());
}
private findScript(document: TextDocument, script?: NpmScript): number {

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

@ -11,6 +11,7 @@ import {
createTask, startDebugging, findAllScriptRanges
} from './tasks';
import * as nls from 'vscode-nls';
import { dirname } from 'path';
const localize = nls.loadMessageBundle();
@ -107,12 +108,12 @@ export class NpmScriptHoverProvider implements HoverProvider {
}
}
public debugScriptFromHover(args: any) {
public debugScriptFromHover(args: { script: string; documentUri: Uri }) {
let script = args.script;
let documentUri = args.documentUri;
let folder = workspace.getWorkspaceFolder(documentUri);
if (folder) {
startDebugging(script, folder);
startDebugging(script, dirname(documentUri.fsPath), folder);
}
}
}

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

@ -357,11 +357,12 @@ export function runScript(script: string, document: TextDocument) {
}
}
export function startDebugging(scriptName: string, folder: WorkspaceFolder) {
export function startDebugging(scriptName: string, cwd: string, folder: WorkspaceFolder) {
const config: DebugConfiguration = {
type: 'pwa-node',
request: 'launch',
name: `Debug ${scriptName}`,
cwd,
runtimeExecutable: getPackageManager(folder),
runtimeArgs: [
'run',