Merge pull request #691 from Shopify/vs/support_selections_in_show_ast

Add selection support for show syntax tree

package.json

@@ -82,6 +82,12 @@
         "category": "Ruby LSP",
         "when": "editorActive && editorLangId == ruby"
       },
+      {
+        "command": "rubyLsp.rerunLastTest",
+        "title": "Re-run last test",
+        "category": "Ruby LSP",
+        "when": "editorActive && editorLangId == ruby"
+      },
       {
         "command": "rubyLsp.showSyntaxTree",
         "title": "Show syntax tree",

src/client.ts

@@ -10,6 +10,7 @@ import {
   Executable,
   RevealOutputChannelOn,
   CodeLens,
+  Range,
 } from "vscode-languageclient/node";
 
 import { Telemetry } from "./telemetry";
@@ -488,9 +489,36 @@ export default class Client implements ClientInterface {
         return;
       }
 
+      const selection = activeEditor.selection;
+      let range: Range | undefined;
+
+      // Anchor is the first point and active is the last point in the selection. If both are the same, nothing is
+      // selected
+      if (!selection.active.isEqual(selection.anchor)) {
+        // If you start selecting from below and go up, then the selection is reverted
+        if (selection.isReversed) {
+          range = Range.create(
+            selection.active.line,
+            selection.active.character,
+            selection.anchor.line,
+            selection.anchor.character,
+          );
+        } else {
+          range = Range.create(
+            selection.anchor.line,
+            selection.anchor.character,
+            selection.active.line,
+            selection.active.character,
+          );
+        }
+      }
+
       const response: SyntaxTreeResponse = await this.client.sendRequest(
         "rubyLsp/textDocument/showSyntaxTree",
-        { textDocument: { uri: activeEditor.document.uri.toString() } },
+        {
+          textDocument: { uri: activeEditor.document.uri.toString() },
+          range,
+        },
       );
 
       if (response) {

src/status.ts

@@ -24,6 +24,7 @@ export enum Command {
   RunTest = "rubyLsp.runTest",
   RunTestInTerminal = "rubyLsp.runTestInTerminal",
   DebugTest = "rubyLsp.debugTest",
+  RerunLastTest = "rubyLsp.rerunLastTest",
   OpenLink = "rubyLsp.openLink",
   ShowSyntaxTree = "rubyLsp.showSyntaxTree",
 }

src/testController.ts

@@ -80,6 +80,10 @@ export class TestController {
         Command.DebugTest,
         this.debugTest.bind(this),
       ),
+      vscode.commands.registerCommand(
+        Command.RerunLastTest,
+        this.rerunLastTest.bind(this),
+      ),
     );
   }
 
@@ -150,6 +154,10 @@ export class TestController {
     });
   }
 
+  private async rerunLastTest() {
+    // console.log("re-run!");
+  }
+
   private async runTestInTerminal(
     _path: string,
     _name: string,