diff --git a/CodeLanguages-Container/CodeLanguages-Container.xcodeproj/project.pbxproj b/CodeLanguages-Container/CodeLanguages-Container.xcodeproj/project.pbxproj index d711aa1..9300822 100644 --- a/CodeLanguages-Container/CodeLanguages-Container.xcodeproj/project.pbxproj +++ b/CodeLanguages-Container/CodeLanguages-Container.xcodeproj/project.pbxproj @@ -8,7 +8,6 @@ /* Begin PBXBuildFile section */ 28171CB829814CD800523F1C /* TreeSitterObjC in Frameworks */ = {isa = PBXBuildFile; productRef = 28171CB729814CD800523F1C /* TreeSitterObjC */; }; - 282C119329AA32C8004F1EA6 /* TreeSitterSQL in Frameworks */ = {isa = PBXBuildFile; productRef = 282C119229AA32C8004F1EA6 /* TreeSitterSQL */; }; 282E5977298051980064B34A /* TreeSitterYAML in Frameworks */ = {isa = PBXBuildFile; productRef = 282E5976298051980064B34A /* TreeSitterYAML */; }; 2846B262296BA1CF005F60B6 /* TreeSitterDockerfile in Frameworks */ = {isa = PBXBuildFile; productRef = 2846B261296BA1CF005F60B6 /* TreeSitterDockerfile */; }; 285BF67329AAA45B00641989 /* TreeSitterLua in Frameworks */ = {isa = PBXBuildFile; productRef = 285BF67229AAA45B00641989 /* TreeSitterLua */; }; @@ -23,22 +22,22 @@ 28B3F03C290C363E000CD04D /* TreeSitterGo in Frameworks */ = {isa = PBXBuildFile; productRef = 28B3F03B290C363E000CD04D /* TreeSitterGo */; }; 28B3F03F290C364D000CD04D /* TreeSitterGoMod in Frameworks */ = {isa = PBXBuildFile; productRef = 28B3F03E290C364D000CD04D /* TreeSitterGoMod */; }; 28B3F042290C365C000CD04D /* TreeSitterHaskell in Frameworks */ = {isa = PBXBuildFile; productRef = 28B3F041290C365C000CD04D /* TreeSitterHaskell */; }; - 28B3F045290C366E000CD04D /* TreeSitterHTML in Frameworks */ = {isa = PBXBuildFile; productRef = 28B3F044290C366E000CD04D /* TreeSitterHTML */; }; 28B3F048290C367C000CD04D /* TreeSitterJava in Frameworks */ = {isa = PBXBuildFile; productRef = 28B3F047290C367C000CD04D /* TreeSitterJava */; }; 28B3F04B290C368B000CD04D /* TreeSitterJS in Frameworks */ = {isa = PBXBuildFile; productRef = 28B3F04A290C368B000CD04D /* TreeSitterJS */; }; 28B3F04E290C3698000CD04D /* TreeSitterJSON in Frameworks */ = {isa = PBXBuildFile; productRef = 28B3F04D290C3698000CD04D /* TreeSitterJSON */; }; 28B3F051290C36B1000CD04D /* TreeSitterPHP in Frameworks */ = {isa = PBXBuildFile; productRef = 28B3F050290C36B1000CD04D /* TreeSitterPHP */; }; - 28B3F054290C36C5000CD04D /* TreeSitterPython in Frameworks */ = {isa = PBXBuildFile; productRef = 28B3F053290C36C5000CD04D /* TreeSitterPython */; }; 28B3F057290C36D5000CD04D /* TreeSitterRuby in Frameworks */ = {isa = PBXBuildFile; productRef = 28B3F056290C36D5000CD04D /* TreeSitterRuby */; }; 28B3F05A290C36E5000CD04D /* TreeSitterRust in Frameworks */ = {isa = PBXBuildFile; productRef = 28B3F059290C36E5000CD04D /* TreeSitterRust */; }; 28B3F05D290C3709000CD04D /* TreeSitterSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 28B3F05C290C3709000CD04D /* TreeSitterSwift */; }; 28B3F063290C372D000CD04D /* TreeSitterZig in Frameworks */ = {isa = PBXBuildFile; productRef = 28B3F062290C372D000CD04D /* TreeSitterZig */; }; 28B9F7AA290DDAC900245748 /* TreeSitterBash in Frameworks */ = {isa = PBXBuildFile; productRef = 28B9F7A9290DDAC900245748 /* TreeSitterBash */; }; - 6CA62EA929F9D36700785B11 /* TreeSitterTS in Frameworks */ = {isa = PBXBuildFile; productRef = 6CA62EA829F9D36700785B11 /* TreeSitterTS */; }; - 6CA62EAB29F9D36700785B11 /* TreeSitterTSX in Frameworks */ = {isa = PBXBuildFile; productRef = 6CA62EAA29F9D36700785B11 /* TreeSitterTSX */; }; 6CEC70FE29C3A85000B61C7A /* TreeSitterRegex in Frameworks */ = {isa = PBXBuildFile; productRef = 6CEC70FD29C3A85000B61C7A /* TreeSitterRegex */; }; - 7DB18E9729FDC51C00F8EC00 /* TreeSitterScala in Frameworks */ = {isa = PBXBuildFile; productRef = 7DB18E9629FDC51C00F8EC00 /* TreeSitterScala */; }; - 9D0F66222A3F522700E0F4B7 /* TreeSitterTOML in Frameworks */ = {isa = PBXBuildFile; productRef = 9D0F66212A3F522700E0F4B7 /* TreeSitterTOML */; }; + 8E74B41D2A4C88ED003A9550 /* TreeSitterHTML in Frameworks */ = {isa = PBXBuildFile; productRef = 8E74B41C2A4C88ED003A9550 /* TreeSitterHTML */; }; + 8E7B0EA92A5D9BB60040DDAB /* TreeSitterTOML in Frameworks */ = {isa = PBXBuildFile; productRef = 8E7B0EA82A5D9BB60040DDAB /* TreeSitterTOML */; }; + 8E7B8ABD2A5D916F00CFC1A7 /* TreeSitterPython in Frameworks */ = {isa = PBXBuildFile; productRef = 8E7B8ABC2A5D916F00CFC1A7 /* TreeSitterPython */; }; + 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 */; }; 9D6E74512A2B9B2A0070701E /* TreeSitterOCaml in Frameworks */ = {isa = PBXBuildFile; productRef = 9D6E74502A2B9B2A0070701E /* TreeSitterOCaml */; }; 9DB1B4362A2C0DAA0027B04E /* TreeSitterJSDoc in Frameworks */ = {isa = PBXBuildFile; productRef = 9DB1B4352A2C0DAA0027B04E /* TreeSitterJSDoc */; }; 9DFDC3662A02D9BE0023B3BC /* TreeSitterMarkdown in Frameworks */ = {isa = PBXBuildFile; productRef = 9DFDC3652A02D9BE0023B3BC /* TreeSitterMarkdown */; }; @@ -58,19 +57,18 @@ 9DFDC3662A02D9BE0023B3BC /* TreeSitterMarkdown in Frameworks */, 28B3F051290C36B1000CD04D /* TreeSitterPHP in Frameworks */, 28B3F042290C365C000CD04D /* TreeSitterHaskell in Frameworks */, + 8E7B0EA92A5D9BB60040DDAB /* TreeSitterTOML in Frameworks */, 285BF67329AAA45B00641989 /* TreeSitterLua in Frameworks */, - 6CA62EAB29F9D36700785B11 /* TreeSitterTSX in Frameworks */, + 8E87F9542A4B7DC1008C7E13 /* TreeSitterScala in Frameworks */, 9DB1B4362A2C0DAA0027B04E /* TreeSitterJSDoc in Frameworks */, 2846B262296BA1CF005F60B6 /* TreeSitterDockerfile in Frameworks */, 9D6E74512A2B9B2A0070701E /* TreeSitterOCaml in Frameworks */, - 282C119329AA32C8004F1EA6 /* TreeSitterSQL in Frameworks */, + 8EFA0B742A559F4C00021CE9 /* TreeSitterSQL in Frameworks */, 28B3F039290C362C000CD04D /* TreeSitterElixir in Frameworks */, 28B3F02D290C35D9000CD04D /* TreeSitterC in Frameworks */, 28B3F04B290C368B000CD04D /* TreeSitterJS in Frameworks */, 28B3F03C290C363E000CD04D /* TreeSitterGo in Frameworks */, - 7DB18E9729FDC51C00F8EC00 /* TreeSitterScala in Frameworks */, 28B3F05D290C3709000CD04D /* TreeSitterSwift in Frameworks */, - 9D0F66222A3F522700E0F4B7 /* TreeSitterTOML in Frameworks */, 28B9F7AA290DDAC900245748 /* TreeSitterBash in Frameworks */, 28B3F030290C35F9000CD04D /* TreeSitterCPP in Frameworks */, 28B3F04E290C3698000CD04D /* TreeSitterJSON in Frameworks */, @@ -78,15 +76,15 @@ 28B3F033290C3608000CD04D /* TreeSitterCSharp in Frameworks */, 28B3F03F290C364D000CD04D /* TreeSitterGoMod in Frameworks */, 28B3F063290C372D000CD04D /* TreeSitterZig in Frameworks */, - 28B3F045290C366E000CD04D /* TreeSitterHTML in Frameworks */, + 8E74B41D2A4C88ED003A9550 /* TreeSitterHTML in Frameworks */, + 8ED0560A2A4DBE6E00829B80 /* TreeSitterTypeScript in Frameworks */, 28B3F05A290C36E5000CD04D /* TreeSitterRust in Frameworks */, 28AAB6AE29CA57D40087654B /* TreeSitterDart in Frameworks */, - 28B3F054290C36C5000CD04D /* TreeSitterPython in Frameworks */, 28171CB829814CD800523F1C /* TreeSitterObjC in Frameworks */, 28B3F048290C367C000CD04D /* TreeSitterJava in Frameworks */, 6CEC70FE29C3A85000B61C7A /* TreeSitterRegex in Frameworks */, 282E5977298051980064B34A /* TreeSitterYAML in Frameworks */, - 6CA62EA929F9D36700785B11 /* TreeSitterTS in Frameworks */, + 8E7B8ABD2A5D916F00CFC1A7 /* TreeSitterPython in Frameworks */, 2886C788298135540023E016 /* TreeSitterKotlin in Frameworks */, 28B3F057290C36D5000CD04D /* TreeSitterRuby in Frameworks */, ); @@ -173,12 +171,10 @@ 28B3F03B290C363E000CD04D /* TreeSitterGo */, 28B3F03E290C364D000CD04D /* TreeSitterGoMod */, 28B3F041290C365C000CD04D /* TreeSitterHaskell */, - 28B3F044290C366E000CD04D /* TreeSitterHTML */, 28B3F047290C367C000CD04D /* TreeSitterJava */, 28B3F04A290C368B000CD04D /* TreeSitterJS */, 28B3F04D290C3698000CD04D /* TreeSitterJSON */, 28B3F050290C36B1000CD04D /* TreeSitterPHP */, - 28B3F053290C36C5000CD04D /* TreeSitterPython */, 28B3F056290C36D5000CD04D /* TreeSitterRuby */, 28B3F059290C36E5000CD04D /* TreeSitterRust */, 28B3F05C290C3709000CD04D /* TreeSitterSwift */, @@ -188,17 +184,18 @@ 282E5976298051980064B34A /* TreeSitterYAML */, 2886C787298135540023E016 /* TreeSitterKotlin */, 28171CB729814CD800523F1C /* TreeSitterObjC */, - 282C119229AA32C8004F1EA6 /* TreeSitterSQL */, 285BF67229AAA45B00641989 /* TreeSitterLua */, 6CEC70FD29C3A85000B61C7A /* TreeSitterRegex */, 28AAB6AD29CA57D40087654B /* TreeSitterDart */, - 6CA62EA829F9D36700785B11 /* TreeSitterTS */, - 6CA62EAA29F9D36700785B11 /* TreeSitterTSX */, - 7DB18E9629FDC51C00F8EC00 /* TreeSitterScala */, 9DFDC3652A02D9BE0023B3BC /* TreeSitterMarkdown */, 9D6E74502A2B9B2A0070701E /* TreeSitterOCaml */, 9DB1B4352A2C0DAA0027B04E /* TreeSitterJSDoc */, - 9D0F66212A3F522700E0F4B7 /* TreeSitterTOML */, + 8E87F9532A4B7DC1008C7E13 /* TreeSitterScala */, + 8E74B41C2A4C88ED003A9550 /* TreeSitterHTML */, + 8ED056092A4DBE6E00829B80 /* TreeSitterTypeScript */, + 8EFA0B732A559F4C00021CE9 /* TreeSitterSQL */, + 8E7B8ABC2A5D916F00CFC1A7 /* TreeSitterPython */, + 8E7B0EA82A5D9BB60040DDAB /* TreeSitterTOML */, ); productName = "CodeLanguages-Container"; productReference = 28B3F00C290C207D000CD04D /* CodeLanguages_Container.framework */; @@ -237,12 +234,10 @@ 28B3F03A290C363E000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-go" */, 28B3F03D290C364D000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-go-mod" */, 28B3F040290C365C000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-haskell" */, - 28B3F043290C366D000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-html" */, 28B3F046290C367C000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-java" */, 28B3F049290C368B000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-javascript" */, 28B3F04C290C3698000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-json" */, 28B3F04F290C36B1000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-php" */, - 28B3F052290C36C5000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-python" */, 28B3F055290C36D5000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-ruby" */, 28B3F058290C36E5000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-rust" */, 28B3F05B290C3709000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-swift" */, @@ -252,16 +247,18 @@ 282E5975298051980064B34A /* XCRemoteSwiftPackageReference "tree-sitter-yaml" */, 2886C786298135540023E016 /* XCRemoteSwiftPackageReference "tree-sitter-kotlin" */, 28171CB629814CD800523F1C /* XCRemoteSwiftPackageReference "tree-sitter-objc" */, - 282C119129AA32C8004F1EA6 /* XCRemoteSwiftPackageReference "tree-sitter-sql" */, 285BF67129AAA45B00641989 /* XCRemoteSwiftPackageReference "tree-sitter-lua" */, 6CEC70FC29C3A85000B61C7A /* XCRemoteSwiftPackageReference "tree-sitter-regex" */, 28AAB6AC29CA57D40087654B /* XCRemoteSwiftPackageReference "tree-sitter-dart" */, - 6CA62EA729F9D36700785B11 /* XCRemoteSwiftPackageReference "tree-sitter-typescript" */, - 7DB18E9529FDC51C00F8EC00 /* XCRemoteSwiftPackageReference "tree-sitter-scala" */, 9DFDC3642A02D9BE0023B3BC /* XCRemoteSwiftPackageReference "tree-sitter-markdown" */, 9D6E744F2A2B9B2A0070701E /* XCRemoteSwiftPackageReference "tree-sitter-ocaml" */, 9DB1B4342A2C0DA90027B04E /* XCRemoteSwiftPackageReference "tree-sitter-jsdoc" */, - 9D0F66202A3F522700E0F4B7 /* XCRemoteSwiftPackageReference "tree-sitter-toml" */, + 8E87F9522A4B7DC1008C7E13 /* XCRemoteSwiftPackageReference "tree-sitter-scala" */, + 8E74B41B2A4C88ED003A9550 /* XCRemoteSwiftPackageReference "tree-sitter-html" */, + 8ED056082A4DBE6E00829B80 /* XCRemoteSwiftPackageReference "tree-sitter-typescript" */, + 8EFA0B722A559F4C00021CE9 /* XCRemoteSwiftPackageReference "tree-sitter-sql" */, + 8E7B8ABB2A5D916F00CFC1A7 /* XCRemoteSwiftPackageReference "tree-sitter-python" */, + 8E7B0EA72A5D9BB60040DDAB /* XCRemoteSwiftPackageReference "tree-sitter-toml" */, ); productRefGroup = 28B3F00D290C207D000CD04D /* Products */; projectDirPath = ""; @@ -519,14 +516,6 @@ kind = branch; }; }; - 282C119129AA32C8004F1EA6 /* XCRemoteSwiftPackageReference "tree-sitter-sql" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/lukepistrol/tree-sitter-sql"; - requirement = { - branch = feature/spm; - kind = branch; - }; - }; 282E5975298051980064B34A /* XCRemoteSwiftPackageReference "tree-sitter-yaml" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/lukepistrol/tree-sitter-yaml.git"; @@ -631,14 +620,6 @@ kind = branch; }; }; - 28B3F043290C366D000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-html" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/mattmassicotte/tree-sitter-html.git"; - requirement = { - branch = feature/spm; - kind = branch; - }; - }; 28B3F046290C367C000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-java" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/tree-sitter/tree-sitter-java.git"; @@ -671,14 +652,6 @@ kind = branch; }; }; - 28B3F052290C36C5000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-python" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/lukepistrol/tree-sitter-python.git"; - requirement = { - branch = feature/spm; - kind = branch; - }; - }; 28B3F055290C36D5000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-ruby" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/tree-sitter/tree-sitter-ruby.git"; @@ -719,35 +692,59 @@ kind = branch; }; }; - 6CA62EA729F9D36700785B11 /* XCRemoteSwiftPackageReference "tree-sitter-typescript" */ = { + 6CEC70FC29C3A85000B61C7A /* XCRemoteSwiftPackageReference "tree-sitter-regex" */ = { isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/thecoolwinter/tree-sitter-typescript"; + repositoryURL = "https://github.com/thecoolwinter/tree-sitter-regex/"; + requirement = { + branch = feature/spm; + kind = branch; + }; + }; + 8E74B41B2A4C88ED003A9550 /* XCRemoteSwiftPackageReference "tree-sitter-html" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/tree-sitter/tree-sitter-html.git"; requirement = { branch = master; kind = branch; }; }; - 6CEC70FC29C3A85000B61C7A /* XCRemoteSwiftPackageReference "tree-sitter-regex" */ = { + 8E7B0EA72A5D9BB60040DDAB /* XCRemoteSwiftPackageReference "tree-sitter-toml" */ = { isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/thecoolwinter/tree-sitter-regex/"; + repositoryURL = "https://github.com/cengelbart39/tree-sitter-toml.git"; requirement = { branch = feature/spm; kind = branch; }; }; - 7DB18E9529FDC51C00F8EC00 /* XCRemoteSwiftPackageReference "tree-sitter-scala" */ = { + 8E7B8ABB2A5D916F00CFC1A7 /* XCRemoteSwiftPackageReference "tree-sitter-python" */ = { isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/bishabosha/tree-sitter-scala.git"; + repositoryURL = "https://github.com/tree-sitter/tree-sitter-python.git"; requirement = { - branch = feature/spm; + branch = master; kind = branch; }; }; - 9D0F66202A3F522700E0F4B7 /* XCRemoteSwiftPackageReference "tree-sitter-toml" */ = { + 8E87F9522A4B7DC1008C7E13 /* XCRemoteSwiftPackageReference "tree-sitter-scala" */ = { isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/cengelbart39/tree-sitter-toml.git"; + repositoryURL = "https://github.com/tree-sitter/tree-sitter-scala.git"; requirement = { - branch = feature/spm; + branch = master; + kind = branch; + }; + }; + 8ED056082A4DBE6E00829B80 /* XCRemoteSwiftPackageReference "tree-sitter-typescript" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/tree-sitter/tree-sitter-typescript.git"; + requirement = { + branch = master; + kind = branch; + }; + }; + 8EFA0B722A559F4C00021CE9 /* XCRemoteSwiftPackageReference "tree-sitter-sql" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/DerekStride/tree-sitter-sql.git"; + requirement = { + branch = "gh-pages"; kind = branch; }; }; @@ -783,11 +780,6 @@ package = 28171CB629814CD800523F1C /* XCRemoteSwiftPackageReference "tree-sitter-objc" */; productName = TreeSitterObjC; }; - 282C119229AA32C8004F1EA6 /* TreeSitterSQL */ = { - isa = XCSwiftPackageProductDependency; - package = 282C119129AA32C8004F1EA6 /* XCRemoteSwiftPackageReference "tree-sitter-sql" */; - productName = TreeSitterSQL; - }; 282E5976298051980064B34A /* TreeSitterYAML */ = { isa = XCSwiftPackageProductDependency; package = 282E5975298051980064B34A /* XCRemoteSwiftPackageReference "tree-sitter-yaml" */; @@ -853,11 +845,6 @@ package = 28B3F040290C365C000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-haskell" */; productName = TreeSitterHaskell; }; - 28B3F044290C366E000CD04D /* TreeSitterHTML */ = { - isa = XCSwiftPackageProductDependency; - package = 28B3F043290C366D000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-html" */; - productName = TreeSitterHTML; - }; 28B3F047290C367C000CD04D /* TreeSitterJava */ = { isa = XCSwiftPackageProductDependency; package = 28B3F046290C367C000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-java" */; @@ -878,11 +865,6 @@ package = 28B3F04F290C36B1000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-php" */; productName = TreeSitterPHP; }; - 28B3F053290C36C5000CD04D /* TreeSitterPython */ = { - isa = XCSwiftPackageProductDependency; - package = 28B3F052290C36C5000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-python" */; - productName = TreeSitterPython; - }; 28B3F056290C36D5000CD04D /* TreeSitterRuby */ = { isa = XCSwiftPackageProductDependency; package = 28B3F055290C36D5000CD04D /* XCRemoteSwiftPackageReference "tree-sitter-ruby" */; @@ -908,30 +890,40 @@ package = 28B9F7A6290DDAB500245748 /* XCRemoteSwiftPackageReference "tree-sitter-bash" */; productName = TreeSitterBash; }; - 6CA62EA829F9D36700785B11 /* TreeSitterTS */ = { + 6CEC70FD29C3A85000B61C7A /* TreeSitterRegex */ = { isa = XCSwiftPackageProductDependency; - package = 6CA62EA729F9D36700785B11 /* XCRemoteSwiftPackageReference "tree-sitter-typescript" */; - productName = TreeSitterTS; + package = 6CEC70FC29C3A85000B61C7A /* XCRemoteSwiftPackageReference "tree-sitter-regex" */; + productName = TreeSitterRegex; }; - 6CA62EAA29F9D36700785B11 /* TreeSitterTSX */ = { + 8E74B41C2A4C88ED003A9550 /* TreeSitterHTML */ = { isa = XCSwiftPackageProductDependency; - package = 6CA62EA729F9D36700785B11 /* XCRemoteSwiftPackageReference "tree-sitter-typescript" */; - productName = TreeSitterTSX; + package = 8E74B41B2A4C88ED003A9550 /* XCRemoteSwiftPackageReference "tree-sitter-html" */; + productName = TreeSitterHTML; }; - 6CEC70FD29C3A85000B61C7A /* TreeSitterRegex */ = { + 8E7B0EA82A5D9BB60040DDAB /* TreeSitterTOML */ = { isa = XCSwiftPackageProductDependency; - package = 6CEC70FC29C3A85000B61C7A /* XCRemoteSwiftPackageReference "tree-sitter-regex" */; - productName = TreeSitterRegex; + package = 8E7B0EA72A5D9BB60040DDAB /* XCRemoteSwiftPackageReference "tree-sitter-toml" */; + productName = TreeSitterTOML; + }; + 8E7B8ABC2A5D916F00CFC1A7 /* TreeSitterPython */ = { + isa = XCSwiftPackageProductDependency; + package = 8E7B8ABB2A5D916F00CFC1A7 /* XCRemoteSwiftPackageReference "tree-sitter-python" */; + productName = TreeSitterPython; }; - 7DB18E9629FDC51C00F8EC00 /* TreeSitterScala */ = { + 8E87F9532A4B7DC1008C7E13 /* TreeSitterScala */ = { isa = XCSwiftPackageProductDependency; - package = 7DB18E9529FDC51C00F8EC00 /* XCRemoteSwiftPackageReference "tree-sitter-scala" */; + package = 8E87F9522A4B7DC1008C7E13 /* XCRemoteSwiftPackageReference "tree-sitter-scala" */; productName = TreeSitterScala; }; - 9D0F66212A3F522700E0F4B7 /* TreeSitterTOML */ = { + 8ED056092A4DBE6E00829B80 /* TreeSitterTypeScript */ = { isa = XCSwiftPackageProductDependency; - package = 9D0F66202A3F522700E0F4B7 /* XCRemoteSwiftPackageReference "tree-sitter-toml" */; - productName = TreeSitterTOML; + package = 8ED056082A4DBE6E00829B80 /* XCRemoteSwiftPackageReference "tree-sitter-typescript" */; + productName = TreeSitterTypeScript; + }; + 8EFA0B732A559F4C00021CE9 /* TreeSitterSQL */ = { + isa = XCSwiftPackageProductDependency; + package = 8EFA0B722A559F4C00021CE9 /* XCRemoteSwiftPackageReference "tree-sitter-sql" */; + productName = TreeSitterSQL; }; 9D6E74502A2B9B2A0070701E /* TreeSitterOCaml */ = { isa = XCSwiftPackageProductDependency; diff --git a/CodeLanguages-Container/CodeLanguages-Container.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/CodeLanguages-Container/CodeLanguages-Container.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 0dda996..02318e1 100644 --- a/CodeLanguages-Container/CodeLanguages-Container.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/CodeLanguages-Container/CodeLanguages-Container.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -111,10 +111,10 @@ { "identity" : "tree-sitter-html", "kind" : "remoteSourceControl", - "location" : "https://github.com/mattmassicotte/tree-sitter-html.git", + "location" : "https://github.com/tree-sitter/tree-sitter-html.git", "state" : { - "branch" : "feature/spm", - "revision" : "68b8bed0c1ebecbaf1919d0a7ae4b27592e6cc45" + "branch" : "master", + "revision" : "ab91d87963c47ffd08a7967b9aa73eb53293d120" } }, { @@ -210,10 +210,10 @@ { "identity" : "tree-sitter-python", "kind" : "remoteSourceControl", - "location" : "https://github.com/lukepistrol/tree-sitter-python.git", + "location" : "https://github.com/tree-sitter/tree-sitter-python.git", "state" : { - "branch" : "feature/spm", - "revision" : "59316301dd0ebaf3771cdd5735cbe92378852680" + "branch" : "master", + "revision" : "db1d218a4f8fb87145aabeb22ca3c35925c411fc" } }, { @@ -246,19 +246,19 @@ { "identity" : "tree-sitter-scala", "kind" : "remoteSourceControl", - "location" : "https://github.com/bishabosha/tree-sitter-scala.git", + "location" : "https://github.com/tree-sitter/tree-sitter-scala.git", "state" : { - "branch" : "feature/spm", - "revision" : "d6e510497d9a16fa8e45f71908c21271566f63df" + "branch" : "master", + "revision" : "cda0de8a038b0e4ad79a97f7aa281250fcf88560" } }, { "identity" : "tree-sitter-sql", "kind" : "remoteSourceControl", - "location" : "https://github.com/lukepistrol/tree-sitter-sql", + "location" : "https://github.com/DerekStride/tree-sitter-sql.git", "state" : { - "branch" : "feature/spm", - "revision" : "fb79fdfb7413906a6ca2e0833c57d1cb38cc00f2" + "branch" : "gh-pages", + "revision" : "e08036ee4928b32fbebe55ac9336f81b7389e107" } }, { @@ -282,10 +282,10 @@ { "identity" : "tree-sitter-typescript", "kind" : "remoteSourceControl", - "location" : "https://github.com/thecoolwinter/tree-sitter-typescript", + "location" : "https://github.com/tree-sitter/tree-sitter-typescript.git", "state" : { "branch" : "master", - "revision" : "018464ed3f93fe757418316b3cc1c72198fa5b8c" + "revision" : "3429d8c77d7a83e80032667f0642e6cb19d0c772" } }, { diff --git a/CodeLanguagesContainer.xcframework.zip b/CodeLanguagesContainer.xcframework.zip index 6b4f910..1399bb3 100644 Binary files a/CodeLanguagesContainer.xcframework.zip and b/CodeLanguagesContainer.xcframework.zip differ diff --git a/README.md b/README.md index 69cbac6..2e4cea0 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ In order to add support for additional languages we have a complete guide on how | Grammar | Implemented | Syntax Highlighting | | -------------- | :---------: | :-----------------: | | [Agda](https://github.com/tree-sitter/tree-sitter-agda) | | _not available_ | -| [Bash](https://github.com/lukepistrol/tree-sitter-bash) | ✅ | ✅ | +| [Bash](https://github.com/tree-sitter/tree-sitter-bash) | ✅ | ✅ | | [C](https://github.com/tree-sitter/tree-sitter-c) | ✅ | ✅ | | [C++](https://github.com/tree-sitter/tree-sitter-cpp) | ✅ | ✅ | | [C#](https://github.com/tree-sitter/tree-sitter-c-sharp) | ✅ | ✅ | @@ -59,11 +59,11 @@ In order to add support for additional languages we have a complete guide on how | [ERB, EJS](https://github.com/tree-sitter/tree-sitter-embedded-template) | | | | [Go](https://github.com/tree-sitter/tree-sitter-go) | ✅ | ✅ | | [Haskell](https://github.com/tree-sitter/tree-sitter-haskell) | ✅ | ✅ | -| [HTML](https://github.com/mattmassicotte/tree-sitter-html) | ✅ | ✅ | +| [HTML](https://github.com/tree-sitter/tree-sitter-html) | ✅ | ✅ | | [Java](https://github.com/tree-sitter/tree-sitter-java) | ✅ | ✅ | | [JavaScript/JSX](https://github.com/tree-sitter/tree-sitter-javascript) | ✅ | ✅ | | [JSDoc](https://github.com/cengelbart39/tree-sitter-jsdoc/tree/feature/spm) | ✅ | ✅ | -| [JSON](https://github.com/mattmassicotte/tree-sitter-json) | ✅ | ✅ | +| [JSON](https://github.com/tree-sitter/tree-sitter-json) | ✅ | ✅ | | [Julia](https://github.com/tree-sitter/tree-sitter-julia) | | _not available_ | | [Kotlin](https://github.com/lukepistrol/tree-sitter-kotlin/tree/feature/spm-queries) | ✅ | ✅ | | [Lua](https://github.com/lukepistrol/tree-sitter-lua/tree/feature/spm) | ✅ | ✅ | @@ -73,12 +73,12 @@ In order to add support for additional languages we have a complete guide on how | Plain Text | ✅ | _not available_ | | [Perl](https://github.com/ganezdragon/tree-sitter-perl) | | _not available_ | | [PHP](https://github.com/tree-sitter/tree-sitter-php) | ✅ | ✅ | -| [Python](https://github.com/lukepistrol/tree-sitter-python) | ✅ | ✅ | +| [Python](https://github.com/tree-sitter/tree-sitter-python) | ✅ | ✅ | | [Regex](https://github.com/tree-sitter/tree-sitter-regex) | ✅ | ✅ | | [Ruby](https://github.com/mattmassicotte/tree-sitter-ruby) | ✅ | ✅ | | [Rust](https://github.com/tree-sitter/tree-sitter-rust) | ✅ | ✅ | | [Scala](https://github.com/tree-sitter/tree-sitter-scala) | ✅ | ✅ | -| [Sql](https://github.com/lukepistrol/tree-sitter-sql/tree/feature/spm) | ✅ | ✅ | +| [Sql](https://github.com/DerekStride/tree-sitter-sql) | ✅ | ✅ | | [Swift](https://github.com/alex-pinkus/tree-sitter-swift/tree/with-generated-files) | ✅ | ✅ | | [TOML](https://github.com/cengelbart39/tree-sitter-toml/tree/feature/spm) | ✅ | ✅ | | [TypeScript/TSX](https://github.com/tree-sitter/tree-sitter-typescript) | ✅ | ✅ | diff --git a/Sources/CodeEditLanguages/Resources/tree-sitter-html/highlights.scm b/Sources/CodeEditLanguages/Resources/tree-sitter-html/highlights.scm index 2c70a9c..ea0ff4e 100644 --- a/Sources/CodeEditLanguages/Resources/tree-sitter-html/highlights.scm +++ b/Sources/CodeEditLanguages/Resources/tree-sitter-html/highlights.scm @@ -9,4 +9,5 @@ "<" ">" "" ] @punctuation.bracket diff --git a/Sources/CodeEditLanguages/Resources/tree-sitter-scala/highlights.scm b/Sources/CodeEditLanguages/Resources/tree-sitter-scala/highlights.scm index 0703ea7..bcbdb05 100644 --- a/Sources/CodeEditLanguages/Resources/tree-sitter-scala/highlights.scm +++ b/Sources/CodeEditLanguages/Resources/tree-sitter-scala/highlights.scm @@ -236,6 +236,7 @@ "return" @keyword.return (comment) @comment @spell +(block_comment) @comment @spell ;; `case` is a conditional keyword in case_block @@ -252,3 +253,7 @@ (identifier) @function.builtin (#lua-match? @function.builtin "^super$") ) + +;; Scala CLI using directives +(using_directive_key) @parameter +(using_directive_value) @string diff --git a/Sources/CodeEditLanguages/Resources/tree-sitter-sql/highlights.scm b/Sources/CodeEditLanguages/Resources/tree-sitter-sql/highlights.scm index 03a15fe..5cb4a06 100644 --- a/Sources/CodeEditLanguages/Resources/tree-sitter-sql/highlights.scm +++ b/Sources/CodeEditLanguages/Resources/tree-sitter-sql/highlights.scm @@ -1,114 +1,349 @@ -(string) @string -(number) @number -(comment) @comment +(invocation + (object_reference + name: (identifier) @function.call)) -(function_call - function: (identifier) @function) +[ + (keyword_gist) + (keyword_btree) + (keyword_hash) + (keyword_spgist) + (keyword_gin) + (keyword_brin) + (keyword_array) +] @function.call + +(object_reference + name: (identifier) @type) + +(relation + alias: (identifier) @variable) + +(field + name: (identifier) @field) + +(term + alias: (identifier) @variable) + +((term + value: (cast + name: (keyword_cast) @function.call + parameter: [(literal)]?))) + +(literal) @string +(comment) @comment @spell +(marginalia) @comment + +((literal) @number + (#lua-match? @number "^%d+$")) + +((literal) @float +(#lua-match? @float "^[-]?%d*\.%d*$")) + +(parameter) @parameter [ - (NULL) - (TRUE) - (FALSE) -] @constant.builtin - -([ - (type_cast - (type (identifier) @type.builtin)) - (create_function_statement - (type (identifier) @type.builtin)) - (create_function_statement - (create_function_parameters - (create_function_parameter (type (identifier) @type.builtin)))) - (create_type_statement - (type_spec_composite (type (identifier) @type.builtin))) - (create_table_statement - (table_parameters - (table_column (type (identifier) @type.builtin)))) - ] - (#match? - @type.builtin - "^(bigint|BIGINT|int8|INT8|bigserial|BIGSERIAL|serial8|SERIAL8|bit|BIT|varbit|VARBIT|boolean|BOOLEAN|bool|BOOL|box|BOX|bytea|BYTEA|character|CHARACTER|char|CHAR|varchar|VARCHAR|cidr|CIDR|circle|CIRCLE|date|DATE|float8|FLOAT8|inet|INET|integer|INTEGER|int|INT|int4|INT4|interval|INTERVAL|json|JSON|jsonb|JSONB|line|LINE|lseg|LSEG|macaddr|MACADDR|money|MONEY|numeric|NUMERIC|decimal|DECIMAL|path|PATH|pg_lsn|PG_LSN|point|POINT|polygon|POLYGON|real|REAL|float4|FLOAT4|smallint|SMALLINT|int2|INT2|smallserial|SMALLSERIAL|serial2|SERIAL2|serial|SERIAL|serial4|SERIAL4|text|TEXT|time|TIME|time|TIME|timestamp|TIMESTAMP|tsquery|TSQUERY|tsvector|TSVECTOR|txid_snapshot|TXID_SNAPSHOT|enum|ENUM|range|RANGE)$")) - -(identifier) @variable + (keyword_true) + (keyword_false) +] @boolean [ - "::" + (keyword_asc) + (keyword_desc) + (keyword_terminated) + (keyword_escaped) + (keyword_unsigned) + (keyword_nulls) + (keyword_last) + (keyword_delimited) + (keyword_replication) + (keyword_auto_increment) + (keyword_default) + (keyword_collate) + (keyword_concurrently) + (keyword_engine) + (keyword_always) + (keyword_generated) + (keyword_preceding) + (keyword_following) + (keyword_first) + (keyword_current_timestamp) + (keyword_immutable) + (keyword_atomic) + (keyword_parallel) + (keyword_leakproof) + (keyword_safe) + (keyword_cost) + (keyword_strict) +] @attribute + +[ + (keyword_materialized) + (keyword_recursive) + (keyword_temp) + (keyword_temporary) + (keyword_unlogged) + (keyword_external) + (keyword_parquet) + (keyword_csv) + (keyword_rcfile) + (keyword_textfile) + (keyword_orc) + (keyword_avro) + (keyword_jsonfile) + (keyword_sequencefile) + (keyword_volatile) +] @storageclass + +[ + (keyword_case) + (keyword_when) + (keyword_then) + (keyword_else) +] @conditional + +[ + (keyword_select) + (keyword_from) + (keyword_where) + (keyword_index) + (keyword_join) + (keyword_primary) + (keyword_delete) + (keyword_create) + (keyword_insert) + (keyword_distinct) + (keyword_replace) + (keyword_update) + (keyword_into) + (keyword_overwrite) + (keyword_values) + (keyword_set) + (keyword_left) + (keyword_right) + (keyword_outer) + (keyword_inner) + (keyword_full) + (keyword_order) + (keyword_partition) + (keyword_group) + (keyword_with) + (keyword_as) + (keyword_having) + (keyword_limit) + (keyword_offset) + (keyword_table) + (keyword_tables) + (keyword_key) + (keyword_references) + (keyword_foreign) + (keyword_constraint) + (keyword_force) + (keyword_use) + (keyword_for) + (keyword_if) + (keyword_exists) + (keyword_max) + (keyword_min) + (keyword_avg) + (keyword_column) + (keyword_columns) + (keyword_cross) + (keyword_lateral) + (keyword_alter) + (keyword_drop) + (keyword_add) + (keyword_view) + (keyword_end) + (keyword_is) + (keyword_using) + (keyword_between) + (keyword_window) + (keyword_no) + (keyword_data) + (keyword_type) + (keyword_rename) + (keyword_to) + (keyword_schema) + (keyword_owner) + (keyword_all) + (keyword_any) + (keyword_some) + (keyword_returning) + (keyword_begin) + (keyword_commit) + (keyword_rollback) + (keyword_transaction) + (keyword_only) + (keyword_like) + (keyword_similar) + (keyword_over) + (keyword_change) + (keyword_modify) + (keyword_after) + (keyword_range) + (keyword_rows) + (keyword_groups) + (keyword_exclude) + (keyword_current) + (keyword_ties) + (keyword_others) + (keyword_preserve) + (keyword_zerofill) + (keyword_format) + (keyword_fields) + (keyword_row) + (keyword_sort) + (keyword_compute) + (keyword_comment) + (keyword_location) + (keyword_cached) + (keyword_uncached) + (keyword_lines) + (keyword_stored) + (keyword_partitioned) + (keyword_analyze) + (keyword_rewrite) + (keyword_optimize) + (keyword_vacuum) + (keyword_cache) + (keyword_language) + (keyword_sql) + (keyword_called) + (keyword_conflict) + (keyword_declare) + (keyword_filter) + (keyword_function) + (keyword_input) + (keyword_name) + (keyword_oid) + (keyword_options) + (keyword_plpgsql) + (keyword_precision) + (keyword_regclass) + (keyword_regnamespace) + (keyword_regproc) + (keyword_regtype) + (keyword_restricted) + (keyword_return) + (keyword_returns) + (keyword_separator) + (keyword_setof) + (keyword_stable) + (keyword_support) + (keyword_tblproperties) + (keyword_trigger) + (keyword_unsafe) +] @keyword + +[ + (keyword_restrict) + (keyword_unbounded) + (keyword_unique) + (keyword_cascade) + (keyword_delayed) + (keyword_high_priority) + (keyword_low_priority) + (keyword_ignore) + (keyword_nothing) + (keyword_check) + (keyword_option) + (keyword_local) + (keyword_cascaded) + (keyword_wait) + (keyword_nowait) + (keyword_metadata) + (keyword_incremental) + (keyword_bin_pack) + (keyword_noscan) + (keyword_stats) + (keyword_statistics) +] @type.qualifier + +[ + (keyword_int) + (keyword_null) + (keyword_boolean) + (keyword_binary) + (keyword_bit) + (keyword_inet) + (keyword_character) + (keyword_smallserial) + (keyword_serial) + (keyword_bigserial) + (keyword_smallint) + (keyword_mediumint) + (keyword_bigint) + (keyword_tinyint) + (keyword_decimal) + (keyword_float) + (keyword_double) + (keyword_numeric) + (keyword_real) + (double) + (keyword_money) + (keyword_char) + (keyword_varchar) + (keyword_varying) + (keyword_text) + (keyword_string) + (keyword_uuid) + (keyword_json) + (keyword_jsonb) + (keyword_xml) + (keyword_bytea) + (keyword_enum) + (keyword_date) + (keyword_datetime) + (keyword_timestamp) + (keyword_timestamptz) + (keyword_geometry) + (keyword_geography) + (keyword_box2d) + (keyword_box3d) + (keyword_interval) +] @type.builtin + +[ + (keyword_in) + (keyword_and) + (keyword_or) + (keyword_not) + (keyword_by) + (keyword_on) + (keyword_do) + (keyword_union) + (keyword_except) + (keyword_intersect) +] @keyword.operator + +[ + "+" + "-" + "*" + "/" + "%" + "^" + ":=" + "=" "<" "<=" - "<>" - "=" - ">" + "!=" ">=" + ">" + "<>" + "->" + "->>" + "#>" + "#>>" ] @operator [ "(" ")" - "[" - "]" ] @punctuation.bracket [ ";" + "," "." ] @punctuation.delimiter - -[ - (type) - (array_type) -] @type - -[ - (primary_key_constraint) - (unique_constraint) - (null_constraint) -] @keyword - -[ - "AND" - "AS" - "AUTO_INCREMENT" - "CREATE" - "CREATE_DOMAIN" - "CREATE_OR_REPLACE_FUNCTION" - "CREATE_SCHEMA" - "TABLE" - "TEMPORARY" - "CREATE_TYPE" - "DATABASE" - "FROM" - "GRANT" - "GROUP_BY" - "IF_NOT_EXISTS" - "INDEX" - "INNER" - "INSERT" - "INTO" - "IN" - "JOIN" - "LANGUAGE" - "LEFT" - "LOCAL" - "NOT" - "ON" - "OR" - "ORDER_BY" - "OUTER" - "PRIMARY_KEY" - "PUBLIC" - "RETURNS" - "SCHEMA" - "SELECT" - "SESSION" - "SET" - "TABLE" - "TIME_ZONE" - "TO" - "UNIQUE" - "UPDATE" - "USAGE" - "VALUES" - "WHERE" - "WITH" - "WITHOUT" -] @keyword diff --git a/Sources/CodeEditLanguages/Resources/tree-sitter-sql/indents.scm b/Sources/CodeEditLanguages/Resources/tree-sitter-sql/indents.scm new file mode 100644 index 0000000..3e61660 --- /dev/null +++ b/Sources/CodeEditLanguages/Resources/tree-sitter-sql/indents.scm @@ -0,0 +1,27 @@ +[ + (select) + (cte) + (column_definitions) + (case) + (subquery) + (insert) +] @indent.begin + + +(block + (keyword_begin) +) @indent.begin + +(column_definitions ")" @indent.branch) + +(subquery ")" @indent.branch) + +(cte ")" @indent.branch) + +[ + (keyword_end) + (keyword_values) + (keyword_into) +] @indent.branch + +(keyword_end) @indent.end