fix(vscode): support CodeLens for very long route signatures (#1046)

Author: alestiago

extensions/vscode/src/code-lens/on-request-code-lens.ts

@@ -77,7 +77,7 @@ abstract class RegularExpressionCodeLensProvider extends ConfigurableCodeLensPro
 abstract class OnRequestCodeLensProvider extends RegularExpressionCodeLensProvider {
   readonly regex: RegExp =
     // eslint-disable-next-line max-len
-    /(Response|Future<Response>|FutureOr<Response>)\s*onRequest\(RequestContext .*?\)\s*(?:async)?\s*{/g;
+    /(Response|Future<Response>|FutureOr<Response>)\s*onRequest\(.*?/g;
 
   public provideCodeLenses(document: TextDocument): ProviderResult<CodeLens[]> {
     if (document.languageId !== "dart") {

extensions/vscode/src/test/suite/code-lens/on-request-code-lens.test.ts

@@ -65,6 +65,23 @@ Response notOnRequest(RequestContext context) {
 
 `;
 
+/**
+ * A very long dynamic route with multiple arguments.
+ */
+const longDynamicRouteContent = `
+import 'package:dart_frog/dart_frog.dart';
+
+Response onRequest(
+  RequestContext context,
+  String id1,
+  String id2,
+  String id3,
+) {
+  return Response(body: 'Welcome to Dart Frog!');
+}
+
+`;
+
 suite("RunOnRequestCodeLensProvider", () => {
   let vscodeStub: any;
   let utilsStub: any;
@@ -246,6 +263,33 @@ suite("RunOnRequestCodeLensProvider", () => {
       sinon.assert.match(codeLens, new CodeLens(range));
     });
 
+    test("returns the correct CodeLenses on a long dynamic route", async () => {
+      const content = longDynamicRouteContent;
+      const textDocument = await workspace.openTextDocument({
+        language: "text",
+        content,
+      });
+      document.getText = textDocument.getText.bind(textDocument);
+      document.positionAt = textDocument.positionAt.bind(textDocument);
+      document.lineAt = textDocument.lineAt.bind(textDocument);
+      document.getWordRangeAtPosition =
+        textDocument.getWordRangeAtPosition.bind(textDocument);
+
+      const provider = new RunOnRequestCodeLensProvider();
+      const result = await provider.provideCodeLenses(document);
+
+      assert.strictEqual(result.length, 1);
+
+      const codeLens = result[0];
+
+      const range = document.getWordRangeAtPosition(
+        new Position(3, 0),
+        provider.regex
+      )!;
+
+      sinon.assert.match(codeLens, new CodeLens(range));
+    });
+
     test("returns the correct CodeLenses on an async route", async () => {
       const content = asyncRouteContent;
       const textDocument = await workspace.openTextDocument({
@@ -555,6 +599,33 @@ suite("DebugOnRequestCodeLensProvider", () => {
       sinon.assert.match(codeLens, new CodeLens(range));
     });
 
+    test("returns the correct CodeLenses on a long dynamic route", async () => {
+      const content = longDynamicRouteContent;
+      const textDocument = await workspace.openTextDocument({
+        language: "text",
+        content,
+      });
+      document.getText = textDocument.getText.bind(textDocument);
+      document.positionAt = textDocument.positionAt.bind(textDocument);
+      document.lineAt = textDocument.lineAt.bind(textDocument);
+      document.getWordRangeAtPosition =
+        textDocument.getWordRangeAtPosition.bind(textDocument);
+
+      const provider = new DebugOnRequestCodeLensProvider();
+      const result = await provider.provideCodeLenses(document);
+
+      assert.strictEqual(result.length, 1);
+
+      const codeLens = result[0];
+
+      const range = document.getWordRangeAtPosition(
+        new Position(3, 0),
+        provider.regex
+      )!;
+
+      sinon.assert.match(codeLens, new CodeLens(range));
+    });
+
     test("returns no CodeLenses on a non route file", async () => {
       const content = invalidRouteContent;
       const textDocument = await workspace.openTextDocument({