Allow saving of the chosen solution

Author: jasonmalinowski

l10n/bundle.l10n.json

@@ -119,8 +119,9 @@
   "Ignore": "Ignore",
   "Run and Debug: A valid browser is not installed": "Run and Debug: A valid browser is not installed",
   "Your workspace has multiple Visual Studio Solution files; please select one to get full IntelliSense.": "Your workspace has multiple Visual Studio Solution files; please select one to get full IntelliSense.",
-  "Choose solution": "Choose solution",
-  "Do not load solutions": "Do not load solutions",
+  "Choose": "Choose",
+  "Choose and set default": "Choose and set default",
+  "Do not load any": "Do not load any",
   "Restart Language Server": "Restart Language Server",
   "pipeArgs must be a string or a string array type": "pipeArgs must be a string or a string array type",
   "Name not defined in current configuration.": "Name not defined in current configuration.",

src/lsptoolshost/commands.ts

@@ -146,9 +146,9 @@ async function completionComplexEdit(
     }
 }
 
-async function openSolution(languageServer: RoslynLanguageServer): Promise<void> {
+async function openSolution(languageServer: RoslynLanguageServer): Promise<vscode.Uri | undefined> {
     if (!vscode.workspace.workspaceFolders) {
-        return;
+        return undefined;
     }
 
     const solutionFiles = await vscode.workspace.findFiles('**/*.sln');
@@ -159,6 +159,8 @@ async function openSolution(languageServer: RoslynLanguageServer): Promise<void>
     });
 
     if (launchTarget) {
-        languageServer.openSolution(vscode.Uri.file(launchTarget.target));
+        const uri = vscode.Uri.file(launchTarget.target);
+        languageServer.openSolution(uri);
+        return uri;
     }
 }

src/lsptoolshost/roslynLanguageServer.ts

@@ -431,15 +431,24 @@ export class RoslynLanguageServer {
                             vscode.l10n.t(
                                 'Your workspace has multiple Visual Studio Solution files; please select one to get full IntelliSense.'
                             ),
-                            { title: vscode.l10n.t('Choose solution'), open: true },
-                            { title: vscode.l10n.t('Do not load solutions'), open: false }
+                            { title: vscode.l10n.t('Choose'), action: 'open' },
+                            { title: vscode.l10n.t('Choose and set default'), action: 'openAndSetDefault' },
+                            { title: vscode.l10n.t('Do not load any'), action: 'disable' }
                         );
 
                         if (chosen) {
-                            if (chosen.open) {
-                                vscode.commands.executeCommand('dotnet.openSolution');
-                            } else {
+                            if (chosen.action === 'disable') {
                                 vscode.workspace.getConfiguration().update('dotnet.defaultSolution', 'disable', false);
+                            } else {
+                                const chosenSolution: vscode.Uri | undefined = await vscode.commands.executeCommand(
+                                    'dotnet.openSolution'
+                                );
+                                if (chosen.action === 'openAndSetDefault' && chosenSolution) {
+                                    const relativePath = vscode.workspace.asRelativePath(chosenSolution);
+                                    vscode.workspace
+                                        .getConfiguration()
+                                        .update('dotnet.defaultSolution', relativePath, false);
+                                }
                             }
                         }
                     } else if (solutionUris.length === 0) {