Skip to content

Runnable support for indirect subclasses of XCTestCase #50

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

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
+845 −1
Open

Runnable support for indirect subclasses of XCTestCase #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
93fd48d
Add comprehensive unit tests for runnables.scm
humblehacker Nov 13, 2025
768e7a6
Optimize test performance by caching language and query
humblehacker Nov 13, 2025
d12ffcf
Upgrade to tree-sitter 0.25 and tree-sitter-swift 0.7
humblehacker Nov 13, 2025
d5ba6c2
Add tests for indirect XCTest subclasses and comment annotation worka…
humblehacker Nov 13, 2025
5500cf5
Enable @XCTestClass comment annotation for indirect XCTest subclasses
humblehacker Nov 13, 2025
1115354
Add comprehensive documentation to runnables test module
humblehacker Nov 13, 2025
64cf455
Fix missing @run on indirect subclass query
humblehacker Nov 14, 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
100 changes: 100 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,8 @@ crate-type = ["cdylib"]
serde = { version = "1.0.219", features = ["derive"] }
serde_json = "1.0.140"
zed_extension_api = "0.6.0"

[dev-dependencies]
tree-sitter = "0.25"
tree-sitter-swift = "0.7"
streaming-iterator = "0.1"
41 changes: 40 additions & 1 deletion languages/swift/runnables.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,21 @@
;;
;; While the tasks defined in this extension don't care which library is used,
;; other tasks built by users might.
;;
;; INDIRECT XCTEST SUBCLASSES:
;; Tree-sitter queries cannot follow inheritance chains semantically, so indirect
;; subclasses (MyTests <- MyTestsBase <- XCTestCase) are not automatically detected.
;;
;; WORKAROUND: Add a // @XCTestClass comment before indirect subclass declarations:
;;
;; class MyTestsBase: XCTestCase { }
;;
;; // @XCTestClass
;; class MyTests: MyTestsBase {
;; func testSomething() { }
;; }
;;
;; This allows the query to recognize and run tests in indirect subclasses.

;; @Suite struct/class
(
Expand Down Expand Up @@ -88,6 +103,30 @@
(#set! tag swift-xctest-func)
)

;; XCTestCase indirect subclass with @XCTestClass comment annotation
;; This pattern allows users to mark indirect subclasses (MyTests <- MyTestsBase <- XCTestCase)
;; by adding a "// @XCTestClass" comment before the class declaration.
(
(comment) @_marker (#match? @_marker ".*@XCTestClass.*")
(class_declaration
name: (type_identifier) @SWIFT_TEST_CLASS @run
) @_swift-xctest-class
(#set! tag swift-xctest-class)
)

;; Test function within comment-annotated XCTest class
(
(comment) @_marker (#match? @_marker ".*@XCTestClass.*")
(class_declaration
name: (type_identifier) @SWIFT_TEST_CLASS
body: (class_body
(function_declaration
name: (simple_identifier) @_name @SWIFT_TEST_FUNC @run (#match? @run "^test")
)
)
) @_swift-xctest-func
(#set! tag swift-xctest-func)
)

;; QuickSpec subclass
(
Expand All @@ -113,4 +152,4 @@
)
) @_swift-test-async-spec
(#set! tag swift-test-async-spec)
)
)
Loading