Skip to content

Commit 331d5db

Browse files
thecoolwinterthecoolwinter
authored
chore: Update Language Sources (#80)
- Bumps SwiftTreeSitter to `0.9.0` - which bumps tree-sitter to `0.23.2` - Updates language sources for sources that now support SPM on the main branch - Updates ObjC to inherit from the C grammar All updates: Language | Original User | Original Branch | New User | New Branch -- | -- | -- | -- | -- Agda | cengelbart39 | feat/spm | tree-sitter | master Dart | lukepistrol | feat/spm | UserNobody14 | master Kotlin | lukepistrol | feat/spm-queries | fwcd | main Lua | lukepistrol | feat/spm | tree-sitter-grammars | main Markdown | MDeiml | split_parser | tree-sitter-grammars | split_parser ObjC | lukepistrol | feature/spm | tree-sitter-grammars | master Regex | thecoolwinter | feature/spm | tree-sitter | master YAML | lukepistrol | feature/spm | tree-sitter-grammars | master Zig | maxxnino (no longer maintained) | master | tree-sitter-grammars | master
1 parent 5b27f13 commit 331d5db

File tree

27 files changed

+1046
-830
lines changed

27 files changed

+1046
-830
lines changed

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

Lines changed: 64 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,10 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
28171CB829814CD800523F1C /* TreeSitterObjC in Frameworks */ = {isa = PBXBuildFile; productRef = 28171CB729814CD800523F1C /* TreeSitterObjC */; };
1110
282E5977298051980064B34A /* TreeSitterYAML in Frameworks */ = {isa = PBXBuildFile; productRef = 282E5976298051980064B34A /* TreeSitterYAML */; };
1211
2846B262296BA1CF005F60B6 /* TreeSitterDockerfile in Frameworks */ = {isa = PBXBuildFile; productRef = 2846B261296BA1CF005F60B6 /* TreeSitterDockerfile */; };
1312
285BF67329AAA45B00641989 /* TreeSitterLua in Frameworks */ = {isa = PBXBuildFile; productRef = 285BF67229AAA45B00641989 /* TreeSitterLua */; };
1413
2886C788298135540023E016 /* TreeSitterKotlin in Frameworks */ = {isa = PBXBuildFile; productRef = 2886C787298135540023E016 /* TreeSitterKotlin */; };
15-
28AAB6AE29CA57D40087654B /* TreeSitterDart in Frameworks */ = {isa = PBXBuildFile; productRef = 28AAB6AD29CA57D40087654B /* TreeSitterDart */; };
1614
28B3F010290C207D000CD04D /* CodeLanguages_Container.h in Headers */ = {isa = PBXBuildFile; fileRef = 28B3F00F290C207D000CD04D /* CodeLanguages_Container.h */; settings = {ATTRIBUTES = (Public, ); }; };
1715
28B3F02D290C35D9000CD04D /* TreeSitterC in Frameworks */ = {isa = PBXBuildFile; productRef = 28B3F02C290C35D9000CD04D /* TreeSitterC */; };
1816
28B3F030290C35F9000CD04D /* TreeSitterCPP in Frameworks */ = {isa = PBXBuildFile; productRef = 28B3F02F290C35F9000CD04D /* TreeSitterCPP */; };
@@ -31,7 +29,11 @@
3129
28B3F063290C372D000CD04D /* TreeSitterZig in Frameworks */ = {isa = PBXBuildFile; productRef = 28B3F062290C372D000CD04D /* TreeSitterZig */; };
3230
28B9F7AA290DDAC900245748 /* TreeSitterBash in Frameworks */ = {isa = PBXBuildFile; productRef = 28B9F7A9290DDAC900245748 /* TreeSitterBash */; };
3331
6C0B93A82B5DD95500323006 /* TreeSitterCSS in Frameworks */ = {isa = PBXBuildFile; productRef = 6C0B93A72B5DD95500323006 /* TreeSitterCSS */; };
32+
6C7CA2AD2CE9743E006D9D9A /* TreeSitterObjc in Frameworks */ = {isa = PBXBuildFile; productRef = 6C7CA2AC2CE9743E006D9D9A /* TreeSitterObjc */; };
33+
6CE117F92CEA7BDC0082D393 /* TreeSitterDart in Frameworks */ = {isa = PBXBuildFile; productRef = 6CE117F82CEA7BDC0082D393 /* TreeSitterDart */; };
34+
6CE117FC2CEA7CF80082D393 /* TreeSitterDart in Frameworks */ = {isa = PBXBuildFile; productRef = 6CE117FB2CEA7CF80082D393 /* TreeSitterDart */; };
3435
6CEC70FE29C3A85000B61C7A /* TreeSitterRegex in Frameworks */ = {isa = PBXBuildFile; productRef = 6CEC70FD29C3A85000B61C7A /* TreeSitterRegex */; };
36+
6CF2B8412CE978F100CBE5D1 /* TreeSitterDart in Frameworks */ = {isa = PBXBuildFile; productRef = 6CF2B8402CE978F100CBE5D1 /* TreeSitterDart */; };
3537
8E74B41D2A4C88ED003A9550 /* TreeSitterHTML in Frameworks */ = {isa = PBXBuildFile; productRef = 8E74B41C2A4C88ED003A9550 /* TreeSitterHTML */; };
3638
8E7B0EA92A5D9BB60040DDAB /* TreeSitterTOML in Frameworks */ = {isa = PBXBuildFile; productRef = 8E7B0EA82A5D9BB60040DDAB /* TreeSitterTOML */; };
3739
8E7B8ABD2A5D916F00CFC1A7 /* TreeSitterPython in Frameworks */ = {isa = PBXBuildFile; productRef = 8E7B8ABC2A5D916F00CFC1A7 /* TreeSitterPython */; };
@@ -50,7 +52,6 @@
5052
/* Begin PBXFileReference section */
5153
28B3F00C290C207D000CD04D /* CodeLanguages_Container.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CodeLanguages_Container.framework; sourceTree = BUILT_PRODUCTS_DIR; };
5254
28B3F00F290C207D000CD04D /* CodeLanguages_Container.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CodeLanguages_Container.h; sourceTree = "<group>"; };
53-
28B3F017290C2097000CD04D /* CodeEditLanguages */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = CodeEditLanguages; path = ..; sourceTree = "<group>"; };
5455
/* End PBXFileReference section */
5556

5657
/* Begin PBXFrameworksBuildPhase section */
@@ -60,10 +61,12 @@
6061
files = (
6162
9DFDC3662A02D9BE0023B3BC /* TreeSitterMarkdown in Frameworks */,
6263
28B3F051290C36B1000CD04D /* TreeSitterPHP in Frameworks */,
64+
6CE117FC2CEA7CF80082D393 /* TreeSitterDart in Frameworks */,
6365
28B3F042290C365C000CD04D /* TreeSitterHaskell in Frameworks */,
6466
8E7B0EA92A5D9BB60040DDAB /* TreeSitterTOML in Frameworks */,
6567
285BF67329AAA45B00641989 /* TreeSitterLua in Frameworks */,
6668
8E87F9542A4B7DC1008C7E13 /* TreeSitterScala in Frameworks */,
69+
6CE117F92CEA7BDC0082D393 /* TreeSitterDart in Frameworks */,
6770
2846B262296BA1CF005F60B6 /* TreeSitterDockerfile in Frameworks */,
6871
9D73992A2A5A30A400CEF6E8 /* TreeSitterPerl in Frameworks */,
6972
9D6E74512A2B9B2A0070701E /* TreeSitterOCaml in Frameworks */,
@@ -84,15 +87,15 @@
8487
8E74B41D2A4C88ED003A9550 /* TreeSitterHTML in Frameworks */,
8588
8ED0560A2A4DBE6E00829B80 /* TreeSitterTypeScript in Frameworks */,
8689
28B3F05A290C36E5000CD04D /* TreeSitterRust in Frameworks */,
87-
28AAB6AE29CA57D40087654B /* TreeSitterDart in Frameworks */,
88-
28171CB829814CD800523F1C /* TreeSitterObjC in Frameworks */,
90+
6C7CA2AD2CE9743E006D9D9A /* TreeSitterObjc in Frameworks */,
8991
28B3F048290C367C000CD04D /* TreeSitterJava in Frameworks */,
9092
6CEC70FE29C3A85000B61C7A /* TreeSitterRegex in Frameworks */,
9193
282E5977298051980064B34A /* TreeSitterYAML in Frameworks */,
9294
9D7399242A5A245000CEF6E8 /* TreeSitterAgda in Frameworks */,
9395
8E7B8ABD2A5D916F00CFC1A7 /* TreeSitterPython in Frameworks */,
9496
2886C788298135540023E016 /* TreeSitterKotlin in Frameworks */,
9597
9D920B982A93B248004E4451 /* TreeSitterJSDoc in Frameworks */,
98+
6CF2B8412CE978F100CBE5D1 /* TreeSitterDart in Frameworks */,
9699
6C0B93A82B5DD95500323006 /* TreeSitterCSS in Frameworks */,
97100
28B3F057290C36D5000CD04D /* TreeSitterRuby in Frameworks */,
98101
);
@@ -104,7 +107,6 @@
104107
28B3F002290C207D000CD04D = {
105108
isa = PBXGroup;
106109
children = (
107-
28B3F016290C2097000CD04D /* Packages */,
108110
28B3F00E290C207D000CD04D /* CodeLanguages-Container */,
109111
28B3F00D290C207D000CD04D /* Products */,
110112
28B3F018290C20CF000CD04D /* Frameworks */,
@@ -127,14 +129,6 @@
127129
path = "CodeLanguages-Container";
128130
sourceTree = "<group>";
129131
};
130-
28B3F016290C2097000CD04D /* Packages */ = {
131-
isa = PBXGroup;
132-
children = (
133-
28B3F017290C2097000CD04D /* CodeEditLanguages */,
134-
);
135-
name = Packages;
136-
sourceTree = "<group>";
137-
};
138132
28B3F018290C20CF000CD04D /* Frameworks */ = {
139133
isa = PBXGroup;
140134
children = (
@@ -190,10 +184,8 @@
190184
2846B261296BA1CF005F60B6 /* TreeSitterDockerfile */,
191185
282E5976298051980064B34A /* TreeSitterYAML */,
192186
2886C787298135540023E016 /* TreeSitterKotlin */,
193-
28171CB729814CD800523F1C /* TreeSitterObjC */,
194187
285BF67229AAA45B00641989 /* TreeSitterLua */,
195188
6CEC70FD29C3A85000B61C7A /* TreeSitterRegex */,
196-
28AAB6AD29CA57D40087654B /* TreeSitterDart */,
197189
9DFDC3652A02D9BE0023B3BC /* TreeSitterMarkdown */,
198190
9D6E74502A2B9B2A0070701E /* TreeSitterOCaml */,
199191
9D7399232A5A245000CEF6E8 /* TreeSitterAgda */,
@@ -208,6 +200,10 @@
208200
8E7B0EA82A5D9BB60040DDAB /* TreeSitterTOML */,
209201
9D920B972A93B248004E4451 /* TreeSitterJSDoc */,
210202
6C0B93A72B5DD95500323006 /* TreeSitterCSS */,
203+
6C7CA2AC2CE9743E006D9D9A /* TreeSitterObjc */,
204+
6CF2B8402CE978F100CBE5D1 /* TreeSitterDart */,
205+
6CE117F82CEA7BDC0082D393 /* TreeSitterDart */,
206+
6CE117FB2CEA7CF80082D393 /* TreeSitterDart */,
211207
);
212208
productName = "CodeLanguages-Container";
213209
productReference = 28B3F00C290C207D000CD04D /* CodeLanguages_Container.framework */;
@@ -257,10 +253,8 @@
257253
2846B260296BA1CF005F60B6 /* XCRemoteSwiftPackageReference "tree-sitter-dockerfile" */,
258254
282E5975298051980064B34A /* XCRemoteSwiftPackageReference "tree-sitter-yaml" */,
259255
2886C786298135540023E016 /* XCRemoteSwiftPackageReference "tree-sitter-kotlin" */,
260-
28171CB629814CD800523F1C /* XCRemoteSwiftPackageReference "tree-sitter-objc" */,
261256
285BF67129AAA45B00641989 /* XCRemoteSwiftPackageReference "tree-sitter-lua" */,
262257
6CEC70FC29C3A85000B61C7A /* XCRemoteSwiftPackageReference "tree-sitter-regex" */,
263-
28AAB6AC29CA57D40087654B /* XCRemoteSwiftPackageReference "tree-sitter-dart" */,
264258
9DFDC3642A02D9BE0023B3BC /* XCRemoteSwiftPackageReference "tree-sitter-markdown" */,
265259
9D6E744F2A2B9B2A0070701E /* XCRemoteSwiftPackageReference "tree-sitter-ocaml" */,
266260
9D7399222A5A245000CEF6E8 /* XCRemoteSwiftPackageReference "tree-sitter-agda" */,
@@ -275,6 +269,8 @@
275269
8E7B0EA72A5D9BB60040DDAB /* XCRemoteSwiftPackageReference "tree-sitter-toml" */,
276270
9D920B962A93B248004E4451 /* XCRemoteSwiftPackageReference "tree-sitter-jsdoc" */,
277271
6C0B93A62B5DD95500323006 /* XCRemoteSwiftPackageReference "tree-sitter-css" */,
272+
6C7CA2AB2CE9743E006D9D9A /* XCRemoteSwiftPackageReference "tree-sitter-objc" */,
273+
6CE117FA2CEA7CF80082D393 /* XCRemoteSwiftPackageReference "tree-sitter-dart" */,
278274
);
279275
productRefGroup = 28B3F00D290C207D000CD04D /* Products */;
280276
projectDirPath = "";
@@ -524,19 +520,11 @@
524520
/* End XCConfigurationList section */
525521

526522
/* Begin XCRemoteSwiftPackageReference section */
527-
28171CB629814CD800523F1C /* XCRemoteSwiftPackageReference "tree-sitter-objc" */ = {
528-
isa = XCRemoteSwiftPackageReference;
529-
repositoryURL = "https://github.com/lukepistrol/tree-sitter-objc";
530-
requirement = {
531-
branch = feature/spm;
532-
kind = branch;
533-
};
534-
};
535523
282E5975298051980064B34A /* XCRemoteSwiftPackageReference "tree-sitter-yaml" */ = {
536524
isa = XCRemoteSwiftPackageReference;
537-
repositoryURL = "https://github.com/lukepistrol/tree-sitter-yaml.git";
525+
repositoryURL = "https://github.com/tree-sitter-grammars/tree-sitter-yaml.git";
538526
requirement = {
539-
branch = feature/spm;
527+
branch = master;
540528
kind = branch;
541529
};
542530
};
@@ -550,25 +538,17 @@
550538
};
551539
285BF67129AAA45B00641989 /* XCRemoteSwiftPackageReference "tree-sitter-lua" */ = {
552540
isa = XCRemoteSwiftPackageReference;
553-
repositoryURL = "https://github.com/lukepistrol/tree-sitter-lua.git";
541+
repositoryURL = "https://github.com/tree-sitter-grammars/tree-sitter-lua";
554542
requirement = {
555-
branch = feature/spm;
543+
branch = main;
556544
kind = branch;
557545
};
558546
};
559547
2886C786298135540023E016 /* XCRemoteSwiftPackageReference "tree-sitter-kotlin" */ = {
560548
isa = XCRemoteSwiftPackageReference;
561-
repositoryURL = "https://github.com/lukepistrol/tree-sitter-kotlin";
549+
repositoryURL = "https://github.com/fwcd/tree-sitter-kotlin";
562550
requirement = {
563-
branch = "feature/spm-queries";
564-
kind = branch;
565-
};
566-
};
567-
28AAB6AC29CA57D40087654B /* XCRemoteSwiftPackageReference "tree-sitter-dart" */ = {
568-
isa = XCRemoteSwiftPackageReference;
569-
repositoryURL = "https://github.com/lukepistrol/tree-sitter-dart.git";
570-
requirement = {
571-
branch = feature/spm;
551+
branch = main;
572552
kind = branch;
573553
};
574554
};
@@ -686,9 +666,9 @@
686666
};
687667
28B3F061290C372D000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-zig" */ = {
688668
isa = XCRemoteSwiftPackageReference;
689-
repositoryURL = "https://github.com/maxxnino/tree-sitter-zig.git";
669+
repositoryURL = "https://github.com/tree-sitter-grammars/tree-sitter-zig.git";
690670
requirement = {
691-
branch = main;
671+
branch = master;
692672
kind = branch;
693673
};
694674
};
@@ -702,17 +682,33 @@
702682
};
703683
6C0B93A62B5DD95500323006 /* XCRemoteSwiftPackageReference "tree-sitter-css" */ = {
704684
isa = XCRemoteSwiftPackageReference;
705-
repositoryURL = "https://github.com/tree-sitter/tree-sitter-css";
685+
repositoryURL = "https://github.com/tree-sitter/tree-sitter-css.git";
686+
requirement = {
687+
branch = master;
688+
kind = branch;
689+
};
690+
};
691+
6C7CA2AB2CE9743E006D9D9A /* XCRemoteSwiftPackageReference "tree-sitter-objc" */ = {
692+
isa = XCRemoteSwiftPackageReference;
693+
repositoryURL = "https://github.com/tree-sitter-grammars/tree-sitter-objc";
694+
requirement = {
695+
branch = master;
696+
kind = branch;
697+
};
698+
};
699+
6CE117FA2CEA7CF80082D393 /* XCRemoteSwiftPackageReference "tree-sitter-dart" */ = {
700+
isa = XCRemoteSwiftPackageReference;
701+
repositoryURL = "https://github.com/UserNobody14/tree-sitter-dart.git";
706702
requirement = {
707703
branch = master;
708704
kind = branch;
709705
};
710706
};
711707
6CEC70FC29C3A85000B61C7A /* XCRemoteSwiftPackageReference "tree-sitter-regex" */ = {
712708
isa = XCRemoteSwiftPackageReference;
713-
repositoryURL = "https://github.com/thecoolwinter/tree-sitter-regex/";
709+
repositoryURL = "https://github.com/tree-sitter/tree-sitter-regex.git";
714710
requirement = {
715-
branch = feature/spm;
711+
branch = master;
716712
kind = branch;
717713
};
718714
};
@@ -774,9 +770,9 @@
774770
};
775771
9D7399222A5A245000CEF6E8 /* XCRemoteSwiftPackageReference "tree-sitter-agda" */ = {
776772
isa = XCRemoteSwiftPackageReference;
777-
repositoryURL = "https://github.com/cengelbart39/tree-sitter-agda.git";
773+
repositoryURL = "https://github.com/tree-sitter/tree-sitter-agda.git";
778774
requirement = {
779-
branch = feat/spm;
775+
branch = master;
780776
kind = branch;
781777
};
782778
};
@@ -814,20 +810,15 @@
814810
};
815811
9DFDC3642A02D9BE0023B3BC /* XCRemoteSwiftPackageReference "tree-sitter-markdown" */ = {
816812
isa = XCRemoteSwiftPackageReference;
817-
repositoryURL = "https://github.com/MDeiml/tree-sitter-markdown";
813+
repositoryURL = "https://github.com/tree-sitter-grammars/tree-sitter-markdown";
818814
requirement = {
819-
kind = exactVersion;
820-
version = 0.1.5;
815+
branch = split_parser;
816+
kind = branch;
821817
};
822818
};
823819
/* End XCRemoteSwiftPackageReference section */
824820

825821
/* Begin XCSwiftPackageProductDependency section */
826-
28171CB729814CD800523F1C /* TreeSitterObjC */ = {
827-
isa = XCSwiftPackageProductDependency;
828-
package = 28171CB629814CD800523F1C /* XCRemoteSwiftPackageReference "tree-sitter-objc" */;
829-
productName = TreeSitterObjC;
830-
};
831822
282E5976298051980064B34A /* TreeSitterYAML */ = {
832823
isa = XCSwiftPackageProductDependency;
833824
package = 282E5975298051980064B34A /* XCRemoteSwiftPackageReference "tree-sitter-yaml" */;
@@ -848,11 +839,6 @@
848839
package = 2886C786298135540023E016 /* XCRemoteSwiftPackageReference "tree-sitter-kotlin" */;
849840
productName = TreeSitterKotlin;
850841
};
851-
28AAB6AD29CA57D40087654B /* TreeSitterDart */ = {
852-
isa = XCSwiftPackageProductDependency;
853-
package = 28AAB6AC29CA57D40087654B /* XCRemoteSwiftPackageReference "tree-sitter-dart" */;
854-
productName = TreeSitterDart;
855-
};
856842
28B3F02C290C35D9000CD04D /* TreeSitterC */ = {
857843
isa = XCSwiftPackageProductDependency;
858844
package = 28B3F02B290C35D9000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-c" */;
@@ -938,11 +924,29 @@
938924
package = 6C0B93A62B5DD95500323006 /* XCRemoteSwiftPackageReference "tree-sitter-css" */;
939925
productName = TreeSitterCSS;
940926
};
927+
6C7CA2AC2CE9743E006D9D9A /* TreeSitterObjc */ = {
928+
isa = XCSwiftPackageProductDependency;
929+
package = 6C7CA2AB2CE9743E006D9D9A /* XCRemoteSwiftPackageReference "tree-sitter-objc" */;
930+
productName = TreeSitterObjc;
931+
};
932+
6CE117F82CEA7BDC0082D393 /* TreeSitterDart */ = {
933+
isa = XCSwiftPackageProductDependency;
934+
productName = TreeSitterDart;
935+
};
936+
6CE117FB2CEA7CF80082D393 /* TreeSitterDart */ = {
937+
isa = XCSwiftPackageProductDependency;
938+
package = 6CE117FA2CEA7CF80082D393 /* XCRemoteSwiftPackageReference "tree-sitter-dart" */;
939+
productName = TreeSitterDart;
940+
};
941941
6CEC70FD29C3A85000B61C7A /* TreeSitterRegex */ = {
942942
isa = XCSwiftPackageProductDependency;
943943
package = 6CEC70FC29C3A85000B61C7A /* XCRemoteSwiftPackageReference "tree-sitter-regex" */;
944944
productName = TreeSitterRegex;
945945
};
946+
6CF2B8402CE978F100CBE5D1 /* TreeSitterDart */ = {
947+
isa = XCSwiftPackageProductDependency;
948+
productName = TreeSitterDart;
949+
};
946950
8E74B41C2A4C88ED003A9550 /* TreeSitterHTML */ = {
947951
isa = XCSwiftPackageProductDependency;
948952
package = 8E74B41B2A4C88ED003A9550 /* XCRemoteSwiftPackageReference "tree-sitter-html" */;

0 commit comments

Comments
 (0)