Skip to content

Commit 7222396

Browse files
authored
[chore]: Update Languages (#20)
* update languages - update tree-sitter-c-sharp - update tree-sitter-php * add comments to `queryFor(_: )` method
1 parent 28cf9d5 commit 7222396

File tree

5 files changed

+44
-48
lines changed

5 files changed

+44
-48
lines changed

CodeLanguages-Container/CodeLanguages-Container.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
-8.56 KB
Binary file not shown.
Lines changed: 23 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,23 @@
1-
(class_declaration
2-
name: (identifier) @name
3-
) @definition.class
4-
5-
(class_declaration
6-
bases: (base_list (_) @name)
7-
) @reference.class
8-
9-
(interface_declaration
10-
name: (identifier) @name
11-
) @definition.interface
12-
13-
(interface_declaration
14-
bases: (base_list (_) @name)
15-
) @reference.interface
16-
17-
(method_declaration
18-
name: (identifier) @name
19-
) @definition.method
20-
21-
(object_creation_expression
22-
type: (identifier) @name
23-
) @reference.class
24-
25-
(type_parameter_constraints_clause
26-
target: (identifier) @name
27-
) @reference.class
28-
29-
(type_constraint
30-
type: (identifier) @name
31-
) @reference.class
32-
33-
(variable_declaration
34-
type: (identifier) @name
35-
) @reference.class
36-
37-
(invocation_expression
38-
function:
39-
(member_access_expression
40-
name: (identifier) @name
41-
)
42-
) @reference.send
43-
44-
(namespace_declaration
45-
name: (identifier) @name
46-
) @definition.module
1+
(class_declaration name: (identifier) @name) @definition.class
2+
3+
(class_declaration bases: (base_list (_) @name)) @reference.class
4+
5+
(interface_declaration name: (identifier) @name) @definition.interface
6+
7+
(interface_declaration bases: (base_list (_) @name)) @reference.interface
8+
9+
(method_declaration name: (identifier) @name) @definition.method
10+
11+
(object_creation_expression type: (identifier) @name) @reference.class
12+
13+
(type_parameter_constraints_clause target: (identifier) @name) @reference.class
14+
15+
(type_constraint type: (identifier) @name) @reference.class
16+
17+
(variable_declaration type: (identifier) @name) @reference.class
18+
19+
(invocation_expression function: (member_access_expression name: (identifier) @name)) @reference.send
20+
21+
(namespace_declaration name: (identifier) @name) @definition.module
22+
23+
(namespace_declaration name: (identifier) @name) @module

Sources/CodeEditLanguages/Resources/tree-sitter-php/tags.scm

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
1+
(namespace_definition
2+
name: (namespace_name) @name) @module
3+
4+
(interface_declaration
5+
name: (name) @name) @definition.interface
6+
7+
(trait_declaration
8+
name: (name) @name) @definition.interface
9+
110
(class_declaration
211
name: (name) @name) @definition.class
312

13+
(class_interface_clause [(name) (qualified_name)] @name) @impl
14+
15+
(property_declaration
16+
(property_element (variable_name (name) @name))) @definition.field
17+
418
(function_definition
519
name: (name) @name) @definition.function
620

Sources/CodeEditLanguages/TreeSitterModel.swift

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,8 +179,13 @@ public class TreeSitterModel {
179179
}()
180180

181181
private func queryFor(_ codeLanguage: CodeLanguage) -> Query? {
182+
// get the tree-sitter language and query url if available
182183
guard let language = codeLanguage.language,
183184
let url = codeLanguage.queryURL else { return nil }
185+
186+
// 1. if the language depends on another language combine the query files
187+
// 2. if the language has additional query files combine them with the main one
188+
// 3. otherwise return the query file
184189
if let parentURL = codeLanguage.parentQueryURL,
185190
let data = combinedQueryData(for: [url, parentURL]) {
186191
return try? Query(language: language, data: data)

0 commit comments

Comments
 (0)