Working code lens - needs improvement

Author: marcnjaramillo

extensions/ql-vscode/src/CodeLensProvider.ts

@@ -15,14 +15,14 @@ class MyCodeLensProvider implements CodeLensProvider {
     for (let index = 0; index < document.lineCount; index++) {
       const textLine = document.lineAt(index);
       if (textLine.text.includes('predicate')) {
-        // const regex = new RegExp(/predicate/);
-        const args = textLine.text.search((new RegExp(/predicate/)));
-        console.log(textLine, args);
+        const uri = document.uri;
+        const regex = new RegExp(/predicate/);
+        const args = textLine.text.search(regex);
         const range = textLine.range;
         const command: Command = {
           command: 'codeQL.codeLensQuickEval',
           title: 'CodeQL: Quick Evaluation',
-          arguments: ['argument', false]
+          arguments: [uri, range, args]
         };
         const codeLens = new CodeLens(range, command);
         codeLenses.push(codeLens);

extensions/ql-vscode/src/extension.ts

@@ -468,7 +468,6 @@ async function activateWithInstalledDistribution(
     forceReveal: WebviewReveal
   ): Promise<void> {
     await intm.showResults(query, forceReveal, false);
-    console.log(query.query.quickEvalPosition);
   }
 
   async function compileAndRunQuery(
@@ -479,7 +478,7 @@ async function activateWithInstalledDistribution(
     databaseItem: DatabaseItem | undefined,
     args?: any
   ): Promise<void> {
-    console.log(args);
+    // console.log('args', args);
     if (qs !== undefined) {
       // If no databaseItem is specified, use the database currently selected in the Databases UI
       databaseItem = databaseItem || await databaseUI.getDatabaseItem(progress, token);
@@ -717,13 +716,20 @@ async function activateWithInstalledDistribution(
       })
   );
 
-  commands.registerCommand('codeQL.codeLensQuickEval', async (
-    progress: ProgressCallback,
-    token: CancellationToken,
-    uri: Uri | undefined,
-    args: any) => {
-      await compileAndRunQuery(true, uri, progress, token, undefined, args );
-  });
+  ctx.subscriptions.push(
+    commandRunnerWithProgress(
+      'codeQL.codeLensQuickEval',
+      async (
+        progress: ProgressCallback,
+        token: CancellationToken,
+        uri: Uri | undefined,
+        ...args: any
+      ) => await compileAndRunQuery(true, uri, progress, token, undefined, args),
+      {
+        title: 'Running query',
+        cancellable: true
+      })
+  );
 
   ctx.subscriptions.push(
     commandRunnerWithProgress('codeQL.quickQuery', async (

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

@@ -327,16 +327,17 @@ async function convertToQlPath(filePath: string): Promise<string> {
 
 
 /** Gets the selected position within the given editor. */
-async function getSelectedPosition(editor: TextEditor, args: any | undefined): Promise<messages.Position> {
-    const pos = editor.selection.start;
-    const posEnd = editor.selection.end; 
+async function getSelectedPosition(editor: TextEditor, args?: any): Promise<messages.Position> {
+    const pos = args[0].start;
+    const posEnd = args[0].end;
+    const argsLength = args[1] + 10;
     // Convert from 0-based to 1-based line and column numbers.
     return {
       fileName: await convertToQlPath(editor.document.fileName),
       line: pos.line + 1,
-      column: pos.character + 1,
+      column: pos.character + argsLength,
       endLine: posEnd.line + 1,
-      endColumn: posEnd.character + 1
+      endColumn: posEnd.character - argsLength
     };
 }
 
@@ -485,7 +486,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: any | undefined): Promise<SelectedQuery> {
+export async function determineSelectedQuery(selectedResourceUri: Uri | undefined, quickEval: boolean, args?: any): Promise<SelectedQuery> {
   const editor = window.activeTextEditor;
 
   // Choose which QL file to use.
@@ -554,7 +555,7 @@ export async function compileAndRunQueryAgainstDatabase(
   selectedQueryUri: Uri | undefined,
   progress: ProgressCallback,
   token: CancellationToken,
-  args: any | undefined,
+  args?: any,
   templates?: messages.TemplateDefinitions,
 ): Promise<QueryWithResults> {
   if (!db.contents || !db.contents.dbSchemeUri) {