From 2ebe00fce1199bafeda695be7bc2bc0e7312259d Mon Sep 17 00:00:00 2001 From: Claudia Regio Date: Thu, 7 Aug 2025 15:14:04 -0700 Subject: [PATCH 1/6] Enhance dotnet.generateAssets command to accept skipPrompt parameter for asset generation --- src/lsptoolshost/debugger/debugger.ts | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/lsptoolshost/debugger/debugger.ts b/src/lsptoolshost/debugger/debugger.ts index 9c45a4074..870b068ee 100644 --- a/src/lsptoolshost/debugger/debugger.ts +++ b/src/lsptoolshost/debugger/debugger.ts @@ -53,8 +53,8 @@ export function registerDebugger( ); context.subscriptions.push( - vscode.commands.registerCommand('dotnet.generateAssets', async (selectedIndex) => { - if (!(await promptForDevKitDebugConfigurations())) { + vscode.commands.registerCommand('dotnet.generateAssets', async (selectedIndex, skipPrompt = false) => { + if (!(await promptForDevKitDebugConfigurations(skipPrompt))) { return; } @@ -63,8 +63,13 @@ export function registerDebugger( ); } -async function promptForDevKitDebugConfigurations(): Promise { +async function promptForDevKitDebugConfigurations(skipPrompt: boolean = false): Promise { if (getCSharpDevKit()) { + // If skipPrompt is true, proceed with generating assets without showing the dialog + if (skipPrompt) { + return true; + } + let result: boolean | undefined = undefined; while (result === undefined) { From a1769b680ed0e8df43972912045dc20d9ee5e570 Mon Sep 17 00:00:00 2001 From: Claudia Regio Date: Mon, 11 Aug 2025 15:13:07 -0700 Subject: [PATCH 2/6] Update src/lsptoolshost/debugger/debugger.ts Co-authored-by: Andrew Wang --- src/lsptoolshost/debugger/debugger.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lsptoolshost/debugger/debugger.ts b/src/lsptoolshost/debugger/debugger.ts index 870b068ee..4a944ca6c 100644 --- a/src/lsptoolshost/debugger/debugger.ts +++ b/src/lsptoolshost/debugger/debugger.ts @@ -66,7 +66,7 @@ export function registerDebugger( async function promptForDevKitDebugConfigurations(skipPrompt: boolean = false): Promise { if (getCSharpDevKit()) { // If skipPrompt is true, proceed with generating assets without showing the dialog - if (skipPrompt) { + if (options.skipPrompt) { return true; } From c8e4acaa25908d5016e625899d3ebc9f717876f4 Mon Sep 17 00:00:00 2001 From: Claudia Regio Date: Mon, 11 Aug 2025 15:13:16 -0700 Subject: [PATCH 3/6] Update src/lsptoolshost/debugger/debugger.ts Co-authored-by: Andrew Wang --- src/lsptoolshost/debugger/debugger.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lsptoolshost/debugger/debugger.ts b/src/lsptoolshost/debugger/debugger.ts index 4a944ca6c..70c5c9504 100644 --- a/src/lsptoolshost/debugger/debugger.ts +++ b/src/lsptoolshost/debugger/debugger.ts @@ -63,7 +63,7 @@ export function registerDebugger( ); } -async function promptForDevKitDebugConfigurations(skipPrompt: boolean = false): Promise { +async function promptForDevKitDebugConfigurations(options: { skipPrompt?: boolean }): Promise { if (getCSharpDevKit()) { // If skipPrompt is true, proceed with generating assets without showing the dialog if (options.skipPrompt) { From 4fce3f5a787f9a5654787968ccb5d153a58c5938 Mon Sep 17 00:00:00 2001 From: Claudia Regio Date: Mon, 11 Aug 2025 15:23:54 -0700 Subject: [PATCH 4/6] Update debugger.ts --- src/lsptoolshost/debugger/debugger.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lsptoolshost/debugger/debugger.ts b/src/lsptoolshost/debugger/debugger.ts index 70c5c9504..d04994653 100644 --- a/src/lsptoolshost/debugger/debugger.ts +++ b/src/lsptoolshost/debugger/debugger.ts @@ -53,7 +53,7 @@ export function registerDebugger( ); context.subscriptions.push( - vscode.commands.registerCommand('dotnet.generateAssets', async (selectedIndex, skipPrompt = false) => { + vscode.commands.registerCommand('dotnet.generateAssets', async (selectedIndex: number, options: { skipPrompt?: boolean } = {}) => { if (!(await promptForDevKitDebugConfigurations(skipPrompt))) { return; } From 0e73c042812545041e92d26e21f42d818e42b9b3 Mon Sep 17 00:00:00 2001 From: Claudia Regio Date: Mon, 11 Aug 2025 15:43:21 -0700 Subject: [PATCH 5/6] Update src/lsptoolshost/debugger/debugger.ts Co-authored-by: Andrew Wang --- src/lsptoolshost/debugger/debugger.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lsptoolshost/debugger/debugger.ts b/src/lsptoolshost/debugger/debugger.ts index d04994653..3fe85d2fe 100644 --- a/src/lsptoolshost/debugger/debugger.ts +++ b/src/lsptoolshost/debugger/debugger.ts @@ -54,7 +54,7 @@ export function registerDebugger( context.subscriptions.push( vscode.commands.registerCommand('dotnet.generateAssets', async (selectedIndex: number, options: { skipPrompt?: boolean } = {}) => { - if (!(await promptForDevKitDebugConfigurations(skipPrompt))) { + if (!(await promptForDevKitDebugConfigurations(options))) { return; } From 9f3702297d44380bcd39c3d8468c1542b41bf002 Mon Sep 17 00:00:00 2001 From: Claudia Regio Date: Mon, 11 Aug 2025 16:12:30 -0700 Subject: [PATCH 6/6] Refactor dotnet.generateAssets command for improved readability --- src/lsptoolshost/debugger/debugger.ts | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/lsptoolshost/debugger/debugger.ts b/src/lsptoolshost/debugger/debugger.ts index 3fe85d2fe..10192bae1 100644 --- a/src/lsptoolshost/debugger/debugger.ts +++ b/src/lsptoolshost/debugger/debugger.ts @@ -53,13 +53,16 @@ export function registerDebugger( ); context.subscriptions.push( - vscode.commands.registerCommand('dotnet.generateAssets', async (selectedIndex: number, options: { skipPrompt?: boolean } = {}) => { - if (!(await promptForDevKitDebugConfigurations(options))) { - return; - } + vscode.commands.registerCommand( + 'dotnet.generateAssets', + async (selectedIndex: number, options: { skipPrompt?: boolean } = {}) => { + if (!(await promptForDevKitDebugConfigurations(options))) { + return; + } - await generateAssets(workspaceInformationProvider, selectedIndex); - }) + await generateAssets(workspaceInformationProvider, selectedIndex); + } + ) ); }