Current changes to Code Lens - not working

Author: marcnjaramillo

extensions/ql-vscode/package-lock.json

@@ -2,26 +2,33 @@ import {
   CodeLensProvider,
   TextDocument,
   CodeLens,
-  Range,
   Command
 } from 'vscode';
 
 class MyCodeLensProvider implements CodeLensProvider {
   // Each provider requires a provideCodeLenses function which will give the various documents
   // the code lenses
-  async provideCodeLenses(_document: TextDocument): Promise<CodeLens[]> {
-    // Define where the CodeLens will exist
-    const topOfDocument = new Range(0, 0, 0, 0);
+  async provideCodeLenses(document: TextDocument): Promise<CodeLens[]> {
 
-    // Define what command we want to trigger when activating the CodeLens
-    const command: Command = {
-      command: 'codeQL.quickEval',
-      title: 'CodeQL: Quick Evaluation'
-    };
+    const codeLenses: CodeLens[] = [];
 
-    const codeLens = new CodeLens(topOfDocument, command);
-
-    return [codeLens];
+    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 range = textLine.range;
+        const command: Command = {
+          command: 'codeQL.codeLensQuickEval',
+          title: 'CodeQL: Quick Evaluation',
+          arguments: ['argument', false]
+        };
+        const codeLens = new CodeLens(range, command);
+        codeLenses.push(codeLens);
+      }
+    }
+    return codeLenses;
   }
 }
 

extensions/ql-vscode/src/CodeLensProvider.ts

@@ -161,18 +161,6 @@ export async function activate(ctx: ExtensionContext): Promise<CodeQLExtensionIn
 
   languages.registerCodeLensProvider('*', codelensProvider);
 
-  // commands.registerCommand('codelens-sample.enableCodeLens', () => {
-  //     void workspace.getConfiguration('codelens-sample').update('enableCodeLens', true, true);
-  // });
-
-  // commands.registerCommand('codelens-sample.disableCodeLens', () => {
-  //     void workspace.getConfiguration('codelens-sample').update('enableCodeLens', false, true);
-  // });
-
-  // commands.registerCommand('codelens-sample.codelensAction', (args: any) => {
-  //     void window.showInformationMessage(`CodeLens action clicked with args=${args}`);
-  // });
-  
   void logger.log(`Starting ${extensionId} extension`);
   if (extension === undefined) {
     throw new Error(`Can't find extension ${extensionId}`);
@@ -489,7 +477,9 @@ async function activateWithInstalledDistribution(
     progress: ProgressCallback,
     token: CancellationToken,
     databaseItem: DatabaseItem | undefined,
+    args?: any
   ): Promise<void> {
+    console.log(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);
@@ -503,7 +493,8 @@ async function activateWithInstalledDistribution(
         quickEval,
         selectedQuery,
         progress,
-        token
+        token,
+        args
       );
       const item = qhm.buildCompletedQuery(info);
       await showResultsForCompletedQuery(item, WebviewReveal.NotForced);
@@ -725,6 +716,15 @@ async function activateWithInstalledDistribution(
         cancellable: true
       })
   );
+
+  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.quickQuery', async (
       progress: ProgressCallback,

extensions/ql-vscode/src/extension.ts

@@ -327,17 +327,17 @@ async function convertToQlPath(filePath: string): Promise<string> {
 
 
 /** Gets the selected position within the given editor. */
-async function getSelectedPosition(editor: TextEditor): Promise<messages.Position> {
-  const pos = editor.selection.start;
-  const posEnd = editor.selection.end;
-  // 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,
-    endLine: posEnd.line + 1,
-    endColumn: posEnd.character + 1
-  };
+async function getSelectedPosition(editor: TextEditor, args: any | undefined): Promise<messages.Position> {
+    const pos = editor.selection.start;
+    const posEnd = editor.selection.end; 
+    // 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,
+      endLine: posEnd.line + 1,
+      endColumn: posEnd.character + 1
+    };
 }
 
 /**
@@ -485,7 +485,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): Promise<SelectedQuery> {
+export async function determineSelectedQuery(selectedResourceUri: Uri | undefined, quickEval: boolean, args: any | undefined): Promise<SelectedQuery> {
   const editor = window.activeTextEditor;
 
   // Choose which QL file to use.
@@ -539,7 +539,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);
+    quickEvalPosition = await getSelectedPosition(editor, args);
     quickEvalText = editor.document.getText(editor.selection);
   }
 
@@ -554,14 +554,15 @@ export async function compileAndRunQueryAgainstDatabase(
   selectedQueryUri: Uri | undefined,
   progress: ProgressCallback,
   token: CancellationToken,
+  args: any | undefined,
   templates?: messages.TemplateDefinitions,
 ): 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);
+  const { queryPath, quickEvalPosition, quickEvalText } = await determineSelectedQuery(selectedQueryUri, quickEval, args);
 
   const historyItemOptions: QueryHistoryItemOptions = {};
   historyItemOptions.isQuickQuery === isQuickQueryPath(queryPath);