Skip to content

Commit d101d58

Browse files
authored
[feat]: Add YAML highlights (#21)
* add yaml highlights.scm * add fetch query test for yaml * remove comment * update xcframework
1 parent 7222396 commit d101d58

File tree

5 files changed

+58
-21
lines changed

5 files changed

+58
-21
lines changed

CodeLanguages-Container/CodeLanguages-Container.xcodeproj/project.pbxproj

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
282E5977298051980064B34A /* TreeSitterYAML in Frameworks */ = {isa = PBXBuildFile; productRef = 282E5976298051980064B34A /* TreeSitterYAML */; };
1011
2846B262296BA1CF005F60B6 /* TreeSitterDockerfile in Frameworks */ = {isa = PBXBuildFile; productRef = 2846B261296BA1CF005F60B6 /* TreeSitterDockerfile */; };
1112
28B3F010290C207D000CD04D /* CodeLanguages_Container.h in Headers */ = {isa = PBXBuildFile; fileRef = 28B3F00F290C207D000CD04D /* CodeLanguages_Container.h */; settings = {ATTRIBUTES = (Public, ); }; };
1213
28B3F02D290C35D9000CD04D /* TreeSitterC in Frameworks */ = {isa = PBXBuildFile; productRef = 28B3F02C290C35D9000CD04D /* TreeSitterC */; };
@@ -26,7 +27,6 @@
2627
28B3F057290C36D5000CD04D /* TreeSitterRuby in Frameworks */ = {isa = PBXBuildFile; productRef = 28B3F056290C36D5000CD04D /* TreeSitterRuby */; };
2728
28B3F05A290C36E5000CD04D /* TreeSitterRust in Frameworks */ = {isa = PBXBuildFile; productRef = 28B3F059290C36E5000CD04D /* TreeSitterRust */; };
2829
28B3F05D290C3709000CD04D /* TreeSitterSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 28B3F05C290C3709000CD04D /* TreeSitterSwift */; };
29-
28B3F060290C3720000CD04D /* TreeSitterYAML in Frameworks */ = {isa = PBXBuildFile; productRef = 28B3F05F290C3720000CD04D /* TreeSitterYAML */; };
3030
28B3F063290C372D000CD04D /* TreeSitterZig in Frameworks */ = {isa = PBXBuildFile; productRef = 28B3F062290C372D000CD04D /* TreeSitterZig */; };
3131
28B9F7AA290DDAC900245748 /* TreeSitterBash in Frameworks */ = {isa = PBXBuildFile; productRef = 28B9F7A9290DDAC900245748 /* TreeSitterBash */; };
3232
/* End PBXBuildFile section */
@@ -61,7 +61,7 @@
6161
28B3F05A290C36E5000CD04D /* TreeSitterRust in Frameworks */,
6262
28B3F054290C36C5000CD04D /* TreeSitterPython in Frameworks */,
6363
28B3F048290C367C000CD04D /* TreeSitterJava in Frameworks */,
64-
28B3F060290C3720000CD04D /* TreeSitterYAML in Frameworks */,
64+
282E5977298051980064B34A /* TreeSitterYAML in Frameworks */,
6565
28B3F057290C36D5000CD04D /* TreeSitterRuby in Frameworks */,
6666
);
6767
runOnlyForDeploymentPostprocessing = 0;
@@ -156,10 +156,10 @@
156156
28B3F056290C36D5000CD04D /* TreeSitterRuby */,
157157
28B3F059290C36E5000CD04D /* TreeSitterRust */,
158158
28B3F05C290C3709000CD04D /* TreeSitterSwift */,
159-
28B3F05F290C3720000CD04D /* TreeSitterYAML */,
160159
28B3F062290C372D000CD04D /* TreeSitterZig */,
161160
28B9F7A9290DDAC900245748 /* TreeSitterBash */,
162161
2846B261296BA1CF005F60B6 /* TreeSitterDockerfile */,
162+
282E5976298051980064B34A /* TreeSitterYAML */,
163163
);
164164
productName = "CodeLanguages-Container";
165165
productReference = 28B3F00C290C207D000CD04D /* CodeLanguages_Container.framework */;
@@ -207,10 +207,10 @@
207207
28B3F055290C36D5000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-ruby" */,
208208
28B3F058290C36E5000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-rust" */,
209209
28B3F05B290C3709000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-swift" */,
210-
28B3F05E290C3720000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-yaml" */,
211210
28B3F061290C372D000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-zig" */,
212211
28B9F7A6290DDAB500245748 /* XCRemoteSwiftPackageReference "tree-sitter-bash" */,
213212
2846B260296BA1CF005F60B6 /* XCRemoteSwiftPackageReference "tree-sitter-dockerfile" */,
213+
282E5975298051980064B34A /* XCRemoteSwiftPackageReference "tree-sitter-yaml" */,
214214
);
215215
productRefGroup = 28B3F00D290C207D000CD04D /* Products */;
216216
projectDirPath = "";
@@ -450,6 +450,14 @@
450450
/* End XCConfigurationList section */
451451

452452
/* Begin XCRemoteSwiftPackageReference section */
453+
282E5975298051980064B34A /* XCRemoteSwiftPackageReference "tree-sitter-yaml" */ = {
454+
isa = XCRemoteSwiftPackageReference;
455+
repositoryURL = "https://github.com/lukepistrol/tree-sitter-yaml.git";
456+
requirement = {
457+
branch = feature/spm;
458+
kind = branch;
459+
};
460+
};
453461
2846B260296BA1CF005F60B6 /* XCRemoteSwiftPackageReference "tree-sitter-dockerfile" */ = {
454462
isa = XCRemoteSwiftPackageReference;
455463
repositoryURL = "https://github.com/camdencheek/tree-sitter-dockerfile.git";
@@ -594,14 +602,6 @@
594602
kind = branch;
595603
};
596604
};
597-
28B3F05E290C3720000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-yaml" */ = {
598-
isa = XCRemoteSwiftPackageReference;
599-
repositoryURL = "https://github.com/mattmassicotte/tree-sitter-yaml.git";
600-
requirement = {
601-
branch = feature/spm;
602-
kind = branch;
603-
};
604-
};
605605
28B3F061290C372D000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-zig" */ = {
606606
isa = XCRemoteSwiftPackageReference;
607607
repositoryURL = "https://github.com/maxxnino/tree-sitter-zig.git";
@@ -621,6 +621,11 @@
621621
/* End XCRemoteSwiftPackageReference section */
622622

623623
/* Begin XCSwiftPackageProductDependency section */
624+
282E5976298051980064B34A /* TreeSitterYAML */ = {
625+
isa = XCSwiftPackageProductDependency;
626+
package = 282E5975298051980064B34A /* XCRemoteSwiftPackageReference "tree-sitter-yaml" */;
627+
productName = TreeSitterYAML;
628+
};
624629
2846B261296BA1CF005F60B6 /* TreeSitterDockerfile */ = {
625630
isa = XCSwiftPackageProductDependency;
626631
package = 2846B260296BA1CF005F60B6 /* XCRemoteSwiftPackageReference "tree-sitter-dockerfile" */;
@@ -711,11 +716,6 @@
711716
package = 28B3F05B290C3709000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-swift" */;
712717
productName = TreeSitterSwift;
713718
};
714-
28B3F05F290C3720000CD04D /* TreeSitterYAML */ = {
715-
isa = XCSwiftPackageProductDependency;
716-
package = 28B3F05E290C3720000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-yaml" */;
717-
productName = TreeSitterYAML;
718-
};
719719
28B3F062290C372D000CD04D /* TreeSitterZig */ = {
720720
isa = XCSwiftPackageProductDependency;
721721
package = 28B3F061290C372D000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-zig" */;

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

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
15.3 KB
Binary file not shown.
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
;; keys
2+
(block_mapping_pair
3+
key: (flow_node [(double_quote_scalar) (single_quote_scalar)] @variable))
4+
(block_mapping_pair
5+
key: (flow_node (plain_scalar (string_scalar) @variable)))
6+
7+
;; keys within inline {} blocks
8+
(flow_mapping
9+
(_ key: (flow_node [(double_quote_scalar) (single_quote_scalar)] @variable)))
10+
(flow_mapping
11+
(_ key: (flow_node (plain_scalar (string_scalar) @variable))))
12+
13+
["[" "]" "{" "}"] @punctuation.bracket
14+
["," "-" ":" "?" ">" "|"] @punctuation.delimiter
15+
["*" "&" "---" "..."] @punctuation.special
16+
17+
[(null_scalar) (boolean_scalar)] @constant.builtin
18+
[(integer_scalar) (float_scalar)] @number
19+
[(double_quote_scalar) (single_quote_scalar) (block_scalar)] @string
20+
(escape_sequence) @escape
21+
22+
(comment) @comment
23+
[(anchor_name) (alias_name)] @function
24+
(yaml_directive) @type
25+
26+
(tag) @type
27+
(tag_handle) @type
28+
(tag_prefix) @string
29+
(tag_directive) @property

Tests/CodeEditLanguagesTests/CodeEditLanguagesTests.swift

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,15 @@ final class CodeEditLanguagesTests: XCTestCase {
459459
XCTAssertEqual(language.id, .yaml)
460460
}
461461

462-
// YAML currently has no query files
462+
func test_FetchQueryYAML() throws {
463+
var language = CodeLanguage.yaml
464+
language.resourceURL = bundleURL
465+
466+
let data = try Data(contentsOf: language.queryURL!)
467+
let query = try? Query(language: language.language!, data: data)
468+
XCTAssertNotNil(query)
469+
XCTAssertNotEqual(query?.patternCount, 0)
470+
}
463471

464472
// MARK: - Zig
465473

0 commit comments

Comments
 (0)