Clean up code per feedback

Author: marcnjaramillo

extensions/ql-vscode/CHANGELOG.md

@@ -2,7 +2,7 @@
 
 ## [UNRELEASED]
 
-- Add CodeLens feature to make the CodeQL quick evaluation command more accessible. [#1035](https://github.com/github/vscode-codeql/pull/1035)
+- Add a CodeLens to make the Quick Evaluation command more accessible. Click the `Quick Evaluation` prompt above a predicate definition in the editor to evaluate that predicate on its own. [#1035](https://github.com/github/vscode-codeql/pull/1035)
 
 ## 1.5.8 - 2 December 2021
 

extensions/ql-vscode/src/extension.ts

@@ -159,10 +159,6 @@ export interface CodeQLExtensionInterface {
  */
 export async function activate(ctx: ExtensionContext): Promise<CodeQLExtensionInterface | Record<string, never>> {
 
-  const codelensProvider = new QuickEvalCodeLensProvider();
-
-  languages.registerCodeLensProvider({ scheme: 'file', language: 'ql' }, codelensProvider);
-
   void logger.log(`Starting ${extensionId} extension`);
   if (extension === undefined) {
     throw new Error(`Can't find extension ${extensionId}`);
@@ -173,6 +169,9 @@ export async function activate(ctx: ExtensionContext): Promise<CodeQLExtensionIn
   await initializeTelemetry(extension, ctx);
   languageSupport.install();
 
+  const codelensProvider = new QuickEvalCodeLensProvider();
+  languages.registerCodeLensProvider({ scheme: 'file', language: 'ql' }, codelensProvider);
+
   ctx.subscriptions.push(distributionConfigListener);
   const codeQlVersionRange = DEFAULT_DISTRIBUTION_VERSION_RANGE;
   const distributionManager = new DistributionManager(distributionConfigListener, codeQlVersionRange, ctx);
@@ -750,7 +749,7 @@ async function activateWithInstalledDistribution(
       async (
         progress: ProgressCallback,
         token: CancellationToken,
-        uri: Uri | undefined,
+        uri: Uri,
         range: Range
       ) => await compileAndRunQuery(true, uri, progress, token, undefined, range),
       {

extensions/ql-vscode/src/quickEvalCodeLensProvider.ts

@@ -18,13 +18,13 @@ class QuickEvalCodeLensProvider implements CodeLensProvider {
       // Match a predicate signature, including predicate name, parameter list, and opening brace.
       const regex = new RegExp(/(\w+)\s*\(\s*.*(?:,\s*)*\)\s*\{/);
       const matches = textLine.text.match(regex);
-      const startIndex = textLine.text.search(regex);
 
-      if (startIndex !== -1) {
+      if (matches) {
         const range: Range = new Range(
-          textLine.range.start.line, startIndex,
-          textLine.range.end.line, startIndex + 1
+          textLine.range.start.line, matches.index!,
+          textLine.range.end.line, matches.index! + 1
         );
+        console.log(range);
 
         const command: Command = {
           command: 'codeQL.codeLensQuickEval',