- Update to offical tree-sitter-embedded-template

- Fix build issues from merge
CodeEditApp · May 7, 2024 · 35dcdbc · 35dcdbc
1 parent 5f44a69
commit 35dcdbc
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/CodeLanguages-Container/CodeLanguages-Container.xcodeproj/project.pbxproj b/CodeLanguages-Container/CodeLanguages-Container.xcodeproj/project.pbxproj
@@ -38,7 +38,7 @@
 		8E87F9542A4B7DC1008C7E13 /* TreeSitterScala in Frameworks */ = {isa = PBXBuildFile; productRef = 8E87F9532A4B7DC1008C7E13 /* TreeSitterScala */; };
 		8ED0560A2A4DBE6E00829B80 /* TreeSitterTypeScript in Frameworks */ = {isa = PBXBuildFile; productRef = 8ED056092A4DBE6E00829B80 /* TreeSitterTypeScript */; };
 		8EFA0B742A559F4C00021CE9 /* TreeSitterSQL in Frameworks */ = {isa = PBXBuildFile; productRef = 8EFA0B732A559F4C00021CE9 /* TreeSitterSQL */; };
-		9D6CA7462AB375610090E3BC /* TreeSitterEmbeddedTemplate in Frameworks */ = {isa = PBXBuildFile; productRef = 9D6CA7452AB375610090E3BC /* TreeSitterEmbeddedTemplate */; };
+		9D01902E2BEA98B2001DFE97 /* TreeSitterEmbeddedTemplate in Frameworks */ = {isa = PBXBuildFile; productRef = 9D01902D2BEA98B2001DFE97 /* TreeSitterEmbeddedTemplate */; };
 		9D6E74512A2B9B2A0070701E /* TreeSitterOCaml in Frameworks */ = {isa = PBXBuildFile; productRef = 9D6E74502A2B9B2A0070701E /* TreeSitterOCaml */; };
 		9D7399242A5A245000CEF6E8 /* TreeSitterAgda in Frameworks */ = {isa = PBXBuildFile; productRef = 9D7399232A5A245000CEF6E8 /* TreeSitterAgda */; };
 		9D7399272A5A2B5300CEF6E8 /* TreeSitterJulia in Frameworks */ = {isa = PBXBuildFile; productRef = 9D7399262A5A2B5300CEF6E8 /* TreeSitterJulia */; };
@@ -83,8 +83,8 @@
 				28B3F063290C372D000CD04D /* TreeSitterZig in Frameworks */,
 				9D7399272A5A2B5300CEF6E8 /* TreeSitterJulia in Frameworks */,
 				8E74B41D2A4C88ED003A9550 /* TreeSitterHTML in Frameworks */,
-				9D6CA7462AB375610090E3BC /* TreeSitterEmbeddedTemplate in Frameworks */,
 				8ED0560A2A4DBE6E00829B80 /* TreeSitterTypeScript in Frameworks */,
+				9D01902E2BEA98B2001DFE97 /* TreeSitterEmbeddedTemplate in Frameworks */,
 				28B3F05A290C36E5000CD04D /* TreeSitterRust in Frameworks */,
 				28AAB6AE29CA57D40087654B /* TreeSitterDart in Frameworks */,
 				28171CB829814CD800523F1C /* TreeSitterObjC in Frameworks */,
@@ -209,8 +209,8 @@
 				8E7B8ABC2A5D916F00CFC1A7 /* TreeSitterPython */,
 				8E7B0EA82A5D9BB60040DDAB /* TreeSitterTOML */,
 				9D920B972A93B248004E4451 /* TreeSitterJSDoc */,
-				9D6CA7452AB375610090E3BC /* TreeSitterEmbeddedTemplate */,
 				6C0B93A72B5DD95500323006 /* TreeSitterCSS */,
+				9D01902D2BEA98B2001DFE97 /* TreeSitterEmbeddedTemplate */,
 			);
 			productName = "CodeLanguages-Container";
 			productReference = 28B3F00C290C207D000CD04D /* CodeLanguages_Container.framework */;
@@ -277,8 +277,8 @@
 				8E7B8ABB2A5D916F00CFC1A7 /* XCRemoteSwiftPackageReference "tree-sitter-python" */,
 				8E7B0EA72A5D9BB60040DDAB /* XCRemoteSwiftPackageReference "tree-sitter-toml" */,
 				9D920B962A93B248004E4451 /* XCRemoteSwiftPackageReference "tree-sitter-jsdoc" */,
-				9D6CA7442AB375610090E3BC /* XCRemoteSwiftPackageReference "tree-sitter-embedded-template" */,
 				6C0B93A62B5DD95500323006 /* XCRemoteSwiftPackageReference "tree-sitter-css" */,
+				9D01902C2BEA98B2001DFE97 /* XCRemoteSwiftPackageReference "tree-sitter-embedded-template" */,
 			);
 			productRefGroup = 28B3F00D290C207D000CD04D /* Products */;
 			projectDirPath = "";
@@ -768,11 +768,11 @@
 				kind = branch;
 			};
 		};
-		9D6CA7442AB375610090E3BC /* XCRemoteSwiftPackageReference "tree-sitter-embedded-template" */ = {
+		9D01902C2BEA98B2001DFE97 /* XCRemoteSwiftPackageReference "tree-sitter-embedded-template" */ = {
 			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/cengelbart39/tree-sitter-embedded-template.git";
+			repositoryURL = "https://github.com/tree-sitter/tree-sitter-embedded-template.git";
 			requirement = {
-				branch = feature/spm;
+				branch = master;
 				kind = branch;
 			};
 		};
@@ -985,9 +985,9 @@
 			package = 8EFA0B722A559F4C00021CE9 /* XCRemoteSwiftPackageReference "tree-sitter-sql" */;
 			productName = TreeSitterSQL;
 		};
-		9D6CA7452AB375610090E3BC /* TreeSitterEmbeddedTemplate */ = {
+		9D01902D2BEA98B2001DFE97 /* TreeSitterEmbeddedTemplate */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 9D6CA7442AB375610090E3BC /* XCRemoteSwiftPackageReference "tree-sitter-embedded-template" */;
+			package = 9D01902C2BEA98B2001DFE97 /* XCRemoteSwiftPackageReference "tree-sitter-embedded-template" */;
 			productName = TreeSitterEmbeddedTemplate;
 		};
 		9D6E74502A2B9B2A0070701E /* TreeSitterOCaml */ = {

diff --git a/...deLanguages-Container.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/...deLanguages-Container.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -93,10 +93,10 @@
     {
       "identity" : "tree-sitter-embedded-template",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/cengelbart39/tree-sitter-embedded-template.git",
+      "location" : "https://github.com/tree-sitter/tree-sitter-embedded-template.git",
       "state" : {
-        "branch" : "feature/spm",
-        "revision" : "b1a6a54585f43d1429d5d178de91f691abda668c"
+        "branch" : "master",
+        "revision" : "38d5004a797298dc42c85e7706c5ceac46a3f29f"
       }
     },
     {

diff --git a/CodeLanguagesContainer.xcframework.zip b/CodeLanguagesContainer.xcframework.zip
diff --git a/Sources/CodeEditLanguages/CodeLanguage+Definitions.swift b/Sources/CodeEditLanguages/CodeLanguage+Definitions.swift
@@ -138,6 +138,8 @@ public extension CodeLanguage {
         id: .ejs,
         tsName: "embedded-template",
         extensions: ["ejs"],
+        lineCommentString: "",
+        rangeCommentStrings: ("", ""),
         highlights: ["injections-ejs"]
     )
 
@@ -157,6 +159,8 @@ public extension CodeLanguage {
         id: .erb,
         tsName: "embedded-template",
         extensions: ["erb"],
+        lineCommentString: "",
+        rangeCommentStrings: ("", ""),
         highlights: ["injections-erb"]
     )