Apply suggestions from code review

Co-authored-by: Andrew Eisenberg <aeisenberg@github.com>

Author: henrymercer

extensions/ql-vscode/src/distribution.ts

@@ -117,10 +117,7 @@ export class DistributionManager implements DistributionProvider {
 
   public async getCodeQlPathWithoutVersionCheck(): Promise<string | undefined> {
     const distribution = await this.getDistributionWithoutVersionCheck();
-    if (distribution === undefined) {
-      return undefined;
-    }
-    return distribution.codeQlPath;
+    return distribution?.codeQlPath;
   }
 
   /**
@@ -184,7 +181,7 @@ export class DistributionManager implements DistributionProvider {
     minSecondsSinceLastUpdateCheck: number): Promise<DistributionUpdateCheckResult> {
     const distribution = await this.getDistributionWithoutVersionCheck();
     const extensionManagedCodeQlPath = await this._extensionSpecificDistributionManager.getCodeQlPathWithoutVersionCheck();
-    if (distribution !== undefined && distribution.codeQlPath !== extensionManagedCodeQlPath) {
+    if (distribution?.codeQlPath !== extensionManagedCodeQlPath) {
       // A distribution is present but it isn't managed by the extension.
       return createInvalidLocationResult();
     }

extensions/ql-vscode/src/extension.ts

@@ -202,8 +202,8 @@ export async function activate(ctx: ExtensionContext): Promise<void> {
             case DistributionKind.CustomPathConfig:
               return `Please update the \"CodeQL CLI Executable Path\" setting to point to a CLI in the version range ${codeQlVersionRange}.`;
             case DistributionKind.PathEnvironmentVariable:
-              return `Please update the CodeQL CLI on your PATH to a version in the range ${codeQlVersionRange}, or ` +
-                `set the \"CodeQL CLI Executable Path\" setting to the path of a CLI in the version range ${codeQlVersionRange}.`;
+              return `Please update the CodeQL CLI on your PATH to a version compatible with ${codeQlVersionRange}, or ` +
+                `set the \"CodeQL CLI Executable Path\" setting to the path of a CLI version compatible with ${codeQlVersionRange}.`;
           }
         })();