Skip to content

Commit dd3851c

Browse files
Nikola HristovNikola Hristov
authored andcommitted
2 parents 784b2f7 + 5c35dde commit dd3851c

File tree

5 files changed

+11824
-573
lines changed

5 files changed

+11824
-573
lines changed

Source/extension/debugger/configuration/launch.json/launchJsonReader.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import * as fs from 'fs-extra';
66
import { parse } from 'jsonc-parser';
77
import { DebugConfiguration, Uri, WorkspaceFolder } from 'vscode';
88
import { getConfiguration, getWorkspaceFolder } from '../../../common/vscodeapi';
9-
import { traceLog } from '../../../common/log/logging';
9+
import { traceError, traceLog, traceWarn } from '../../../common/log/logging';
1010

1111
export async function getConfigurationsForWorkspace(workspace: WorkspaceFolder): Promise<DebugConfiguration[]> {
1212
traceLog('Getting configurations for workspace');
@@ -23,10 +23,11 @@ export async function getConfigurationsForWorkspace(workspace: WorkspaceFolder):
2323
}
2424
// configurations found in launch.json, verify them then return
2525
if (!Array.isArray(parsed.configurations) || parsed.configurations.length === 0) {
26+
traceError('Invalid configurations in launch.json');
2627
throw Error('Invalid configurations in launch.json');
2728
}
2829
if (!parsed.version) {
29-
throw Error('Missing field in launch.json: version');
30+
traceWarn('Missing field in launch.json: version');
3031
}
3132
traceLog('Using configuration in launch.json');
3233
return parsed.configurations;

Source/extension/debugger/configuration/resolvers/launch.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,11 @@ export class LaunchConfigurationResolver extends BaseConfigurationResolver<Launc
146146
}
147147
const isFastAPI = LaunchConfigurationResolver.isDebuggingFastAPI(debugConfiguration);
148148
const isFlask = LaunchConfigurationResolver.isDebuggingFlask(debugConfiguration);
149-
if (debugConfiguration.autoStartBrowser && (debugConfiguration.django || isFlask)) {
149+
if (
150+
debugConfiguration.autoStartBrowser &&
151+
(debugConfiguration.django || isFlask) &&
152+
!debugConfiguration.serverReadyAction
153+
) {
150154
debugConfiguration.serverReadyAction = {
151155
pattern: '.*(https?:\\/\\/\\S+:[0-9]+\\/?).*',
152156
uriFormat: '%s',

0 commit comments

Comments
 (0)