Add first zig scope facet #3111

Antman261 · 2025-11-27T08:58:12Z

First slice of zig working end to end.

Let me know if there is anything I should change, e.g. should I make the query less specific? I have never used tree-sitter queries before

queries/zig.scm

packages/common/src/scopeSupportFacets/zig.ts

Co-authored-by: Andreas Arvidsson <andreas.arvidsson87@gmail.com>

AndreasArvidsson

I've gone through all your new tests and left comments. Please use typescript as a reference language to help you figure out the correct ranges. We do have a scope visualizer on the docs page to help you with this:

Per language:
https://www.cursorless.org/docs/user/languages/typescript/

Per scope:
https://www.cursorless.org/docs/contributing/scopes/argumentList/

The tests are also failing which you need have a look at.

AndreasArvidsson · 2025-12-23T02:40:59Z

data/fixtures/scopes/zig/argument.actual.multiLine.scope

bbb is missing as a scope

The removal range of aaa is incorrect

The insertion delimiter is incorrect for a multiline argument

Please use another language, eg javascript, as a reference:
https://github.com/cursorless-dev/cursorless/blob/d21522be750a55b70b50ac251300bfd6dd4baace/data/fixtures/scopes/javascript.core/argument/argument.actual.multiLine.scope

AndreasArvidsson · 2025-12-23T02:43:09Z

data/fixtures/scopes/zig/argument.actual.singleLine.scope

bbb is missing as a scope

The removal range of aaa is incorrect

The insertion delimiter is incorrect

AndreasArvidsson · 2025-12-23T02:46:19Z

data/fixtures/scopes/zig/argument.formal.singleLine.scope

Please include a second argument so we get a separate removal range in this scope test

AndreasArvidsson · 2025-12-23T02:47:20Z

data/fixtures/scopes/zig/argumentList.actual.empty.scope

+  >-----<
+0| foo();
+
+[Insertion delimiter] = " "


The insertion delimiter should be an empty string

AndreasArvidsson · 2025-12-23T02:47:51Z

data/fixtures/scopes/zig/argumentList.actual.singleLine.scope

+  >-------------<
+0| foo(aaa, bbb);
+
+[Insertion delimiter] = " "


The insertion delimiter should be ", "

AndreasArvidsson · 2025-12-23T03:03:09Z

data/fixtures/scopes/zig/type.argument.formal.scope

+
+[#3 Removal] = 0:14-0:23
+                >---------<
+0| fn foo(aaa: u8, bbb: u8) void {}


Same problem here

AndreasArvidsson · 2025-12-23T03:03:37Z

data/fixtures/scopes/zig/type.return.scope

@@ -0,0 +1,62 @@
+fn foo(aaa: u8, bbb: u8) void {}


Please remove the arguments for this tests. Now the file is unnecessarily complicated.

AndreasArvidsson · 2025-12-23T03:05:16Z

data/fixtures/scopes/zig/type.variable.scope

+
+[Removal] = 0:11-0:14
+             >---<
+0| const foo: u8 = 0;


Removal range should be : u8

cursorless/data/fixtures/scopes/typescript.core/type/type.variable2.scope

Line 10 in d21522b

0| const foo: number = 0;

AndreasArvidsson · 2025-12-23T03:06:12Z

data/fixtures/scopes/zig/value.assignment.scope

@@ -0,0 +1,20 @@
+const foo = "bar";


Assignment should be assigning a value to an already existing variable. Please rename this file to value.variable

AndreasArvidsson · 2025-12-23T03:07:03Z

data/fixtures/scopes/zig/value.assignment.scope

+
+[Removal] = 0:11-0:17
+             >------<
+0| const foo = "bar";


Removal range should be = "bar"

cursorless/data/fixtures/scopes/javascript.core/value/value.variable.scope

Line 10 in d21522b

0| const foo = 0;

phillco · 2026-02-09T14:07:34Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: ed6c426bb2

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

chatgpt-codex-connector · 2026-02-09T14:12:32Z

data/fixtures/scopes/zig/argumentList.formal.multiLine.scope

+foo(
+    aaa, 
+    bbb
+);


Use a function declaration for formal list fixture

This fixture is named argumentList.formal.multiLine, but the sample code is a call expression (foo(...)) rather than a function declaration. The Zig query for formal argument lists only matches function_declaration (parameters), so this fixture won’t exercise the intended scope and can let regressions slip or produce misleading docs/tests for formal lists. Consider changing the snippet to a fn foo(... ) declaration so the fixture actually validates the formal list behavior.

Useful? React with 👍 / 👎.

chatgpt-codex-connector · 2026-02-09T14:12:32Z

data/fixtures/scopes/zig/type.return.scope

+[#2 Content] = 0:12-0:14
+              >--<
+0| fn foo(aaa: u8, bbb: u8) void {}


Don’t include parameter types in return-type fixture

The type.return fixture includes additional captures for the parameter types ([#2 Content] = 0:12-0:14, etc.). That makes the fixture assert that parameter types are part of the return-type scope, which contradicts the facet’s intent and will either fail tests or mask a broken return-type query by validating the wrong targets. The fixture should only contain the return type range.

Useful? React with 👍 / 👎.

Add first zig scope facet

3cb55ab

Antman261 requested a review from a team as a code owner November 27, 2025 08:58

AndreasArvidsson requested changes Nov 27, 2025

View reviewed changes

queries/zig.scm Outdated Show resolved Hide resolved

packages/common/src/scopeSupportFacets/zig.ts Show resolved Hide resolved

packages/common/src/scopeSupportFacets/zig.ts Show resolved Hide resolved

packages/common/src/scopeSupportFacets/zig.ts Outdated Show resolved Hide resolved

Antman261 and others added 22 commits November 27, 2025 19:16

Update queries/zig.scm

0abea27

Co-authored-by: Andreas Arvidsson <andreas.arvidsson87@gmail.com>

Update packages/common/src/scopeSupportFacets/zig.ts

c2fe2de

Co-authored-by: Andreas Arvidsson <andreas.arvidsson87@gmail.com>

Update packages/common/src/scopeSupportFacets/zig.ts

d56874b

Co-authored-by: Andreas Arvidsson <andreas.arvidsson87@gmail.com>

Merge branch 'main' into main

bef3efe

Apply suggestion from @AndreasArvidsson

1f32c82

Co-authored-by: Andreas Arvidsson <andreas.arvidsson87@gmail.com>

add more scopes and scope tests

94a9433

Merge branch 'main' into main

8eb1fe7

wip: improving zig scm

957ca92

Merge branch 'main' of https://github.com/Antman261/cursorless

05929f9

wip: improve Zig scm

15b273c

Improve scm examples

1c060d3

Update arg list test

69cd67b

wip: add more scope tests

e03a4f6

wip: improving argument iteration and domain

f35dd75

wip: function declaration argument iteration working

35d1442

wip: fix variable declaration type removal of leading ":"

07aed70

Merge branch 'main' into main

f7dfc6f

Remove unsupported arg iteration scopes

3137256

Merge branch 'main' of https://github.com/Antman261/cursorless

55e6843

Remove unsupported scope files

fa4bbcd

Add zig language page to docs

86f322e

Fix bug with argument actual

4d093f3

Antman261 requested a review from AndreasArvidsson December 22, 2025 12:12

Merge branch 'main' into main

80b9512

AndreasArvidsson requested changes Dec 23, 2025

View reviewed changes

Merge branch 'main' into main

ed6c426

chatgpt-codex-connector bot reviewed Feb 9, 2026

View reviewed changes

Uh oh!

Add first zig scope facet #3111

Are you sure you want to change the base?

Add first zig scope facet #3111

Conversation

Antman261 commented Nov 27, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

AndreasArvidsson left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

phillco commented Feb 9, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector bot Feb 9, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector bot Feb 9, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants