Merge pull request #4612 from JoeRobich/fix-multi-start

Ensure we only start one instance of OmniSharp server
dotnet · Jun 14, 2021 · 3534e25 · 3534e25
2 parents 19b027b + b5b9ce7
commit 3534e25
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/src/omnisharp/server.ts b/src/omnisharp/server.ts
@@ -250,6 +250,10 @@ export class OmniSharpServer {
     // --- start, stop, and connect
 
     private async _start(launchTarget: LaunchTarget, options: Options): Promise<void> {
+        if (this._state != ServerState.Stopped) {
+            this.eventStream.post(new ObservableEvents.OmnisharpServerOnServerError("Attempt to start OmniSharp server failed because another server instance is running."));
+            return;
+        }
 
         if (launchTarget.kind === LaunchTargetKind.LiveShare) {
             this.eventStream.post(new ObservableEvents.OmnisharpServerMessage("During Live Share sessions language services are provided by the Live Share server."));
@@ -498,6 +502,11 @@ export class OmniSharpServer {
     }
 
     public async restart(launchTarget: LaunchTarget = this._launchTarget): Promise<void> {
+        if (this._state == ServerState.Starting) {
+            this.eventStream.post(new ObservableEvents.OmnisharpServerOnServerError("Attempt to restart OmniSharp server failed because another server instance is starting."));
+            return;
+        }
+
         if (launchTarget) {
             await this.stop();
             this.eventStream.post(new ObservableEvents.OmnisharpRestart());