Don't break jsx element text fragments

cursorless-dev · Jan 17, 2025 · 2d37e74 · 2d37e74
1 parent 6db1575
commit 2d37e74
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 2 deletions.
diff --git a/data/fixtures/scopes/javascriptreact/textFragment.element.scope b/data/fixtures/scopes/javascriptreact/textFragment.element.scope
@@ -0,0 +1,10 @@
+<div>text</div>
+---
+
+[Content] =
+[Removal] =
+[Domain] = 0:5-0:9
+       >----<
+0| <div>text</div>
+
+[Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/javascriptreact/textFragment.element2.scope b/data/fixtures/scopes/javascriptreact/textFragment.element2.scope
@@ -0,0 +1,10 @@
+<div>({value})</div>
+---
+
+[Content] =
+[Removal] =
+[Domain] = 0:5-0:14
+       >---------<
+0| <div>({value})</div>
+
+[Insertion delimiter] = " "
diff --git a/packages/common/src/scopeSupportFacets/javascriptreact.ts b/packages/common/src/scopeSupportFacets/javascriptreact.ts
@@ -7,4 +7,6 @@ const { supported, unsupported, notApplicable } = ScopeSupportFacetLevel;
 
 export const javascriptreactScopeSupport: LanguageScopeSupportFacetMap = {
   ...javascriptScopeSupport,
+
+  "textFragment.element": supported,
 };
diff --git a/packages/common/src/scopeSupportFacets/languageScopeSupport.ts b/packages/common/src/scopeSupportFacets/languageScopeSupport.ts
@@ -9,6 +9,7 @@ import { goScopeSupport } from "./go";
 import { htmlScopeSupport } from "./html";
 import { javaScopeSupport } from "./java";
 import { javascriptScopeSupport } from "./javascript";
+import { javascriptreactScopeSupport } from "./javascriptreact";
 import { jsonScopeSupport } from "./json";
 import { jsoncScopeSupport } from "./jsonc";
 import { jsonlScopeSupport } from "./jsonl";
@@ -41,7 +42,7 @@ export const languageScopeSupport: StringRecord<LanguageScopeSupportFacetMap> =
     html: htmlScopeSupport,
     java: javaScopeSupport,
     javascript: javascriptScopeSupport,
-    javascriptreact: javascriptScopeSupport,
+    javascriptreact: javascriptreactScopeSupport,
     json: jsonScopeSupport,
     jsonc: jsoncScopeSupport,
     jsonl: jsonlScopeSupport,

diff --git a/packages/common/src/scopeSupportFacets/scopeSupportFacetInfos.ts b/packages/common/src/scopeSupportFacets/scopeSupportFacetInfos.ts
@@ -292,6 +292,10 @@ export const scopeSupportFacetInfos: Record<
     description: "Text fragment consisting of a multi-line string",
     scopeType: "textFragment",
   },
+  "textFragment.element": {
+    description: "Text fragment consisting of an xml element interior",
+    scopeType: "textFragment",
+  },
 
   disqualifyDelimiter: {
     description:

diff --git a/packages/common/src/scopeSupportFacets/scopeSupportFacets.types.ts b/packages/common/src/scopeSupportFacets/scopeSupportFacets.types.ts
@@ -78,6 +78,7 @@ export const scopeSupportFacets = [
   "textFragment.comment.block",
   "textFragment.string.singleLine",
   "textFragment.string.multiLine",
+  "textFragment.element",
 
   "disqualifyDelimiter",
   "pairDelimiter",

diff --git a/queries/javascript.jsx.scm b/queries/javascript.jsx.scm
@@ -90,4 +90,9 @@
 
 ;;!! <div>text</div>
 ;;!       ^^^^
-(jsx_text) @textFragment
+;;!! <div>({})</div>
+;;!       ^^^^
+(
+  (jsx_element) @textFragment
+  (#child-range! @textFragment 0 -1 true true)
+)