Make suggested changes

Author: marcnjaramillo

extensions/ql-vscode/src/CodeLensProvider.ts

@@ -6,7 +6,7 @@ import {
   Range
 } from 'vscode';
 
-class MyCodeLensProvider implements CodeLensProvider {
+class QuickEvalCodeLensProvider implements CodeLensProvider {
   // Each provider requires a provideCodeLenses function which will give the various documents
   // the code lenses
   async provideCodeLenses(document: TextDocument): Promise<CodeLens[]> {
@@ -15,26 +15,26 @@ class MyCodeLensProvider implements CodeLensProvider {
 
     for (let index = 0; index < document.lineCount; index++) {
       const textLine = document.lineAt(index);
-      const regex = new RegExp(/(?=(\w+\(\s*.*(?:,\s*)*\)\s*\{))\1/g);
-      if (textLine.text.match(regex)) {
-        const uri = document.uri;
+      // Match a predicate signature, including predicate name, parameter list, and opening brace.
+      const regex = new RegExp(/\w+\(\s*.*(?:,\s*)*\)\s*\{/);
         const startIndex = textLine.text.search(regex);
-        const range: Range = new Range(
-          textLine.range.start.line, startIndex,
-          textLine.range.end.line, startIndex - 1
-        );
+        if (startIndex !== -1) {
+      const range: Range = new Range(
+        textLine.range.start.line, startIndex,
+        textLine.range.end.line, startIndex + 1
+      );
 
-        const command: Command = {
-          command: 'codeQL.codeLensQuickEval',
-          title: 'CodeQL: Quick Evaluation',
-          arguments: [uri, range]
-        };
-        const codeLens = new CodeLens(range, command);
-        codeLenses.push(codeLens);
-      }
+      const command: Command = {
+        command: 'codeQL.codeLensQuickEval',
+        title: 'CodeQL: Quick Evaluation',
+        arguments: [document.uri, range]
+      };
+      const codeLens = new CodeLens(range, command);
+      codeLenses.push(codeLens);
     }
+  }
     return codeLenses;
   }
 }
 
-export default MyCodeLensProvider;
+export default QuickEvalCodeLensProvider;

extensions/ql-vscode/src/extension.ts

@@ -22,7 +22,7 @@ import { testExplorerExtensionId, TestHub } from 'vscode-test-adapter-api';
 
 import { AstViewer } from './astViewer';
 import * as archiveFilesystemProvider from './archive-filesystem-provider';
-import MyCodeLensProvider from './CodeLensProvider';
+import QuickEvalCodeLensProvider from './codeLensProvider';
 import { CodeQLCliServer, CliVersionConstraint } from './cli';
 import {
   CliConfigListener,
@@ -159,9 +159,9 @@ export interface CodeQLExtensionInterface {
  */
 export async function activate(ctx: ExtensionContext): Promise<CodeQLExtensionInterface | Record<string, never>> {
 
-  const codelensProvider = new MyCodeLensProvider();
+  const codelensProvider = new QuickEvalCodeLensProvider();
 
-  languages.registerCodeLensProvider('*', codelensProvider);
+  languages.registerCodeLensProvider({ scheme: 'file', language: 'ql' }, codelensProvider);
 
   void logger.log(`Starting ${extensionId} extension`);
   if (extension === undefined) {
@@ -478,7 +478,7 @@ async function activateWithInstalledDistribution(
     progress: ProgressCallback,
     token: CancellationToken,
     databaseItem: DatabaseItem | undefined,
-    args?: Range
+    range?: Range
   ): Promise<void> {
     if (qs !== undefined) {
       // If no databaseItem is specified, use the database currently selected in the Databases UI
@@ -495,7 +495,7 @@ async function activateWithInstalledDistribution(
         progress,
         token,
         undefined,
-        args
+        range
       );
       const item = qhm.buildCompletedQuery(info);
       await showResultsForCompletedQuery(item, WebviewReveal.NotForced);
@@ -751,8 +751,8 @@ async function activateWithInstalledDistribution(
         progress: ProgressCallback,
         token: CancellationToken,
         uri: Uri | undefined,
-        args: Range
-      ) => await compileAndRunQuery(true, uri, progress, token, undefined, args),
+        range: Range
+      ) => await compileAndRunQuery(true, uri, progress, token, undefined, range),
       {
         title: 'Running query',
         cancellable: true

extensions/ql-vscode/src/run-queries.ts

@@ -333,10 +333,10 @@ async function convertToQlPath(filePath: string): Promise<string> {
 
 
 /** Gets the selected position within the given editor. */
-async function getSelectedPosition(editor: TextEditor, args?: Range): Promise<messages.Position> {
-    const range = args || editor.selection;
-    const pos = range.start;
-    const posEnd = range.end;
+async function getSelectedPosition(editor: TextEditor, range?: Range): Promise<messages.Position> {
+    const selectedRange = range || editor.selection;
+    const pos = selectedRange.start;
+    const posEnd = selectedRange.end;
     // Convert from 0-based to 1-based line and column numbers.
     return {
       fileName: await convertToQlPath(editor.document.fileName),
@@ -492,7 +492,7 @@ type SelectedQuery = {
  * @param selectedResourceUri The selected resource when the command was run.
  * @param quickEval Whether the command being run is `Quick Evaluation`.
 */
-export async function determineSelectedQuery(selectedResourceUri: Uri | undefined, quickEval: boolean, args?: Range): Promise<SelectedQuery> {
+export async function determineSelectedQuery(selectedResourceUri: Uri | undefined, quickEval: boolean, range?: Range): Promise<SelectedQuery> {
   const editor = window.activeTextEditor;
 
   // Choose which QL file to use.
@@ -546,7 +546,7 @@ export async function determineSelectedQuery(selectedResourceUri: Uri | undefine
       // Report an error if we end up in this (hopefully unlikely) situation.
       throw new Error('The selected resource for quick evaluation should match the active editor.');
     }
-    quickEvalPosition = await getSelectedPosition(editor, args);
+    quickEvalPosition = await getSelectedPosition(editor, range);
     quickEvalText = editor.document.getText(editor.selection);
   }
 
@@ -562,14 +562,14 @@ export async function compileAndRunQueryAgainstDatabase(
   progress: ProgressCallback,
   token: CancellationToken,
   templates?: messages.TemplateDefinitions,
-  args?: Range
+  range?: Range
 ): Promise<QueryWithResults> {
   if (!db.contents || !db.contents.dbSchemeUri) {
     throw new Error(`Database ${db.databaseUri} does not have a CodeQL database scheme.`);
   }
 
   // Determine which query to run, based on the selection and the active editor.
-  const { queryPath, quickEvalPosition, quickEvalText } = await determineSelectedQuery(selectedQueryUri, quickEval, args);
+  const { queryPath, quickEvalPosition, quickEvalText } = await determineSelectedQuery(selectedQueryUri, quickEval, range);
 
   const historyItemOptions: QueryHistoryItemOptions = {};
   historyItemOptions.isQuickQuery === isQuickQueryPath(queryPath);