basic value support and tests

Author: fidgetingbits

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/nix/changeValue.yml

@@ -0,0 +1,37 @@
+languageId: nix
+command:
+  version: 6
+  spokenForm: change value
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: value}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |
+    {
+      foo = let
+        a = b;
+        c = d;
+      in
+        {
+          output = b;
+        };
+
+    }
+  selections:
+    - anchor: {line: 1, character: 7}
+      active: {line: 1, character: 7}
+  marks: {}
+finalState:
+  documentContents: |
+    {
+      foo = ;
+
+    }
+  selections:
+    - anchor: {line: 1, character: 8}
+      active: {line: 1, character: 8}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/nix/changeValue2.yml

@@ -0,0 +1,43 @@
+languageId: nix
+command:
+  version: 6
+  spokenForm: change value
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: value}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |
+    {
+      foo = let
+        a = b;
+        c = d;
+      in
+        {
+          output = b;
+        };
+
+    }
+  selections:
+    - anchor: {line: 2, character: 4}
+      active: {line: 2, character: 4}
+  marks: {}
+finalState:
+  documentContents: |
+    {
+      foo = let
+        a = ;
+        c = d;
+      in
+        {
+          output = b;
+        };
+
+    }
+  selections:
+    - anchor: {line: 2, character: 8}
+      active: {line: 2, character: 8}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/nix/changeValue3.yml

@@ -0,0 +1,37 @@
+languageId: nix
+command:
+  version: 6
+  spokenForm: change value
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: value}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |
+    {
+      foo = let
+        a = b;
+        c = d;
+      in
+        {
+          output = b;
+        };
+
+    }
+  selections:
+    - anchor: {line: 5, character: 5}
+      active: {line: 5, character: 5}
+  marks: {}
+finalState:
+  documentContents: |
+    {
+      foo = ;
+
+    }
+  selections:
+    - anchor: {line: 1, character: 8}
+      active: {line: 1, character: 8}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/nix/changeValue4.yml

@@ -0,0 +1,43 @@
+languageId: nix
+command:
+  version: 6
+  spokenForm: change value
+  action:
+    name: clearAndSetSelection
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: value}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |
+    {
+      foo = let
+        a = b;
+        c = d;
+      in
+        {
+          output = b;
+        };
+
+    }
+  selections:
+    - anchor: {line: 6, character: 13}
+      active: {line: 6, character: 13}
+  marks: {}
+finalState:
+  documentContents: |
+    {
+      foo = let
+        a = b;
+        c = d;
+      in
+        {
+          output = ;
+        };
+
+    }
+  selections:
+    - anchor: {line: 6, character: 15}
+      active: {line: 6, character: 15}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/nix/chuckValue.yml

@@ -0,0 +1,37 @@
+languageId: nix
+command:
+  version: 6
+  spokenForm: chuck value
+  action:
+    name: remove
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: value}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |
+    {
+      foo = let
+        a = b;
+        c = d;
+      in
+        {
+          output = b;
+        };
+
+    }
+  selections:
+    - anchor: {line: 1, character: 7}
+      active: {line: 1, character: 7}
+  marks: {}
+finalState:
+  documentContents: |
+    {
+      foo;
+
+    }
+  selections:
+    - anchor: {line: 1, character: 5}
+      active: {line: 1, character: 5}

packages/cursorless-vscode-e2e/src/suite/fixtures/recorded/languages/nix/chuckValue2.yml

@@ -0,0 +1,43 @@
+languageId: nix
+command:
+  version: 6
+  spokenForm: chuck value
+  action:
+    name: remove
+    target:
+      type: primitive
+      modifiers:
+        - type: containingScope
+          scopeType: {type: value}
+  usePrePhraseSnapshot: true
+initialState:
+  documentContents: |
+    {
+      foo = let
+        a = b;
+        c = d;
+      in
+        {
+          output = b;
+        };
+
+    }
+  selections:
+    - anchor: {line: 2, character: 4}
+      active: {line: 2, character: 4}
+  marks: {}
+finalState:
+  documentContents: |
+    {
+      foo = let
+        a;
+        c = d;
+      in
+        {
+          output = b;
+        };
+
+    }
+  selections:
+    - anchor: {line: 2, character: 4}
+      active: {line: 2, character: 4}

queries/nix.scm

@@ -21,7 +21,7 @@
 [
     (attrset_expression)
     (rec_attrset_expression)
-] @map @statement.iteration
+] @map @statement.iteration @value.iteration
 (binding_set) @map.iteration @list.iteration @ifStatement.iteration
 
 (source_code) @statement.iteration @map.iteration
@@ -34,7 +34,7 @@
 ;;!! in a + b
 (let_expression
     "let"
-    (_) @statement.iteration
+    (_) @statement.iteration @value.iteration
 )
 
 (string_expression
@@ -83,3 +83,13 @@
 (apply_expression) @functionCall
 (formals) @argumentOrParameter.iteration
 (formal) @argumentOrParameter
+
+;;!! a = 25;
+;;!      ^^
+;;!   xxxxx
+;;!  ------
+(binding
+    (_) @_.leading.start.endOf
+    .
+    expression: (_) @value @_.leading.end.startOf
+) @_.domain