Skip to content

Commit 1e3236f

Browse files
authored
Merge pull request #11 from dbalek/dbalek/debug-with-lanuch-json-present
Debug project when 'launch.json' is present in the project workspace
2 parents 078818e + 8a097d2 commit 1e3236f

1 file changed

Lines changed: 2 additions & 4 deletions

File tree

vscode/src/extension.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -943,6 +943,7 @@ export function activate(context: ExtensionContext): VSNetBeansAPI {
943943
} else {
944944
debugConfig['launchConfiguration'] = launchConfiguration;
945945
}
946+
debugConfig['noDebug'] = noDebug;
946947
debugConfig['testRun'] = testRun;
947948

948949
const workspaceFolder = vscode.workspace.getWorkspaceFolder(docUri);
@@ -953,17 +954,14 @@ export function activate(context: ExtensionContext): VSNetBeansAPI {
953954
debugConfig['mainClass'] = docUri.toString();
954955
}
955956

956-
const debugOptions : vscode.DebugSessionOptions = {
957-
noDebug: noDebug,
958-
}
959957
if (testInParallel) {
960958
debugConfig['testInParallel'] = testInParallel;
961959
}
962960
if (projects?.length) {
963961
debugConfig['projects'] = projects;
964962
}
965963

966-
const ret = await vscode.debug.startDebugging(workspaceFolder, debugConfig, debugOptions);
964+
const ret = await vscode.debug.startDebugging(workspaceFolder, debugConfig);
967965
return ret ? new Promise((resolve) => {
968966
const listener = vscode.debug.onDidTerminateDebugSession(() => {
969967
listener.dispose();

0 commit comments

Comments
 (0)