Skip to content

Allow "return@" in Kotlin Tree sitter queries #2752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 25, 2025
Merged

Allow "return@" in Kotlin Tree sitter queries #2752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
abb19fd
Allow `"return@"` in Kotlin Tree sitter queries
AndreasArvidsson Jan 24, 2025
b630e1b
Update regex and tests
AndreasArvidsson Jan 24, 2025
cb3c14b
Update regex
AndreasArvidsson Jan 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions packages/cursorless-engine/src/languages/TreeSitterQuery/validateQueryCaptures.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@ const testCases: { name: string; isOk: boolean; content: string }[] = [
isOk: true,
content: ";; (if_statement) @unknown",
},
{
name: "@ ending string",
isOk: true,
content: '"return@"',
},
{
name: "Unknown capture",
isOk: false,
Expand Down
3 changes: 2 additions & 1 deletion packages/cursorless-engine/src/languages/TreeSitterQuery/validateQueryCaptures.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,9 @@ for (const captureName of captureNames) {
}

// Not a comment. ie line is not starting with `;;`
// Not a string.
// Capture starts with `@` and is followed by words and/or dots
const capturePattern = new RegExp(`^(?!;;).*@([\\w.]*)`, "gm");
const capturePattern = /^(?!;;).*(?<!"\w*)@([\w.]*)/gm;

export function validateQueryCaptures(file: string, rawQuery: string): void {
const matches = rawQuery.matchAll(capturePattern);
Expand Down
15 changes: 7 additions & 8 deletions queries/kotlin.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,14 +437,13 @@
(_) @value
) @_.domain

;; Disabled due to Cursorless error ("invalid capture") caused by "return@"
;; (jump_expression
;; "return@"
;; .
;; (label)
;; .
;; (_) @value
;; ) @_.domain
(jump_expression
"return@"
.
(label)
.
(_) @value
) @_.domain

(_
(function_body
Expand Down
Loading