Fixed bug with whitespace in copied code

AndreasArvidsson · AndreasArvidsson · commit 1e278984a4d0 · 2025-07-12T12:34:08.000+02:00
diff --git a/data/fixtures/scopes/csharp/name/name.field.class.scope b/data/fixtures/scopes/csharp/name/name.field.class.scope
@@ -43,8 +43,8 @@ class Foo {
          >-<
 1|     int bar;
 
-[#2 Domain] = 1:4-1:11
-      >-------<
+[#2 Domain] = 1:4-1:12
+      >--------<
 1|     int bar;
 
 [#2 Insertion delimiter] = " "
@@ -66,8 +66,8 @@ class Foo {
              >-<
 2|     int baz = 0;
 
-[#3 Domain] = 2:4-2:15
-      >-----------<
+[#3 Domain] = 2:4-2:16
+      >------------<
 2|     int baz = 0;
 
 [#3 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/csharp/name/name.field.interface.scope b/data/fixtures/scopes/csharp/name/name.field.interface.scope
@@ -41,8 +41,8 @@ interface IFoo {
          >-<
 1|     int bar;
 
-[#2 Domain] = 1:4-1:11
-      >-------<
+[#2 Domain] = 1:4-1:12
+      >--------<
 1|     int bar;
 
 [#2 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/csharp/name/name.variable.scope b/data/fixtures/scopes/csharp/name/name.variable.scope
@@ -17,8 +17,8 @@ int foo = 0;
          >-<
 0| int foo = 0;
 
-[Domain] = 0:0-0:11
-  >-----------<
+[Domain] = 0:0-0:12
+  >------------<
 0| int foo = 0;
 
 [Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/csharp/type/type.field.class.scope b/data/fixtures/scopes/csharp/type/type.field.class.scope
@@ -33,8 +33,8 @@ class Foo {
          >-<
 1|     int bar;
 
-[#2 Domain] = 1:4-1:11
-      >-------<
+[#2 Domain] = 1:4-1:12
+      >--------<
 1|     int bar;
 
 [#2 Insertion delimiter] = " "
@@ -56,8 +56,8 @@ class Foo {
          >-<
 2|     int baz = 0;
 
-[#3 Domain] = 2:4-2:15
-      >-----------<
+[#3 Domain] = 2:4-2:16
+      >------------<
 2|     int baz = 0;
 
 [#3 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/csharp/type/type.field.interface.scope b/data/fixtures/scopes/csharp/type/type.field.interface.scope
@@ -31,8 +31,8 @@ interface IFoo {
          >-<
 1|     int bar;
 
-[#2 Domain] = 1:4-1:11
-      >-------<
+[#2 Domain] = 1:4-1:12
+      >--------<
 1|     int bar;
 
 [#2 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/csharp/type/type.typeArgument.scope b/data/fixtures/scopes/csharp/type/type.typeArgument.scope
@@ -13,8 +13,8 @@ List<int> foo;
            >-<
 0| List<int> foo;
 
-[#1 Domain] = 0:0-0:13
-  >-------------<
+[#1 Domain] = 0:0-0:14
+  >--------------<
 0| List<int> foo;
 
 [#1 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/csharp/type/type.variable.scope b/data/fixtures/scopes/csharp/type/type.variable.scope
@@ -13,8 +13,8 @@ int foo;
      >-<
 0| int foo;
 
-[Domain] = 0:0-0:7
-  >-------<
+[Domain] = 0:0-0:8
+  >--------<
 0| int foo;
 
 [Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/csharp/type/type.variable2.scope b/data/fixtures/scopes/csharp/type/type.variable2.scope
@@ -13,8 +13,8 @@ int foo = 0;
      >-<
 0| int foo = 0;
 
-[Domain] = 0:0-0:11
-  >-----------<
+[Domain] = 0:0-0:12
+  >------------<
 0| int foo = 0;
 
 [Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/csharp/value/value.field.class.scope b/data/fixtures/scopes/csharp/value/value.field.class.scope
@@ -15,8 +15,8 @@ class Foo {
              >---<
 1|     int bar = 0;
 
-[Domain] = 1:4-1:15
-      >-----------<
+[Domain] = 1:4-1:16
+      >------------<
 1|     int bar = 0;
 
 [Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/csharp/value/value.mapPair.iteration.scope b/data/fixtures/scopes/csharp/value/value.mapPair.iteration.scope
@@ -1,13 +1,13 @@
-new Foo {aaa = 0, bbb = 0};
+new Foo {aaa = 0, bbb = 1};
 ---
 
 [#1 Content] =
 [#1 Domain] = 0:0-0:27
   >---------------------------<
-0| new Foo {aaa = 0, bbb = 0};
+0| new Foo {aaa = 0, bbb = 1};
 
 
 [#2 Content] =
 [#2 Domain] = 0:9-0:25
            >----------------<
-0| new Foo {aaa = 0, bbb = 0};
+0| new Foo {aaa = 0, bbb = 1};
diff --git a/data/fixtures/scopes/csharp/value/value.mapPair.scope b/data/fixtures/scopes/csharp/value/value.mapPair.scope
@@ -1,39 +1,39 @@
-new Foo {aaa = 0, bbb = 0};
+new Foo {aaa = 0, bbb = 1};
 ---
 
 [#1 Content] = 0:15-0:16
                  >-<
-0| new Foo {aaa = 0, bbb = 0};
+0| new Foo {aaa = 0, bbb = 1};
 
 [#1 Removal] = 0:12-0:16
               >----<
-0| new Foo {aaa = 0, bbb = 0};
+0| new Foo {aaa = 0, bbb = 1};
 
 [#1 Leading delimiter] = 0:12-0:15
               >---<
-0| new Foo {aaa = 0, bbb = 0};
+0| new Foo {aaa = 0, bbb = 1};
 
 [#1 Domain] = 0:9-0:16
            >-------<
-0| new Foo {aaa = 0, bbb = 0};
+0| new Foo {aaa = 0, bbb = 1};
 
 [#1 Insertion delimiter] = " "
 
 
 [#2 Content] = 0:24-0:25
                           >-<
-0| new Foo {aaa = 0, bbb = 0};
+0| new Foo {aaa = 0, bbb = 1};
 
 [#2 Removal] = 0:21-0:25
                        >----<
-0| new Foo {aaa = 0, bbb = 0};
+0| new Foo {aaa = 0, bbb = 1};
 
 [#2 Leading delimiter] = 0:21-0:24
                        >---<
-0| new Foo {aaa = 0, bbb = 0};
+0| new Foo {aaa = 0, bbb = 1};
 
 [#2 Domain] = 0:18-0:25
                     >-------<
-0| new Foo {aaa = 0, bbb = 0};
+0| new Foo {aaa = 0, bbb = 1};
 
 [#2 Insertion delimiter] = " "
diff --git a/data/fixtures/scopes/csharp/value/value.variable.scope b/data/fixtures/scopes/csharp/value/value.variable.scope
@@ -13,8 +13,8 @@ int foo = 0;
          >---<
 0| int foo = 0;
 
-[Domain] = 0:0-0:11
-  >-----------<
+[Domain] = 0:0-0:12
+  >------------<
 0| int foo = 0;
 
 [Insertion delimiter] = " "
diff --git a/packages/cursorless-org-docs/src/docs/components/Code.tsx b/packages/cursorless-org-docs/src/docs/components/Code.tsx
@@ -24,10 +24,10 @@ export function Code({
   const [copied, setCopied] = useState(false);
 
   useEffect(() => {
-    if (renderWhitespace) {
-      children = children.replaceAll(" ", "␣").replaceAll("\t", "⭾");
-    }
-    codeToHtml(children, {
+    const code = renderWhitespace
+      ? children.replaceAll(" ", "␣").replaceAll("\t", "⭾")
+      : children;
+    codeToHtml(code, {
       lang: getFallbackLanguage(languageId),
       theme: "nord",
       decorations,
diff --git a/queries/csharp.scm b/queries/csharp.scm
@@ -428,40 +428,29 @@
 
 ;;!! String aaa;
 ;;!         ^^^
-(variable_declaration
-  (variable_declarator
-    (identifier) @name
+(_
+  (variable_declaration
+    type: (_) @type
+    (variable_declarator
+      (identifier) @name
+    )
   )
 ) @_.domain
 
 ;;!! String aaa = "bbb";
 ;;!         ^^^
-(variable_declaration
-  (variable_declarator
-    (identifier) @name @value.leading.endOf
-    (equals_value_clause
-      (_) @value
+(_
+  (variable_declaration
+    type: (_) @type
+    (variable_declarator
+      (identifier) @name @value.leading.endOf
+      (equals_value_clause
+        (_) @value
+      )
     )
   )
 ) @_.domain
 
-(
-  (variable_declarator
-    (identifier) @name
-  ) @_.domain
-  (#not-parent-type? @_.domain variable_declaration)
-)
-
-(
-  (variable_declarator
-    (identifier) @name @value.leading.endOf
-    (equals_value_clause
-      (_) @value
-    )
-  ) @_.domain
-  (#not-parent-type? @_.domain variable_declaration)
-)
-
 ;;!! aaa = "bbb";
 ;;!  ^^^
 ;;!! foo = 2;
@@ -480,7 +469,7 @@
   (_
     type: (_) @type
   ) @_.domain
-  (#not-type? @_.domain catch_declaration cast_expression)
+  (#not-type? @_.domain catch_declaration cast_expression variable_declaration)
 )
 
 ;;!! (int)5.5;
