Merge pull request #5192 from 50Wliu/users/winstonliu/server-autostar…

…t-preferred-path-nullability Fix nullability for autoStart preferredPath
dotnet · Apr 28, 2022 · 2cd2b81 · 2cd2b81
2 parents 7b1f541 + da8b747
commit 2cd2b81
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/omnisharp/extension.ts b/src/omnisharp/extension.ts
@@ -199,7 +199,7 @@ export async function activate(context: vscode.ExtensionContext, packageJSON: an
     }));
 
     if (options.autoStart) {
-        server.autoStart(context.workspaceState.get<string>('lastSolutionPathOrFolder'));
+        server.autoStart(context.workspaceState.get<string>('lastSolutionPathOrFolder', ''));
     }
 
     // stop server on deactivate

diff --git a/src/omnisharp/server.ts b/src/omnisharp/server.ts
@@ -546,7 +546,7 @@ export class OmniSharpServer {
         }
     }
 
-    public autoStart(preferredPath: string | undefined): Thenable<void> {
+    public autoStart(preferredPath: string): Thenable<void> {
         const options = this.optionProvider.GetLatestOptions();
         return findLaunchTargets(options).then(async launchTargets => {
             // If there aren't any potential launch targets, we create file watcher and try to
@@ -582,7 +582,7 @@ export class OmniSharpServer {
 
             // If there's more than one launch target, we start the server if one of the targets
             // matches the preferred path.
-            if (preferredPath !== undefined) {
+            if (preferredPath.length > 0) {
                 const preferredLaunchTarget = launchTargets.find((a) => a.target === preferredPath);
                 if (preferredLaunchTarget) {
                     return this.restart(preferredLaunchTarget);