fix: correctly expand selections containing arrow functions

1nVitr0 · Jan 8, 2024 · 423a3f6 · 423a3f6
1 parent 82048de
commit 423a3f6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -23,7 +23,7 @@
         "--extensionTestsPath=${workspaceFolder}/out/test/suite/index"
       ],
       "outFiles": ["${workspaceFolder}/out/test/**/*.js"],
-      "preLaunchTask": "npm: watch"
+      "preLaunchTask": "npm: test-watch"
     }
   ]
 }
diff --git a/src/providers/ConfigurationProvider.ts b/src/providers/ConfigurationProvider.ts
@@ -13,7 +13,7 @@ const defaultFoldingMarkers: FoldingMarkerList<FoldingMarkerDefault> = {
   "()": { start: "\\(", end: "\\)" },
   "[]": { start: "\\[", end: "\\]" },
   "{}": { start: "\\{", end: "\\}" },
-  "<>": { start: "<", end: ">" },
+  "<>": { start: "<", end: "(?<!\\=)>" },
 };
 
 const defaultCompleteBlockMarkers = ["\\}", "<\\/[a-zA-Z0-9\\-_=\\s]+"];

diff --git a/src/test/fixtures/expand.ts b/src/test/fixtures/expand.ts
@@ -5,7 +5,7 @@ export const expandTests: RangeTest[] = [
   {
     file: "expand.typescript.fixture",
     ranges: [new Range(3, 9, 3, 9), new Range(22, 0, 24, 0), new Range(30, 2, 30, 2)],
-    targetRanges: [new Range(3, 0, 16, 20), new Range(22, 0, 26, 3), new Range(30, 0, 36, 63)],
+    targetRanges: [new Range(3, 0, 16, 20), new Range(22, 0, 26, 3), new Range(30, 0, 36, 62)],
   },
   {
     file: "expand.cpp.fixture",

diff --git a/test/fixtures/expand.typescript.fixture b/test/fixtures/expand.typescript.fixture
@@ -34,5 +34,5 @@ class Test2 {
   arrowFunction: () => {
     return 2
   },
-  functionCall: myFunction({ object: (t: unknown) => 'prop' }),
+  functionCall: myFunction({ object: (t: unknown) => 'prop' })
 }