Merge pull request #5199 from 50Wliu/users/winstonliu/omnisharp-serve…

…r-nullability Clear nullability warnings in server/omnisharp.ts
dotnet · May 9, 2022 · a64910f · a64910f
2 parents f1f38b7 + 4c2dc12
commit a64910f
Show file tree

Hide file tree

Showing 4 changed files with 155 additions and 145 deletions.
diff --git a/src/features/commands.ts b/src/features/commands.ts
@@ -97,14 +97,14 @@ async function pickProjectAndStart(server: OmniSharpServer, optionProvider: Opti
 }
 
 export async function showProjectSelector(server: OmniSharpServer, targets: LaunchTarget[]): Promise<void> {
-    return vscode.window.showQuickPick(targets, {
+    const launchTarget = await vscode.window.showQuickPick(targets, {
         matchOnDescription: true,
         placeHolder: `Select 1 of ${targets.length} projects`
-    }).then(async launchTarget => {
-        if (launchTarget) {
-            return server.restart(launchTarget);
-        }
     });
+
+    if (launchTarget !== undefined) {
+        return server.restart(launchTarget);
+    }
 }
 
 interface Command {

diff --git a/src/observers/OmnisharpDebugModeLoggerObserver.ts b/src/observers/OmnisharpDebugModeLoggerObserver.ts
@@ -57,7 +57,7 @@ export class OmnisharpDebugModeLoggerObserver extends BaseLoggerObserver {
     }
 
     private handleOmnisharpServerRequestCancelled(event: OmnisharpServerRequestCancelled) {
-        this.logger.appendLine(`Cancelled request for ${event.command} (${event.id}).`);
+        this.logger.appendLine(`Cancelled request for ${event.command}${event.id ? ` (${event.id})` : ''}.`);
         this.logger.appendLine();
     }
 
@@ -101,4 +101,4 @@ export class OmnisharpDebugModeLoggerObserver extends BaseLoggerObserver {
             default: throw new Error(`Unknown log level value: ${logLevel}`);
         }
     }
-}
+}
diff --git a/src/omnisharp/loggingEvents.ts b/src/omnisharp/loggingEvents.ts
@@ -125,7 +125,7 @@ export class OmnisharpServerDequeueRequest implements BaseEvent {
 
 export class OmnisharpServerRequestCancelled implements BaseEvent {
     type = EventType.OmnisharpServerRequestCancelled;
-    constructor(public command: string, public id: number) { }
+    constructor(public command: string, public id: number | undefined) { }
 }
 
 export class OmnisharpServerProcessRequestStart implements BaseEvent {