Author: Nikola Hristov

.github/actions/build-vsix/action.yml

@@ -1,70 +1,58 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-import * as path from "path";
-import * as fs from "fs-extra";
-import { parse } from "jsonc-parser";
-import { DebugConfiguration, Uri, WorkspaceFolder } from "vscode";
-
-import { traceLog } from "../../../common/log/logging";
-import {
-	getConfiguration,
-	getWorkspaceFolder,
-} from "../../../common/vscodeapi";
-
-export async function getConfigurationsForWorkspace(
-	workspace: WorkspaceFolder,
-): Promise<DebugConfiguration[]> {
-	traceLog("Getting configurations for workspace");
-
-	const filename = path.join(workspace.uri.fsPath, ".vscode", "launch.json");
-
-	if (!(await fs.pathExists(filename))) {
-		// Check launch config in the workspace file
-		const codeWorkspaceConfig = getConfiguration("launch", workspace);
-
-		if (
-			!codeWorkspaceConfig.configurations ||
-			!Array.isArray(codeWorkspaceConfig.configurations)
-		) {
-			return [];
-		}
-
-		traceLog("Using configuration in workspace");
-
-		return codeWorkspaceConfig.configurations;
-	}
-
-	const text = await fs.readFile(filename, "utf-8");
-
-	const parsed = parse(text, [], {
-		allowTrailingComma: true,
-		disallowComments: false,
-	});
-
-	if (!parsed.configurations || !Array.isArray(parsed.configurations)) {
-		throw Error("Missing field in launch.json: configurations");
-	}
-
-	if (!parsed.version) {
-		throw Error("Missing field in launch.json: version");
-	}
-
-	traceLog("Using configuration in launch.json");
-
-	return parsed.configurations;
+import * as path from 'path';
+import * as fs from 'fs-extra';
+import { parse } from 'jsonc-parser';
+import { DebugConfiguration, Uri, WorkspaceFolder } from 'vscode';
+import { getConfiguration, getWorkspaceFolder } from '../../../common/vscodeapi';
+import { traceLog } from '../../../common/log/logging';
+
+export async function getConfigurationsForWorkspace(workspace: WorkspaceFolder): Promise<DebugConfiguration[]> {
+    traceLog('Getting configurations for workspace');
+    const filename = path.join(workspace.uri.fsPath, '.vscode', 'launch.json');
+    if (!(await fs.pathExists(filename))) {
+        return getConfigurationsFromSettings(workspace);
+    }
+    const text = await fs.readFile(filename, 'utf-8');
+    const parsed = parse(text, [], { allowTrailingComma: true, disallowComments: false });
+    // no launch.json or no configurations found in launch.json, look in settings.json
+    if (!parsed || !parsed.configurations) {
+        traceLog('No configurations found in launch.json, looking in settings.json.');
+        return getConfigurationsFromSettings(workspace);
+    }
+    // configurations found in launch.json, verify them then return
+    if (!Array.isArray(parsed.configurations) || parsed.configurations.length === 0) {
+        throw Error('Invalid configurations in launch.json');
+    }
+    if (!parsed.version) {
+        throw Error('Missing field in launch.json: version');
+    }
+    traceLog('Using configuration in launch.json');
+    return parsed.configurations;
 }
 
-export async function getConfigurationsByUri(
-	uri?: Uri,
-): Promise<DebugConfiguration[]> {
-	if (uri) {
-		const workspace = getWorkspaceFolder(uri);
-
-		if (workspace) {
-			return getConfigurationsForWorkspace(workspace);
-		}
-	}
+export async function getConfigurationsByUri(uri?: Uri): Promise<DebugConfiguration[]> {
+    if (uri) {
+        const workspace = getWorkspaceFolder(uri);
+        if (workspace) {
+            return getConfigurationsForWorkspace(workspace);
+        }
+    }
+    return [];
+}
 
-	return [];
+export function getConfigurationsFromSettings(workspace: WorkspaceFolder): DebugConfiguration[] {
+    // look in settings.json
+    const codeWorkspaceConfig = getConfiguration('launch', workspace);
+    // if this includes user configs, how do I make sure it selects the workspace ones first
+    if (
+        !codeWorkspaceConfig.configurations ||
+        !Array.isArray(codeWorkspaceConfig.configurations) ||
+        codeWorkspaceConfig.configurations.length === 0
+    ) {
+        throw Error('No configurations found in launch.json or settings.json');
+    }
+    traceLog('Using configuration in workspace settings.json.');
+    return codeWorkspaceConfig.configurations;
 }

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

@@ -1,32 +1,30 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-"use strict";
+'use strict';
 
-import { MultiStepInput } from "../../../common/multiStepInput";
-import { DebugConfigStrings } from "../../../common/utils/localize";
-import { DebuggerTypeName } from "../../../constants";
-import { sendTelemetryEvent } from "../../../telemetry";
-import { EventName } from "../../../telemetry/constants";
-import { LaunchRequestArguments } from "../../../types";
-import { DebugConfigurationState, DebugConfigurationType } from "../../types";
+import { DebugConfigStrings } from '../../../common/utils/localize';
+import { MultiStepInput } from '../../../common/multiStepInput';
+import { sendTelemetryEvent } from '../../../telemetry';
+import { EventName } from '../../../telemetry/constants';
+import { DebuggerTypeName } from '../../../constants';
+import { LaunchRequestArguments } from '../../../types';
+import { DebugConfigurationState, DebugConfigurationType } from '../../types';
 
 export async function buildFileWithArgsLaunchDebugConfiguration(
-	_input: MultiStepInput<DebugConfigurationState>,
-	state: DebugConfigurationState,
+    _input: MultiStepInput<DebugConfigurationState>,
+    state: DebugConfigurationState,
 ): Promise<void> {
-	const config: Partial<LaunchRequestArguments> = {
-		name: DebugConfigStrings.fileWithArgs.snippet.name,
-		type: DebuggerTypeName,
-		request: "launch",
-		program: "${file}",
-		console: "integratedTerminal",
-		args: ["${command:pickArgs}"],
-	};
-
-	sendTelemetryEvent(EventName.DEBUGGER_CONFIGURATION_PROMPTS, undefined, {
-		configurationType: DebugConfigurationType.launchFileWithArgs,
-	});
-
-	Object.assign(state.config, config);
+    const config: Partial<LaunchRequestArguments> = {
+        name: DebugConfigStrings.fileWithArgs.snippet.name,
+        type: DebuggerTypeName,
+        request: 'launch',
+        program: '${file}',
+        console: 'integratedTerminal',
+        args: '${command:pickArgs}',
+    };
+    sendTelemetryEvent(EventName.DEBUGGER_CONFIGURATION_PROMPTS, undefined, {
+        configurationType: DebugConfigurationType.launchFileWithArgs,
+    });
+    Object.assign(state.config, config);
 }