Added text based item scope

src/languages/cpp.ts

@@ -113,7 +113,6 @@ const nodeMatchers: Partial<
     ],
     [":", "=", "+=", "-=", "*=", "/=", "%=", "&=", "|=", "^=", "<<=", ">>="]
   ),
-  collectionItem: argumentMatcher("initializer_list"),
   argumentOrParameter: argumentMatcher("parameter_list", "argument_list"),
   attribute: "attribute",
 };

src/languages/csharp.ts

@@ -16,69 +16,6 @@ import { nodeFinder, typedNodeFinder } from "../util/nodeFinders";
 import { delimitedSelector, childRangeSelector } from "../util/nodeSelectors";
 import { patternFinder } from "../util/nodeFinders";
 
-// Generated by the following command:
-// > curl https://github.com/raw/tree-sitter/tree-sitter-c-sharp/master/src/node-types.json \
-//   | jq '.[] | select(.type == "_expression") | [.subtypes[].type]'
-const EXPRESSION_TYPES = [
-  "anonymous_method_expression",
-  "anonymous_object_creation_expression",
-  "array_creation_expression",
-  "as_expression",
-  "assignment_expression",
-  "await_expression",
-  "base_expression",
-  "binary_expression",
-  "boolean_literal",
-  "cast_expression",
-  "character_literal",
-  "checked_expression",
-  "conditional_access_expression",
-  "conditional_expression",
-  "default_expression",
-  "element_access_expression",
-  "element_binding_expression",
-  "generic_name",
-  "global",
-  "identifier",
-  "implicit_array_creation_expression",
-  "implicit_object_creation_expression",
-  "implicit_stack_alloc_array_creation_expression",
-  "initializer_expression",
-  "integer_literal",
-  "interpolated_string_expression",
-  "invocation_expression",
-  "is_expression",
-  "is_pattern_expression",
-  "lambda_expression",
-  "make_ref_expression",
-  "member_access_expression",
-  "null_literal",
-  "object_creation_expression",
-  "parenthesized_expression",
-  "postfix_unary_expression",
-  "prefix_unary_expression",
-  "query_expression",
-  "range_expression",
-  "real_literal",
-  "ref_expression",
-  "ref_type_expression",
-  "ref_value_expression",
-  "size_of_expression",
-  "stack_alloc_array_creation_expression",
-  "string_literal",
-  "switch_expression",
-  "this_expression",
-  "throw_expression",
-  "tuple_expression",
-  "type_of_expression",
-  "verbatim_string_literal",
-  "with_expression",
-];
-
-function isExpression(node: SyntaxNode) {
-  return EXPRESSION_TYPES.includes(node.type);
-}
-
 // Generated by the following command:
 // > curl https://github.com/raw/tree-sitter/tree-sitter-c-sharp/master/src/node-types.json \
 //   | jq '.[] | select(.type == "_statement" or .type == "_declaration") | [.subtypes[].type]'
@@ -197,23 +134,6 @@ const getMapMatchers = {
       (node: SyntaxNode) => node.childForFieldName("initializer"),
     ])
   ),
-  collectionItem: matcher(
-    nodeFinder(
-      (node) =>
-        (node.parent?.type === "initializer_expression" &&
-          isExpression(node)) ||
-        node.type === "assignment_expression"
-    ),
-    delimitedSelector(
-      (node) =>
-        node.type === "," ||
-        node.type === "[" ||
-        node.type === "]" ||
-        node.type === "}" ||
-        node.type === "{",
-      ", "
-    )
-  ),
   string: typeMatcher("string_literal"),
 };
 

src/languages/go.ts

@@ -64,7 +64,6 @@ const nodeMatchers: Partial<
     patternMatcher("parameter_declaration"),
     patternMatcher("argument_declaration")
   ),
-  collectionItem: ["keyed_element", "element"],
   collectionKey: "keyed_element[0]",
   value: cascadingMatcher(
     patternMatcher("keyed_element[1]"),

src/languages/java.ts

@@ -110,7 +110,6 @@ const nodeMatchers: Partial<
     ["=", "+=", "-=", "*=", "/=", "%=", "&=", "|=", "^=", "<<=", ">>="]
   ),
   condition: conditionMatcher("*[condition]"),
-  collectionItem: argumentMatcher("array_initializer"),
   argumentOrParameter: argumentMatcher("formal_parameters", "argument_list"),
 };
 

src/languages/json.ts

@@ -1,12 +1,11 @@
+import { SyntaxNode } from "web-tree-sitter";
+import { SimpleScopeTypeType } from "../typings/targetDescriptor.types";
+import { NodeMatcherAlternative, SelectionWithEditor } from "../typings/Types";
 import {
   createPatternMatchers,
-  argumentMatcher,
   leadingMatcher,
   trailingMatcher,
 } from "../util/nodeMatchers";
-import { NodeMatcherAlternative, SelectionWithEditor } from "../typings/Types";
-import { SimpleScopeTypeType } from "../typings/targetDescriptor.types";
-import { SyntaxNode } from "web-tree-sitter";
 import { getNodeRange } from "../util/nodeSelectors";
 
 const nodeMatchers: Partial<
@@ -17,7 +16,6 @@ const nodeMatchers: Partial<
   string: "string",
   collectionKey: trailingMatcher(["pair[key]"], [":"]),
   value: leadingMatcher(["*[value]"], [":"]),
-  collectionItem: argumentMatcher("object", "array"),
 };
 
 export const patternMatchers = createPatternMatchers(nodeMatchers);

src/languages/php.ts

@@ -145,7 +145,6 @@ const nodeMatchers: Partial<
   ),
 
   collectionKey: trailingMatcher(["array_element_initializer[0]"], ["=>"]),
-  collectionItem: argumentMatcher("array_creation_expression"),
 
   argumentOrParameter: argumentMatcher("arguments", "formal_parameters"),
 };

src/languages/python.ts

@@ -1,18 +1,22 @@
+import { Selection } from "vscode";
 import { SyntaxNode } from "web-tree-sitter";
+import { SimpleScopeTypeType } from "../typings/targetDescriptor.types";
+import { NodeFinder, NodeMatcherAlternative } from "../typings/Types";
+import { argumentNodeFinder, patternFinder } from "../util/nodeFinders";
 import {
-  createPatternMatchers,
   argumentMatcher,
-  leadingMatcher,
-  trailingMatcher,
   cascadingMatcher,
-  patternMatcher,
   conditionMatcher,
+  createPatternMatchers,
+  leadingMatcher,
   matcher,
+  patternMatcher,
+  trailingMatcher,
 } from "../util/nodeMatchers";
-import { patternFinder } from "../util/nodeFinders";
-import { NodeMatcherAlternative } from "../typings/Types";
-import { SimpleScopeTypeType } from "../typings/targetDescriptor.types";
-import { childRangeSelector } from "../util/nodeSelectors";
+import {
+  argumentSelectionExtractor,
+  childRangeSelector,
+} from "../util/nodeSelectors";
 
 // Generated by the following command:
 // > curl https://github.com/raw/tree-sitter/tree-sitter-python/d6210ceab11e8d812d4ab59c07c81458ec6e5184/src/node-types.json \
@@ -49,13 +53,28 @@ export const getTypeNode = (node: SyntaxNode) =>
 const dictionaryTypes = ["dictionary", "dictionary_comprehension"];
 const listTypes = ["list", "list_comprehension", "set"];
 
+function importNodeFinder(): NodeFinder {
+  const finder = argumentNodeFinder("import_from_statement");
+  return (node: SyntaxNode, selection?: Selection) => {
+    const childNode = finder(node, selection);
+    if (
+      childNode?.type !== "dotted_name" ||
+      childNode?.id === childNode?.parent?.namedChildren[0].id
+    ) {
+      return null;
+    }
+    return childNode;
+  };
+}
+
 const nodeMatchers: Partial<
   Record<SimpleScopeTypeType, NodeMatcherAlternative>
 > = {
   map: dictionaryTypes,
   list: listTypes,
   statement: STATEMENT_TYPES,
   string: "string",
+  collectionItem: matcher(importNodeFinder(), argumentSelectionExtractor()),
   collectionKey: trailingMatcher(["pair[key]"], [":"]),
   ifStatement: "if_statement",
   anonymousFunction: "lambda?.lambda",
@@ -78,7 +97,6 @@ const nodeMatchers: Partial<
     "parameters.identifier!",
     "*[name]",
   ],
-  collectionItem: argumentMatcher(...dictionaryTypes, ...listTypes),
   value: cascadingMatcher(
     leadingMatcher(
       ["assignment[right]", "augmented_assignment[right]", "~subscript[value]"],

src/languages/typescript.ts

@@ -173,7 +173,6 @@ const nodeMatchers: Partial<
     ],
     [":"]
   ),
-  collectionItem: argumentMatcher(...mapTypes, ...listTypes),
   value: cascadingMatcher(
     valueMatcher(),
     patternMatcher("return_statement.~return!"),

src/processTargets/getModifierStage.ts

@@ -10,6 +10,7 @@ import {
   ExcludeInteriorStage,
   InteriorOnlyStage,
 } from "./modifiers/InteriorStage";
+import ItemStage from "./modifiers/ItemStage";
 import { LeadingStage, TrailingStage } from "./modifiers/LeadingTrailingStages";
 import ModifyIfWeakStage from "./modifiers/ModifyIfWeakStage";
 import OrdinalRangeSubTokenStage, {
@@ -98,6 +99,8 @@ const getContainingScopeStage = (
       );
     case "url":
       return new UrlStage(modifier as UrlModifier);
+    case "collectionItem":
+      return new ItemStage(modifier);
     case "surroundingPair":
       return new SurroundingPairStage(
         modifier as ContainingSurroundingPairModifier