` tag, the angle
- // brackets of the tag are also a surrounding pair which should have
- // lower priority.
- if (this.scopeType.explicitScopeType) {
- if (languageScopeHandler == null) {
- return pairScopeHandler;
- }
- return FallbackScopeHandler.createFromScopeHandlers([
- languageScopeHandler,
- pairScopeHandler,
- ]);
- }
-
- if (languageScopeHandler == null) {
- return pairScopeHandler;
+ yield createScope(scope);
}
-
- return SortedScopeHandler.createFromScopeHandlers(
- this.scopeHandlerFactory,
- this.languageId,
- [pairScopeHandler, languageScopeHandler],
- );
- }
-
- private shouldYield(targetDomain: Range, scope: TargetScope): boolean {
- // For an explicit scope type we only yield scopes that are contained within
- // the target domain. For example, if the user said "inside token", we don't
- // want to yield scopes that are larger than the token.
- return (
- !this.scopeType.explicitScopeType || targetDomain.contains(scope.domain)
- );
}
}
-function createInteriorScope(scope: TargetScope): TargetScope {
+function createScope(scope: TargetScope): TargetScope {
return {
editor: scope.editor,
domain: scope.domain,
getTargets(isReversed) {
- return scope.getTargets(isReversed).flatMap(createInteriorTargets);
+ return scope.getTargets(isReversed).map(createInteriorTarget);
},
};
}
-function createInteriorTargets(target: Target): Target[] {
- const interior = target.getInterior();
- if (interior != null) {
- return interior;
- }
- return [
- new InteriorTarget({
- editor: target.editor,
- isReversed: target.isReversed,
- fullInteriorRange: target.contentRange,
- }),
- ];
+function createInteriorTarget(target: Target): InteriorTarget {
+ return new InteriorTarget({
+ editor: target.editor,
+ isReversed: target.isReversed,
+ fullInteriorRange: target.contentRange,
+ });
}
diff --git a/packages/cursorless-engine/src/processTargets/targets/SurroundingPairTarget.ts b/packages/cursorless-engine/src/processTargets/targets/SurroundingPairTarget.ts
index cb412b84ff..a1f24e658b 100644
--- a/packages/cursorless-engine/src/processTargets/targets/SurroundingPairTarget.ts
+++ b/packages/cursorless-engine/src/processTargets/targets/SurroundingPairTarget.ts
@@ -41,9 +41,11 @@ export class SurroundingPairTarget extends BaseTarget
diff --git a/queries/c.scm b/queries/c.scm
index 71e3d54b3e..627104e13d 100644
--- a/queries/c.scm
+++ b/queries/c.scm
@@ -46,6 +46,15 @@
(#document-range! @name.iteration @value.iteration @type.iteration)
)
+;;!! { }
+;;! ^
+(_
+ .
+ "{" @interior.start.endOf
+ "}" @interior.end.startOf
+ .
+)
+
;;!! struct Foo { };
;;! ^
;;!! union Foo { };
@@ -84,10 +93,6 @@
(_
(_
name: (_) @name
- body: (_
- "{" @interior.start.endOf
- "}" @interior.end.startOf
- )
) @_.domain.start @class.start @type.start
.
";"? @_.domain.end @class.end @type.end
@@ -108,12 +113,7 @@
;;!! typedef union {} foo;
;;!! typedef enum {} foo;
(type_definition
- type: (_
- body: (_
- "{" @interior.start.endOf
- "}" @interior.end.startOf
- )
- ) @_dummy
+ type: (_) @_dummy
declarator: (type_identifier) @name
(#type? @_dummy struct_specifier union_specifier enum_specifier)
) @_.domain @class @type
@@ -166,15 +166,6 @@
)
) @namedFunction @name.domain
-;;!! void foo() { }
-;;! ^
-(function_definition
- body: (_
- "{" @interior.start.endOf
- "}" @interior.end.startOf
- )
-) @_.domain
-
;;!! int aaa;
;;! ^^^
(field_declaration
@@ -312,12 +303,9 @@
;;! ^^^^^^^^
(
(if_statement
- "if" @branch.start @branch.removal.start @interior.domain.start
+ "if" @branch.start @branch.removal.start
condition: (_) @condition
- consequence: (_
- "{" @interior.start.endOf
- "}" @interior.end.startOf
- ) @branch.end @branch.removal.end @interior.domain.end
+ consequence: (_) @branch.end @branch.removal.end
alternative: (else_clause
(if_statement)? @branch.removal.end.startOf
)? @branch.removal.end.startOf
@@ -329,13 +317,10 @@
;;!! else if () {}
;;! ^^^^^^^^^^^^^
(else_clause
- "else" @branch.start @condition.domain.start @interior.domain.start
+ "else" @branch.start @condition.domain.start
(if_statement
condition: (_) @condition
- consequence: (_
- "{" @interior.start.endOf
- "}" @interior.end.startOf
- ) @branch.end @condition.domain.end @interior.domain.end
+ consequence: (_) @branch.end @condition.domain.end
(#child-range! @condition 0 -1 true true)
)
)
@@ -344,11 +329,8 @@
;;! ^^^^^^^
(if_statement
(else_clause
- (compound_statement
- "{" @interior.start.endOf
- "}" @interior.end.startOf
- )
- ) @branch @interior.domain
+ (compound_statement)
+ ) @branch
)
;;!! for (int i = 0; i < size; ++i) {}
@@ -356,10 +338,6 @@
;;! ^^^^^^^^
(for_statement
condition: (_) @condition
- body: (_
- "{" @interior.start.endOf
- "}" @interior.end.startOf
- )
) @branch @_.domain
;;!! while (true) {}
@@ -367,10 +345,6 @@
;;! ^^^^
(while_statement
condition: (_) @condition
- body: (_
- "{" @interior.start.endOf
- "}" @interior.end.startOf
- )
(#child-range! @condition 0 -1 true true)
) @branch @_.domain
@@ -378,10 +352,6 @@
;;! ^^^^^^^^^^^^^^^^^^^
;;! ^^^^
(do_statement
- body: (_
- "{" @interior.start.endOf
- "}" @interior.end.startOf
- )
condition: (_) @condition
(#child-range! @condition 0 -1 true true)
) @branch @_.domain
@@ -394,42 +364,29 @@
")" @value.end.startOf
)
body: (_
- "{" @branch.iteration.start.endOf @condition.iteration.start.endOf @interior.start.endOf
- "}" @branch.iteration.end.startOf @condition.iteration.end.startOf @interior.end.startOf
+ "{" @branch.iteration.start.endOf @condition.iteration.start.endOf
+ "}" @branch.iteration.end.startOf @condition.iteration.end.startOf
)
) @_.domain @branch.iteration.domain @condition.iteration.domain
;;!! case 0: break;
;;! ^^^^^^^^^^^^^^
+(case_statement) @branch
+
+;;!! case 0: break;
;;! ^
(case_statement
value: (_) @condition
- .
- (_) @interior.start
- (_)? @interior.end
- .
- (#not-type? @interior.start "compound_statement")
-) @branch @_.domain
+) @condition.domain
-;;!! default: break;
-;;! ^^^^^^^^^^^^^^;
+;;!! case 0: break;
+;;! ^^^^^^^
(case_statement
- !value
+ ":" @interior.start.endOf
.
- (_) @interior.start
- (_)? @interior.end
- .
- (#not-type? @interior.start "compound_statement")
-) @branch @_.domain
-
-;;!! case 0: { }
-;;! ^
-(case_statement
- (compound_statement
- "{" @interior.start.endOf
- "}" @interior.end.startOf
- )
-) @branch @_.domain
+ (_) @_dummy
+ (#not-type? @_dummy compound_statement)
+) @interior.end.endOf
;;!! true ? 0 : 1
;;! ^^^^
diff --git a/queries/cpp.scm b/queries/cpp.scm
index 2b1bf3f7c1..86fea784a1 100644
--- a/queries/cpp.scm
+++ b/queries/cpp.scm
@@ -19,10 +19,6 @@
(_
(class_specifier
name: (_) @name
- body: (_
- "{" @interior.start.endOf
- "}" @interior.end.startOf
- )
) @_.domain.start @class.start @type.start
.
";"? @_.domain.end @class.end @type.end
@@ -40,10 +36,6 @@
;;!! namespace NS { }
(namespace_definition
name: (_) @name
- body: (_
- "{" @interior.start.endOf
- "}" @interior.end.startOf
- )
) @_.domain
(field_declaration_list
@@ -60,12 +52,7 @@
;;!! []() {}
;;! ^^^^^^^
-(lambda_expression
- body: (_
- "{" @interior.start.endOf
- "}" @interior.end.startOf
- )
-) @anonymousFunction @interior.domain
+(lambda_expression) @anonymousFunction
;;!! [[attribute]]
;;! ^^^^^^^^^
@@ -96,20 +83,12 @@
;;!! try {}
;;! ^^^^^^
(try_statement
- "try" @branch.start @interior.domain.start
- body: (_
- "{" @interior.start.endOf
- "}" @interior.end.startOf
- ) @branch.end @interior.domain.end
+ "try" @branch.start
+ body: (_) @branch.end
) @branch.iteration
;;!! catch (const std::exception e) {}
-(catch_clause
- body: (_
- "{" @interior.start.endOf
- "}" @interior.end.startOf
- )
-) @branch @interior.domain
+(catch_clause) @branch
;;!! new Foo()
;;! ^^^^^^^^^
@@ -146,10 +125,6 @@
(for_range_loop
declarator: (_) @name
right: (_) @value
- body: (_
- "{" @interior.start.endOf
- "}" @interior.end.startOf
- )
) @_.domain
(trailing_return_type
diff --git a/queries/csharp.scm b/queries/csharp.scm
index 20dea66899..d6f6d87978 100644
--- a/queries/csharp.scm
+++ b/queries/csharp.scm
@@ -72,14 +72,13 @@
"}" @statement.iteration.end.startOf
)
-(
- (_
- (block
- "{" @interior.start.endOf
- "}" @interior.end.startOf
- )
- ) @_.domain
- (#not-type? @_.domain try_statement if_statement)
+;;!! { }
+;;! ^
+(_
+ .
+ "{" @interior.start.endOf
+ "}" @interior.end.startOf
+ .
)
;;!! if () {} else {}
@@ -101,47 +100,28 @@
(#not-parent-type? @condition.domain if_statement)
)
-(
- (if_statement
- consequence: (_
- "{" @interior.start.endOf
- "}" @interior.end.startOf
- ) @interior.domain.end.endOf
- ) @interior.domain.start.startOf
- (#not-parent-type? @interior.domain.start.startOf if_statement)
-)
-
;;!! else if () {}
;;! ^^^^^^^^^^^^^
(if_statement
- "else" @branch.start.startOf @interior.domain.start.startOf @condition.domain.start.startOf
+ "else" @branch.start.startOf @condition.domain.start.startOf
(if_statement
condition: (_) @condition
- consequence: (_
- "{" @interior.start.endOf
- "}" @interior.end.startOf
- ) @branch.end.endOf @interior.domain.end.endOf @condition.domain.end.endOf
+ consequence: (_) @branch.end.endOf @condition.domain.end.endOf
)
)
;;!! else {}
;;! ^^^^^^^
(if_statement
- "else" @branch.start @interior.domain.start.startOf
- alternative: (block
- "{" @interior.start.endOf
- "}" @interior.end.startOf
- ) @branch.end @interior.domain.end.endOf
+ "else" @branch.start
+ alternative: (block) @branch.end
)
;;!! try () {}
;;! ^^^^^^^^^
(try_statement
- body: (_
- "{" @interior.start.endOf
- "}" @interior.end.startOf
- ) @branch.end.endOf @interior.domain.end.endOf
-) @branch.start.startOf @interior.domain.start.startOf
+ body: (_) @branch.end.endOf
+) @branch.start.startOf
;;!! catch () {}
;;! ^^^^^^^^^^^
@@ -149,12 +129,7 @@
;;!! finally {}
;;! ^^^^^^^^^^
-(finally_clause
- (block
- "{" @interior.start.endOf
- "}" @interior.end.startOf
- )
-) @branch @interior.domain
+(finally_clause) @branch
;;!! try () {} catch () {} finally {}
;;! ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -189,10 +164,6 @@
;;! ^^^^^^^^^^^^
(class_declaration
name: (identifier) @name
- body: (_
- "{" @interior.start.endOf
- "}" @interior.end.startOf
- )
) @class @type @_.domain
(class_declaration
@@ -211,12 +182,7 @@
;;!! interface IFoo {}
;;! ^^^^^^^^^^^^^^^^^
-(interface_declaration
- body: (_
- "{" @interior.start.endOf
- "}" @interior.end.startOf
- )
-) @type @interior.domain
+(interface_declaration) @type
(interface_declaration
body: (_
@@ -303,44 +269,31 @@
"new" @functionCallee.start
type: (_) @functionCallee.end
)
-] @_.domain
-
-;;!! switch(value) { }
-;;! ^
-(switch_statement
- (switch_body
- "{" @interior.start.endOf
- "}" @interior.end.startOf
- )
-) @_.domain
+] @functionCallee.domain
(switch_statement
(tuple_expression) @value
-) @_.domain
+) @value.domain
(switch_statement
value: (_) @value
-) @_.domain
+) @value.domain
(_
condition: (_) @condition
(#not-parent-type? @condition if_statement)
-) @_.domain
+) @condition.domain
(while_statement
.
(_) @condition
-) @_.domain
+) @condition.domain
(do_statement
- (block
- "{" @interior.start.endOf
- "}" @interior.end.startOf
- )
"while"
.
(_) @condition
-) @_.domain
+) @condition.domain
;;!! case 0: break;
;;! ^^^^^^^^^^^^^^
@@ -353,30 +306,19 @@
.
(_) @condition
)
-) @_.domain
+) @condition.domain
;;!! default: break;
-;;! ^^^^^^
+;;! ^^^^^^^
(switch_section
[
(case_switch_label)
(default_switch_label)
- ]
+ ] @interior.start.endOf
.
- (_) @interior.start
- (_)? @interior.end
- .
- (#not-type? @interior.start "block")
-) @_.domain
-
-;;!! case 0: { }
-;;! ^
-(switch_section
- (block
- "{" @interior.start.endOf
- "}" @interior.end.startOf
- )
-) @_.domain
+ (_) @_dummy
+ (#not-type? @_dummy block)
+) @interior.end.endOf
(switch_statement
body: (switch_body
@@ -480,10 +422,10 @@
;;!! enum Foo {}
(enum_declaration
body: (_
- "{" @interior.start.endOf @name.iteration.start.endOf @value.iteration.start.endOf
- "}" @interior.end.startOf @name.iteration.end.startOf @value.iteration.end.startOf
+ "{" @name.iteration.start.endOf @value.iteration.start.endOf
+ "}" @name.iteration.end.startOf @value.iteration.end.startOf
)
-) @type @interior.domain
+) @type
;;!! bar = 0
;;! ^
diff --git a/queries/go.scm b/queries/go.scm
index 7cb7da5335..1a57ed82a8 100644
--- a/queries/go.scm
+++ b/queries/go.scm
@@ -31,6 +31,15 @@
(var_declaration)
] @statement
+;;!! { }
+;;! ^
+(_
+ .
+ "{" @interior.start.endOf
+ "}" @interior.end.startOf
+ .
+)
+
(
(interpreted_string_literal) @string @textFragment
(#child-range! @textFragment 0 -1 true true)
@@ -200,35 +209,16 @@
;; func foo()
(function_declaration
name: (_) @name
- body: (block
- .
- "{" @interior.start.endOf
- "}" @interior.end.startOf
- .
- )?
-) @namedFunction @_.domain
+) @namedFunction @name.domain
;; method declaration
;; func (X) foo() {}
(method_declaration
name: (_) @name
- body: (block
- .
- "{" @interior.start.endOf
- "}" @interior.end.startOf
- .
- )
-) @namedFunction @_.domain
+) @namedFunction @name.domain
;; func literal
-(func_literal
- body: (block
- .
- "{" @interior.start.endOf
- "}" @interior.end.startOf
- .
- )
-) @anonymousFunction @namedFunction @interior.domain
+(func_literal) @anonymousFunction @namedFunction
;; switch-based branch
diff --git a/queries/html.scm b/queries/html.scm
index 3559b325dc..d9bb38df44 100644
--- a/queries/html.scm
+++ b/queries/html.scm
@@ -70,7 +70,7 @@
(_
(start_tag) @interior.start.endOf
(end_tag) @interior.end.startOf
-) @xmlElement @interior.domain
+) @xmlElement
;;!!
text
;;! ^^^^^ ^^^^^^
diff --git a/queries/java.scm b/queries/java.scm
index 5630223dd7..1a898680dc 100644
--- a/queries/java.scm
+++ b/queries/java.scm
@@ -5,7 +5,6 @@
[
(annotation_type_declaration)
(class_declaration)
- (enum_declaration)
(import_declaration)
(interface_declaration)
(module_declaration)
@@ -13,7 +12,6 @@
(assert_statement)
(break_statement)
(continue_statement)
- (declaration)
(do_statement)
(enhanced_for_statement)
(expression_statement)
@@ -38,9 +36,11 @@
;; exceptions
;; ";",
;; "block",
+ ;; (declaration) ;; Is a compound of all other declarations
;; Disabled on purpose. We have a better definition of this below.
;; (if_statement)
+ ;; (enum_declaration)
] @statement
(
@@ -54,10 +54,19 @@
(enum_declaration
name: (_) @name
body: (_
- "{" @interior.start.endOf @name.iteration.start.endOf
- "}" @interior.end.startOf @name.iteration.end.startOf
+ "{" @name.iteration.start.endOf
+ "}" @name.iteration.end.startOf
)
-) @type @name.domain @interior.domain
+) @statement @type @name.domain
+
+;;!! { }
+;;! ^
+(_
+ .
+ "{" @interior.start.endOf
+ "}" @interior.end.startOf
+ .
+)
;;!! enum Foo { bar, baz }
;;! ^^^ ^^^
@@ -114,19 +123,6 @@
(#type? @_dummy block class_body interface_body constructor_body)
)
-;;!! { }
-;;! ^
-(
- (_
- (_
- "{" @interior.start.endOf
- "}" @interior.end.startOf
- ) @_dummy
- ) @_.domain
- (#type? @_dummy block class_body interface_body constructor_body switch_block)
- (#not-type? @_.domain try_statement if_statement)
-)
-
;;!! void myFunk() {}
;;! ^^^^^^^^^^^^^^^^
(method_declaration
@@ -207,16 +203,20 @@
)
) @condition.domain
+;;!! case "0" -> "zero";
+;;! ^^^^^^^^
+(switch_rule
+ "->" @interior.start.endOf
+ (expression_statement)
+) @interior.end.endOf
+
;;!! case 0: break;
-;;! ^^^^^^
-(_
- (switch_label)
- .
- (_) @interior.start
- (_)? @interior.end
- .
- (#not-type? @interior.start block)
-) @_.domain
+;;! ^^^^^^^
+(switch_block_statement_group
+ ":" @interior.start.endOf
+ (_) @_dummy
+ (#not-type? @_dummy block)
+) @interior.end.endOf
(switch_expression
body: (_
@@ -236,12 +236,9 @@
;;! ^^^^^^^^
(
(if_statement
- "if" @branch.start @branch.removal.start @interior.domain.start.startOf
+ "if" @branch.start @branch.removal.start
condition: (_) @condition
- consequence: (block
- "{" @interior.start.endOf
- "}" @interior.end.startOf
- ) @branch.end @branch.removal.end @interior.domain.end.endOf
+ consequence: (_) @branch.end @branch.removal.end
"else"? @branch.removal.end.startOf
alternative: (if_statement)? @branch.removal.end.startOf
) @condition.domain
@@ -252,13 +249,10 @@
;;!! else if () {}
;;! ^^^^^^^^^^^^^
(if_statement
- "else" @branch.start @condition.domain.start @interior.domain.start.startOf
+ "else" @branch.start @condition.domain.start
alternative: (if_statement
condition: (_) @condition
- consequence: (block
- "{" @interior.start.endOf
- "}" @interior.end.startOf
- ) @branch.end @condition.domain.end @interior.domain.end.endOf
+ consequence: (block) @branch.end @condition.domain.end
(#child-range! @condition 0 -1 true true)
)
)
@@ -266,21 +260,15 @@
;;!! else {}
;;! ^^^^^^^
(if_statement
- "else" @branch.start @interior.domain.start.startOf
- alternative: (block
- "{" @interior.start.endOf
- "}" @interior.end.startOf
- ) @branch.end @interior.domain.end.endOf
+ "else" @branch.start
+ alternative: (block) @branch.end
)
;;!! try {}
;;! ^^^^^^
(try_statement
- "try" @branch.start @interior.domain.start.startOf
- body: (_
- "{" @interior.start.endOf
- "}" @interior.end.startOf
- ) @branch.end @interior.domain.end.endOf
+ "try" @branch.start
+ body: (_) @branch.end
)
;;!! catch (Exception e) {}
diff --git a/queries/javascript.core.scm b/queries/javascript.core.scm
index 21d402ccaf..3542c89eac 100644
--- a/queries/javascript.core.scm
+++ b/queries/javascript.core.scm
@@ -57,6 +57,15 @@
(#document-range! @name.iteration @value.iteration @type.iteration)
)
+;;!! { }
+;;! ^
+(_
+ .
+ "{" @interior.start.endOf
+ "}" @interior.end.startOf
+ .
+)
+
;; `name` scope without `export`
(
(_
@@ -502,17 +511,6 @@
(#type? @_dummy statement_block class_body interface_body)
)
-(
- (_
- (_
- "{" @interior.start.endOf
- "}" @interior.end.startOf
- ) @_dummy
- ) @_.domain
- (#type? @_dummy statement_block class_body interface_body switch_body)
- (#not-type? @_.domain if_statement try_statement)
-)
-
;;!! const aaa = {bbb: 0, ccc: 0};
;;! **************
(object
@@ -682,19 +680,23 @@
;;! ^^^^^^^^^^^^^^^
(switch_default) @branch
+;;!! case 0: break;
+;;! ^^^^^^^
(switch_case
- body: (_) @interior.start
- body: (_)? @interior.end
+ ":" @interior.start.endOf
.
- (#not-type? @interior.start statement_block)
-) @_.domain
+ (_) @_dummy
+ (#not-type? @_dummy statement_block)
+) @interior.end.endOf
+;;!! default: break;
+;;! ^^^^^^^
(switch_default
- body: (_) @interior.start
- body: (_)? @interior.end
+ ":" @interior.start.endOf
.
- (#not-type? @interior.start statement_block)
-) @_.domain
+ (_) @_dummy
+ (#not-type? @_dummy statement_block)
+) @interior.end.endOf
;;!! if () {} else {}
;;! ^^^^^^^^^^^^^^^^
@@ -707,12 +709,9 @@
;;! ^^^^^^^^
(
(if_statement
- "if" @branch.start.startOf @branch.removal.start.startOf @interior.domain.start.startOf
+ "if" @branch.start.startOf @branch.removal.start.startOf
condition: (_) @condition
- consequence: (_
- "{" @interior.start.endOf
- "}" @interior.end.startOf
- ) @branch.end.endOf @branch.removal.end.endOf @interior.domain.end.endOf
+ consequence: (_) @branch.end.endOf @branch.removal.end.endOf
alternative: (else_clause
(if_statement)? @branch.removal.end.startOf
)? @branch.removal.end.startOf
@@ -724,13 +723,10 @@
;;!! else if () {}
;;! ^^^^^^^^^^^^^
(else_clause
- "else" @branch.start.startOf @condition.domain.start.startOf @interior.domain.start.startOf
+ "else" @branch.start.startOf @condition.domain.start.startOf
(if_statement
condition: (_) @condition
- consequence: (_
- "{" @interior.start.endOf
- "}" @interior.end.startOf
- ) @branch.end.endOf @condition.domain.end.endOf @interior.domain.end.endOf
+ consequence: (_) @branch.end.endOf @condition.domain.end.endOf
)
(#child-range! @condition 0 -1 true true)
)
@@ -738,20 +734,14 @@
;;!! else {}
;;! ^^^^^^^
(else_clause
- (statement_block
- "{" @interior.start.endOf
- "}" @interior.end.startOf
- )
-) @branch @interior.domain
+ (statement_block)
+) @branch
;;!! try () {}
;;! ^^^^^^^^^
(try_statement
- "try" @branch.start @interior.domain.start.startOf
- body: (_
- "{" @interior.start.endOf
- "}" @interior.end.startOf
- ) @branch.end @interior.domain.end.endOf
+ "try" @branch.start
+ body: (_) @branch.end
)
;;!! catch () {}
diff --git a/queries/javascript.jsx.scm b/queries/javascript.jsx.scm
index 2825fcff08..d673455c01 100644
--- a/queries/javascript.jsx.scm
+++ b/queries/javascript.jsx.scm
@@ -1,23 +1,19 @@
;;!!
bar
;;! ^^^^^^^^^^^^^^
-;;! ###
-;;! ***
-(
- (jsx_element) @xmlElement @interior @interior.domain
- (#child-range! @interior 0 -1 true true)
-)
-(
- (jsx_element) @xmlElement.iteration
- (#child-range! @xmlElement.iteration 0 -1 true true)
+(jsx_element) @xmlElement
+
+;;!!
bar
+;;! ^^^
+(jsx_element
+ (jsx_opening_element) @interior.start.endOf @xmlElement.iteration.start.endOf
+ (jsx_closing_element) @interior.end.startOf @xmlElement.iteration.end.startOf
)
;;!!
bar
-;;! ***
-(
- (jsx_element) @xmlStartTag.iteration @xmlEndTag.iteration @xmlBothTags.iteration
- (#child-range! @xmlStartTag.iteration 0 -1 true true)
- (#child-range! @xmlEndTag.iteration 0 -1 true true)
- (#child-range! @xmlBothTags.iteration 0 -1 true true)
+;;! ^^^
+(jsx_element
+ (jsx_opening_element) @xmlStartTag.iteration.start.endOf @xmlEndTag.iteration.start.endOf @xmlBothTags.iteration.start.endOf
+ (jsx_closing_element) @xmlStartTag.iteration.end.startOf @xmlEndTag.iteration.end.startOf @xmlBothTags.iteration.end.startOf
)
;;!!
bar
diff --git a/queries/latex.scm b/queries/latex.scm
index b357165ce1..2918539577 100644
--- a/queries/latex.scm
+++ b/queries/latex.scm
@@ -16,14 +16,22 @@
(subparagraph) @subParagraph
(_
- (begin) @xmlStartTag @interior.start.endOf
- (end) @xmlEndTag @interior.end.startOf
+ (begin) @xmlStartTag
+ (end) @xmlEndTag
) @environment @xmlElement @_.domain
+;;!! \begin{quote} Hello \end{quote}
+;;! ^^^^^^^
+(_
+ (begin) @interior.start.endOf
+ (end) @interior.end.startOf
+)
+
(_
(begin) @xmlBothTags
(#allow-multiple! @xmlBothTags)
) @_.domain
+
(_
(end) @xmlBothTags
(#allow-multiple! @xmlBothTags)
diff --git a/queries/lua.scm b/queries/lua.scm
index ed6c682f60..3a11e70ec0 100644
--- a/queries/lua.scm
+++ b/queries/lua.scm
@@ -49,11 +49,18 @@
;;! ^^^^^^^^^^^^^^^^
;;! ^^^^
(if_statement
- "if" @interior.domain.start
condition: (_) @condition
- consequence: (_)? @interior @interior.domain.end
) @ifStatement @condition.domain @branch.iteration
+;;!! if true then a=1 end
+;;! ^^^^^
+(if_statement
+ "then" @interior.start.endOf
+ consequence: (_)
+ .
+ _ @interior.end.startOf
+)
+
;;!! if true then end
;;! ^^^^^^^^^^^^
(if_statement
@@ -85,16 +92,25 @@
;;!! elseif true then
;;! ^^^^^^^^^^^^^^^^
;;! ^^^^
-(elseif_statement
- condition: (_) @condition
- consequence: (_) @interior
-) @branch @_.domain
+(if_statement
+ (elseif_statement
+ condition: (_) @condition
+ "then" @interior.start.endOf
+ ) @branch @condition.domain
+ .
+ _ @interior.end.startOf
+)
;;!! else then
;;! ^^^^^^^^^
-(else_statement
- body: (_) @interior
-) @branch @interior.domain
+
+(if_statement
+ (else_statement
+ "else" @interior.start.endOf
+ ) @branch
+ .
+ _ @interior.end.startOf
+)
;;!! while true do
;;! ^^^^
@@ -220,7 +236,7 @@
name: (_) @name
parameters: (_) @interior.start.endOf
"end" @interior.end.startOf
-) @namedFunction @_.domain
+) @namedFunction @name.domain
;; inside lambda:
;;!! __add = function(a, b) return a + b end
@@ -231,7 +247,7 @@
(function_definition
parameters: (_) @interior.start.endOf
"end" @interior.end.startOf
-) @anonymousFunction @_.domain
+) @anonymousFunction
;; Names and values
diff --git a/queries/markdown.scm b/queries/markdown.scm
index e81ecc9e9c..afb93bd165 100644
--- a/queries/markdown.scm
+++ b/queries/markdown.scm
@@ -52,7 +52,7 @@
.
(block_continuation)
(fenced_code_block_delimiter) @interior.end.startOf
- ) @notebookCell @interior.domain
+ ) @notebookCell
(#trim-end! @notebookCell)
(#insertion-delimiter! @notebookCell "\n\n")
)
@@ -68,7 +68,7 @@
(fenced_code_block
(info_string) @interior.start.endOf
(fenced_code_block_delimiter) @interior.end.startOf
- ) @notebookCell @interior.domain
+ ) @notebookCell
(#trim-end! @notebookCell)
(#insertion-delimiter! @notebookCell "\n\n")
)
diff --git a/queries/python.scm b/queries/python.scm
index eaf072cc30..81af439cbf 100644
--- a/queries/python.scm
+++ b/queries/python.scm
@@ -34,6 +34,14 @@
;; (if_statement)
] @statement
+;;!! if True: pass
+;;! ^^^^^
+(_
+ ":" @interior.start.endOf
+ .
+ (block) @interior.end.endOf
+)
+
;;!! a = 25
;;! ^^
;;! xxxxx
@@ -170,12 +178,6 @@
(_) @value
) @_.domain
-;;!! with aaa:
-;;! ^^^
-(with_statement
- body: (_) @interior
-) @interior.domain
-
;;!! with aaa:
;;! ^^^
;;! --------
@@ -298,7 +300,6 @@
(
(function_definition
name: (_) @name
- body: (_) @interior
) @namedFunction @statement @_.domain
(#not-parent-type? @namedFunction decorated_definition)
)
@@ -308,7 +309,6 @@
(decorated_definition
(function_definition
name: (_) @name
- body: (_) @interior
)
) @namedFunction @_.domain
@@ -333,7 +333,6 @@
(
(class_definition
name: (_) @name
- body: (_) @interior
) @_.domain
(#not-parent-type? @_.domain decorated_definition)
)
@@ -347,7 +346,6 @@
(decorated_definition
(class_definition
name: (_) @name
- body: (_) @interior
)
) @_.domain
@@ -407,7 +405,6 @@
;;! ^^^^^
(match_statement
subject: (_) @value
- body: (_) @interior
) @_.domain
;;!! { "value": 0 }
@@ -433,7 +430,6 @@
(case_clause
(case_pattern) @condition.start
guard: (_)? @condition.end
- consequence: (_) @interior
) @_.domain
;;!! case 0: pass
@@ -482,13 +478,6 @@
;;! ^^^^^^^^^^^^^^^^^^^^^^^^
(if_statement) @ifStatement @statement @branch.iteration
-;;!! if True: pass
-;;! ^^^^^^^^^^^^^
-(if_statement
- "if" @interior.domain.start
- consequence: (_) @interior @interior.domain.end
-)
-
;;!! if True: pass
;;! ^^^^^^^^^^^^^
(if_statement
@@ -511,33 +500,27 @@
;;!! elif True: pass
;;! ^^^^^^^^^^^^^^^
(elif_clause
- consequence: (_) @interior
-) @branch @interior.domain
+ consequence: (_)
+) @branch
;;!! else: pass
;;! ^^^^^^^^^^
-(else_clause
- body: (_) @interior
-) @branch @interior.domain
+(else_clause) @branch
;;!! try: pass
;;! ^^^^^^^^^
(try_statement
- "try" @branch.start @interior.domain.start
- body: (_) @branch.end @interior @interior.domain.end
+ "try" @branch.start
+ body: (_) @branch.end
)
;;!! except: pass
;;! ^^^^^^^^^^^^
-(except_clause
- (block) @interior
-) @branch @interior.domain
+(except_clause) @branch
;;!! except*: pass
;;! ^^^^^^^^^^^^^
-(except_group_clause
- (block) @interior
-) @branch @interior.domain
+(except_group_clause) @branch
;;!! except Exception as ex:
;;! ^^^^^^^^^^^^^^^
@@ -553,8 +536,8 @@
;;!! finally: pass
;;! ^^^^^^^^^^^^^
(finally_clause
- (block) @interior
-) @branch @interior.domain
+ (block)
+) @branch
(try_statement) @branch.iteration
@@ -562,8 +545,8 @@
;;! ^^^^^^^^^^^^^^^^
(while_statement
"while" @branch.start
- body: (_) @branch.end @interior
-) @interior.domain
+ body: (_) @branch.end
+)
(while_statement) @branch.iteration
@@ -571,8 +554,8 @@
;;! ^^^^^^^^^^^^^^^^^^^^
(for_statement
"for" @branch.start
- body: (_) @branch.end @interior
-) @interior.domain
+ body: (_) @branch.end
+)
(for_statement) @branch.iteration
diff --git a/queries/r.scm b/queries/r.scm
index f70cd30cdb..b34f60cd6f 100644
--- a/queries/r.scm
+++ b/queries/r.scm
@@ -27,7 +27,7 @@
rhs: (function_definition
name: "function"
parameters: (parameters)
- body: (braced_expression) @interior
+ body: (braced_expression)
) @name.trailing.startOf
) @namedFunction @_.domain
diff --git a/queries/scss.scm b/queries/scss.scm
index ceda500c02..256bbd63d4 100644
--- a/queries/scss.scm
+++ b/queries/scss.scm
@@ -30,12 +30,14 @@
(while_statement)
] @statement
+;;!! { }
+;;! ^
(_
- (block
- "{" @interior.start.endOf
- "}" @interior.end.startOf
- )
-) @_.domain
+ .
+ "{" @interior.start.endOf
+ "}" @interior.end.startOf
+ .
+)
(single_line_comment) @comment @textFragment
diff --git a/queries/talon.scm b/queries/talon.scm
index 74b212f428..8b5f86d576 100644
--- a/queries/talon.scm
+++ b/queries/talon.scm
@@ -121,12 +121,19 @@
;;!! slap: key(enter)
;;! ^^^^^^^^^^^^^^^^
(
- (command_declaration
- right: (_) @interior
- ) @command @interior.domain
+ (command_declaration) @command
(#insertion-delimiter! @command "\n")
)
+;;!! slap: key(enter)
+;;! ^^^^^^^^^^^
+(
+ (command_declaration
+ ":" @interior.start.endOf
+ right: (_) @interior.end.endOf
+ )
+)
+
;;!! key(enter)
;;! ^^^^^^^^^^
;;!! edit.left()
diff --git a/queries/typescript.core.scm b/queries/typescript.core.scm
index b1430d08e4..e58003a4b1 100644
--- a/queries/typescript.core.scm
+++ b/queries/typescript.core.scm
@@ -39,10 +39,10 @@
;;! ^
(enum_declaration
(enum_body
- "{" @interior.start.endOf @name.iteration.start.endOf @value.iteration.start.endOf
- "}" @interior.end.startOf @name.iteration.end.startOf @value.iteration.end.startOf
+ "{" @name.iteration.start.endOf @value.iteration.start.endOf
+ "}" @name.iteration.end.startOf @value.iteration.end.startOf
)
-) @type @interior.domain
+) @type
;;!! enum Foo { aaa, bbb }
;;! ^^^ ^^^
diff --git a/queries/xml.scm b/queries/xml.scm
index f8e3098d6f..450008afd4 100644
--- a/queries/xml.scm
+++ b/queries/xml.scm
@@ -52,7 +52,7 @@
(element
(STag) @interior.start.endOf
(ETag) @interior.end.startOf
-) @xmlElement @interior.domain
+) @xmlElement
;;!!
text
;;! ^^^^^ ^^^^^^