Clean up code lens

Author: marcnjaramillo

extensions/ql-vscode/src/CodeLensProvider.ts

@@ -2,7 +2,8 @@ import {
   CodeLensProvider,
   TextDocument,
   CodeLens,
-  Command
+  Command,
+  Range
 } from 'vscode';
 
 class MyCodeLensProvider implements CodeLensProvider {
@@ -17,12 +18,16 @@ class MyCodeLensProvider implements CodeLensProvider {
       if (textLine.text.includes('predicate')) {
         const uri = document.uri;
         const regex = new RegExp(/predicate/);
-        const args = textLine.text.search(regex);
-        const range = textLine.range;
+        const startIndex = textLine.text.search(regex);
+        const range: Range = new Range(
+          textLine.range.start.line, startIndex + 10,
+          textLine.range.end.line, startIndex + 11
+        );
+
         const command: Command = {
           command: 'codeQL.codeLensQuickEval',
           title: 'CodeQL: Quick Evaluation',
-          arguments: [uri, range, args]
+          arguments: [uri, range]
         };
         const codeLens = new CodeLens(range, command);
         codeLenses.push(codeLens);

extensions/ql-vscode/src/extension.ts

@@ -12,7 +12,8 @@ import {
   window as Window,
   env,
   window,
-  QuickPickItem
+  QuickPickItem,
+  Range
 } from 'vscode';
 import { LanguageClient } from 'vscode-languageclient';
 import * as os from 'os';
@@ -476,9 +477,8 @@ async function activateWithInstalledDistribution(
     progress: ProgressCallback,
     token: CancellationToken,
     databaseItem: DatabaseItem | undefined,
-    args?: any
+    args?: Range
   ): Promise<void> {
-    // 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);
@@ -493,6 +493,7 @@ async function activateWithInstalledDistribution(
         selectedQuery,
         progress,
         token,
+        undefined,
         args
       );
       const item = qhm.buildCompletedQuery(info);
@@ -723,7 +724,7 @@ async function activateWithInstalledDistribution(
         progress: ProgressCallback,
         token: CancellationToken,
         uri: Uri | undefined,
-        ...args: any
+        args: Range
       ) => await compileAndRunQuery(true, uri, progress, token, undefined, args),
       {
         title: 'Running query',

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

@@ -5,6 +5,7 @@ import * as tmp from 'tmp-promise';
 import {
   CancellationToken,
   ConfigurationTarget,
+  Range,
   TextDocument,
   TextEditor,
   Uri,
@@ -327,17 +328,17 @@ async function convertToQlPath(filePath: string): Promise<string> {
 
 
 /** Gets the selected position within the given editor. */
-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;
+async function getSelectedPosition(editor: TextEditor, args?: Range): Promise<messages.Position> {
+    const range = args || editor.selection;
+    const pos = range.start;
+    const posEnd = range.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 + argsLength,
+      column: pos.character + 1,
       endLine: posEnd.line + 1,
-      endColumn: posEnd.character - argsLength
+      endColumn: posEnd.character + 1
     };
 }
 
@@ -486,7 +487,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): Promise<SelectedQuery> {
+export async function determineSelectedQuery(selectedResourceUri: Uri | undefined, quickEval: boolean, args?: Range): Promise<SelectedQuery> {
   const editor = window.activeTextEditor;
 
   // Choose which QL file to use.
@@ -555,8 +556,8 @@ export async function compileAndRunQueryAgainstDatabase(
   selectedQueryUri: Uri | undefined,
   progress: ProgressCallback,
   token: CancellationToken,
-  args?: any,
   templates?: messages.TemplateDefinitions,
+  args?: Range
 ): Promise<QueryWithResults> {
   if (!db.contents || !db.contents.dbSchemeUri) {
     throw new Error(`Database ${db.databaseUri} does not have a CodeQL database scheme.`);