Skip to content

Commit 4f16de3

Browse files
authored
Merge pull request #3 from lukepistrol/chore/update-bash-dependency
[chore]: using tree-sitter-bash master branch now
2 parents 1911c6c + efe22db commit 4f16de3

File tree

4 files changed

+20
-21
lines changed

4 files changed

+20
-21
lines changed

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
/* Begin PBXBuildFile section */
1010
28B3F010290C207D000CD04D /* CodeLanguages_Container.h in Headers */ = {isa = PBXBuildFile; fileRef = 28B3F00F290C207D000CD04D /* CodeLanguages_Container.h */; settings = {ATTRIBUTES = (Public, ); }; };
11-
28B3F02A290C3570000CD04D /* TreeSitterBash in Frameworks */ = {isa = PBXBuildFile; productRef = 28B3F029290C3570000CD04D /* TreeSitterBash */; };
1211
28B3F02D290C35D9000CD04D /* TreeSitterC in Frameworks */ = {isa = PBXBuildFile; productRef = 28B3F02C290C35D9000CD04D /* TreeSitterC */; };
1312
28B3F030290C35F9000CD04D /* TreeSitterCPP in Frameworks */ = {isa = PBXBuildFile; productRef = 28B3F02F290C35F9000CD04D /* TreeSitterCPP */; };
1413
28B3F033290C3608000CD04D /* TreeSitterCSharp in Frameworks */ = {isa = PBXBuildFile; productRef = 28B3F032290C3608000CD04D /* TreeSitterCSharp */; };
@@ -28,6 +27,7 @@
2827
28B3F05D290C3709000CD04D /* TreeSitterSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 28B3F05C290C3709000CD04D /* TreeSitterSwift */; };
2928
28B3F060290C3720000CD04D /* TreeSitterYAML in Frameworks */ = {isa = PBXBuildFile; productRef = 28B3F05F290C3720000CD04D /* TreeSitterYAML */; };
3029
28B3F063290C372D000CD04D /* TreeSitterZig in Frameworks */ = {isa = PBXBuildFile; productRef = 28B3F062290C372D000CD04D /* TreeSitterZig */; };
30+
28B9F7AA290DDAC900245748 /* TreeSitterBash in Frameworks */ = {isa = PBXBuildFile; productRef = 28B9F7A9290DDAC900245748 /* TreeSitterBash */; };
3131
/* End PBXBuildFile section */
3232

3333
/* Begin PBXFileReference section */
@@ -48,9 +48,9 @@
4848
28B3F04B290C368B000CD04D /* TreeSitterJS in Frameworks */,
4949
28B3F03C290C363E000CD04D /* TreeSitterGo in Frameworks */,
5050
28B3F05D290C3709000CD04D /* TreeSitterSwift in Frameworks */,
51+
28B9F7AA290DDAC900245748 /* TreeSitterBash in Frameworks */,
5152
28B3F030290C35F9000CD04D /* TreeSitterCPP in Frameworks */,
5253
28B3F04E290C3698000CD04D /* TreeSitterJSON in Frameworks */,
53-
28B3F02A290C3570000CD04D /* TreeSitterBash in Frameworks */,
5454
28B3F036290C361D000CD04D /* TreeSitterCSS in Frameworks */,
5555
28B3F033290C3608000CD04D /* TreeSitterCSharp in Frameworks */,
5656
28B3F03F290C364D000CD04D /* TreeSitterGoMod in Frameworks */,
@@ -137,7 +137,6 @@
137137
);
138138
name = "CodeLanguages-Container";
139139
packageProductDependencies = (
140-
28B3F029290C3570000CD04D /* TreeSitterBash */,
141140
28B3F02C290C35D9000CD04D /* TreeSitterC */,
142141
28B3F02F290C35F9000CD04D /* TreeSitterCPP */,
143142
28B3F032290C3608000CD04D /* TreeSitterCSharp */,
@@ -157,6 +156,7 @@
157156
28B3F05C290C3709000CD04D /* TreeSitterSwift */,
158157
28B3F05F290C3720000CD04D /* TreeSitterYAML */,
159158
28B3F062290C372D000CD04D /* TreeSitterZig */,
159+
28B9F7A9290DDAC900245748 /* TreeSitterBash */,
160160
);
161161
productName = "CodeLanguages-Container";
162162
productReference = 28B3F00C290C207D000CD04D /* CodeLanguages_Container.framework */;
@@ -187,7 +187,6 @@
187187
);
188188
mainGroup = 28B3F002290C207D000CD04D;
189189
packageReferences = (
190-
28B3F028290C3570000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-bash" */,
191190
28B3F02B290C35D9000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-c" */,
192191
28B3F02E290C35F9000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-cpp" */,
193192
28B3F031290C3608000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-c-sharp" */,
@@ -207,6 +206,7 @@
207206
28B3F05B290C3709000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-swift" */,
208207
28B3F05E290C3720000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-yaml" */,
209208
28B3F061290C372D000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-zig" */,
209+
28B9F7A6290DDAB500245748 /* XCRemoteSwiftPackageReference "tree-sitter-bash" */,
210210
);
211211
productRefGroup = 28B3F00D290C207D000CD04D /* Products */;
212212
projectDirPath = "";
@@ -446,14 +446,6 @@
446446
/* End XCConfigurationList section */
447447

448448
/* Begin XCRemoteSwiftPackageReference section */
449-
28B3F028290C3570000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-bash" */ = {
450-
isa = XCRemoteSwiftPackageReference;
451-
repositoryURL = "https://github.com/lukepistrol/tree-sitter-bash.git";
452-
requirement = {
453-
branch = feature/spm;
454-
kind = branch;
455-
};
456-
};
457449
28B3F02B290C35D9000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-c" */ = {
458450
isa = XCRemoteSwiftPackageReference;
459451
repositoryURL = "https://github.com/tree-sitter/tree-sitter-c.git";
@@ -606,14 +598,17 @@
606598
kind = branch;
607599
};
608600
};
601+
28B9F7A6290DDAB500245748 /* XCRemoteSwiftPackageReference "tree-sitter-bash" */ = {
602+
isa = XCRemoteSwiftPackageReference;
603+
repositoryURL = "https://github.com/tree-sitter/tree-sitter-bash.git";
604+
requirement = {
605+
branch = master;
606+
kind = branch;
607+
};
608+
};
609609
/* End XCRemoteSwiftPackageReference section */
610610

611611
/* Begin XCSwiftPackageProductDependency section */
612-
28B3F029290C3570000CD04D /* TreeSitterBash */ = {
613-
isa = XCSwiftPackageProductDependency;
614-
package = 28B3F028290C3570000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-bash" */;
615-
productName = TreeSitterBash;
616-
};
617612
28B3F02C290C35D9000CD04D /* TreeSitterC */ = {
618613
isa = XCSwiftPackageProductDependency;
619614
package = 28B3F02B290C35D9000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-c" */;
@@ -709,6 +704,11 @@
709704
package = 28B3F061290C372D000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-zig" */;
710705
productName = TreeSitterZig;
711706
};
707+
28B9F7A9290DDAC900245748 /* TreeSitterBash */ = {
708+
isa = XCSwiftPackageProductDependency;
709+
package = 28B9F7A6290DDAB500245748 /* XCRemoteSwiftPackageReference "tree-sitter-bash" */;
710+
productName = TreeSitterBash;
711+
};
712712
/* End XCSwiftPackageProductDependency section */
713713
};
714714
rootObject = 28B3F003290C207D000CD04D /* Project object */;

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.
-85.1 KB
Binary file not shown.

Sources/CodeEditLanguages/Resources/tree-sitter-bash/highlights.scm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
">>"
4747
"<"
4848
"|"
49-
(expansion_flags)
5049
] @operator
5150

5251
(

0 commit comments

Comments
 (0)