Moves query files to fix build errors (simonbs#20)

Author: simonbs

Package.swift

@@ -123,112 +123,112 @@ let package = Package(
     targets: [
         .target(name: "TreeSitterLanguagesCommon"),
         .target(name: "TreeSitterAstro", cSettings: [.headerSearchPath("src")]),
-        .target(name: "TreeSitterAstroQueries", resources: [.copy("queries")]),
+        .target(name: "TreeSitterAstroQueries", resources: [.copy("highlights.scm"), .copy("injections.scm")]),
         .target(name: "TreeSitterAstroRunestone", dependencies: ["Runestone", "TreeSitterAstro", "TreeSitterAstroQueries"]),
         .target(name: "TreeSitterBash", cSettings: [.headerSearchPath("src")]),
-        .target(name: "TreeSitterBashQueries", resources: [.copy("queries")]),
+        .target(name: "TreeSitterBashQueries", resources: [.copy("highlights.scm")]),
         .target(name: "TreeSitterBashRunestone", dependencies: ["Runestone", "TreeSitterBash", "TreeSitterBashQueries"]),
         .target(name: "TreeSitterC", cSettings: [.headerSearchPath("src")]),
-        .target(name: "TreeSitterCQueries", resources: [.copy("queries")]),
+        .target(name: "TreeSitterCQueries", resources: [.copy("highlights.scm")]),
         .target(name: "TreeSitterCRunestone", dependencies: ["Runestone", "TreeSitterC", "TreeSitterCQueries"]),
         .target(name: "TreeSitterComment", exclude: ["src/tree_sitter_comment/chars.c", "src/tree_sitter_comment/parser.c"], cSettings: [.headerSearchPath("src")]),
-        .target(name: "TreeSitterCommentQueries", resources: [.copy("queries")]),
+        .target(name: "TreeSitterCommentQueries", resources: [.copy("highlights.scm")]),
         .target(name: "TreeSitterCommentRunestone", dependencies: ["Runestone", "TreeSitterComment", "TreeSitterCommentQueries"]),
         .target(name: "TreeSitterCSharp", cSettings: [.headerSearchPath("src")]),
-        .target(name: "TreeSitterCSharpQueries", resources: [.copy("queries")]),
+        .target(name: "TreeSitterCSharpQueries", resources: [.copy("highlights.scm"), .copy("tags.scm")]),
         .target(name: "TreeSitterCSharpRunestone", dependencies: ["Runestone", "TreeSitterCSharp", "TreeSitterCSharpQueries"]),
         .target(name: "TreeSitterCPP", cSettings: [.headerSearchPath("src")]),
-        .target(name: "TreeSitterCPPQueries", resources: [.copy("queries")]),
+        .target(name: "TreeSitterCPPQueries", resources: [.copy("highlights.scm")]),
         .target(name: "TreeSitterCPPRunestone", dependencies: ["Runestone", "TreeSitterCPP", "TreeSitterCPPQueries", "TreeSitterCQueries"]),
         .target(name: "TreeSitterCSS", cSettings: [.headerSearchPath("src")]),
-        .target(name: "TreeSitterCSSQueries", resources: [.copy("queries")]),
+        .target(name: "TreeSitterCSSQueries", resources: [.copy("highlights.scm")]),
         .target(name: "TreeSitterCSSRunestone", dependencies: ["Runestone", "TreeSitterCSS", "TreeSitterCSSQueries"]),
         .target(name: "TreeSitterElixir", cSettings: [.headerSearchPath("src")]),
-        .target(name: "TreeSitterElixirQueries", resources: [.copy("queries")]),
+        .target(name: "TreeSitterElixirQueries", resources: [.copy("highlights.scm"), .copy("tags.scm")]),
         .target(name: "TreeSitterElixirRunestone", dependencies: ["Runestone", "TreeSitterElixir", "TreeSitterElixirQueries"]),
         .target(name: "TreeSitterElm", cSettings: [.headerSearchPath("src")]),
-        .target(name: "TreeSitterElmQueries", resources: [.copy("queries")]),
+        .target(name: "TreeSitterElmQueries", resources: [.copy("highlights.scm")]),
         .target(name: "TreeSitterElmRunestone", dependencies: ["Runestone", "TreeSitterElm", "TreeSitterElmQueries"]),
         .target(name: "TreeSitterGo", cSettings: [.headerSearchPath("src")]),
-        .target(name: "TreeSitterGoQueries", resources: [.copy("queries")]),
+        .target(name: "TreeSitterGoQueries", resources: [.copy("highlights.scm"), .copy("tags.scm")]),
         .target(name: "TreeSitterGoRunestone", dependencies: ["Runestone", "TreeSitterGo", "TreeSitterGoQueries"]),
         .target(name: "TreeSitterHaskell", cSettings: [.headerSearchPath("src")]),
-        .target(name: "TreeSitterHaskellQueries", resources: [.copy("queries")]),
+        .target(name: "TreeSitterHaskellQueries", resources: [.copy("highlights.scm")]),
         .target(name: "TreeSitterHaskellRunestone", dependencies: ["Runestone", "TreeSitterHaskell", "TreeSitterHaskellQueries"]),
         .target(name: "TreeSitterHTML", cSettings: [.headerSearchPath("src")]),
-        .target(name: "TreeSitterHTMLQueries", resources: [.copy("queries")]),
+        .target(name: "TreeSitterHTMLQueries", resources: [.copy("highlights.scm"), .copy("injections.scm")]),
         .target(name: "TreeSitterHTMLRunestone", dependencies: ["Runestone", "TreeSitterHTML", "TreeSitterHTMLQueries"]),
         .target(name: "TreeSitterJava", cSettings: [.headerSearchPath("src")]),
-        .target(name: "TreeSitterJavaQueries", resources: [.copy("queries")]),
+        .target(name: "TreeSitterJavaQueries", resources: [.copy("highlights.scm"), .copy("tags.scm")]),
         .target(name: "TreeSitterJavaRunestone", dependencies: ["Runestone", "TreeSitterJava", "TreeSitterJavaQueries"]),
         .target(name: "TreeSitterJavaScript", cSettings: [.headerSearchPath("src")]),
-        .target(name: "TreeSitterJavaScriptQueries", resources: [.copy("queries")]),
+        .target(name: "TreeSitterJavaScriptQueries", resources: [.copy("highlights-jsx.scm"), .copy("highlights-params.scm"), .copy("highlights.scm"), .copy("injections.scm"), .copy("locals.scm"), .copy("tags.scm")]),
         .target(name: "TreeSitterJavaScriptRunestone", dependencies: ["Runestone", "TreeSitterJavaScript", "TreeSitterJavaScriptQueries"]),
         .target(name: "TreeSitterJSDoc", cSettings: [.headerSearchPath("src")]),
-        .target(name: "TreeSitterJSDocQueries", resources: [.copy("queries")]),
+        .target(name: "TreeSitterJSDocQueries", resources: [.copy("highlights.scm")]),
         .target(name: "TreeSitterJSDocRunestone", dependencies: ["Runestone", "TreeSitterJSDoc", "TreeSitterJSDocQueries"]),
         .target(name: "TreeSitterJSON", cSettings: [.headerSearchPath("src")]),
-        .target(name: "TreeSitterJSONQueries", resources: [.copy("queries")]),
+        .target(name: "TreeSitterJSONQueries", resources: [.copy("highlights.scm")]),
         .target(name: "TreeSitterJSONRunestone", dependencies: ["Runestone", "TreeSitterJSON", "TreeSitterJSONQueries"]),
         .target(name: "TreeSitterJSON5", cSettings: [.headerSearchPath("src")]),
-        .target(name: "TreeSitterJSON5Queries", resources: [.copy("queries")]),
+        .target(name: "TreeSitterJSON5Queries", resources: [.copy("highlights.scm"), .copy("injections.scm")]),
         .target(name: "TreeSitterJSON5Runestone", dependencies: ["Runestone", "TreeSitterJSON5", "TreeSitterJSON5Queries"]),
         .target(name: "TreeSitterJulia", cSettings: [.headerSearchPath("src")]),
-        .target(name: "TreeSitterJuliaQueries", resources: [.copy("queries")]),
+        .target(name: "TreeSitterJuliaQueries", resources: [.copy("highlights.scm"), .copy("injections.scm")]),
         .target(name: "TreeSitterJuliaRunestone", dependencies: ["Runestone", "TreeSitterJulia", "TreeSitterJuliaQueries"]),
         .target(name: "TreeSitterLaTeX", cSettings: [.headerSearchPath("src")]),
-        .target(name: "TreeSitterLaTeXQueries", resources: [.copy("queries")]),
+        .target(name: "TreeSitterLaTeXQueries", resources: [.copy("highlights.scm"), .copy("injections.scm")]),
         .target(name: "TreeSitterLaTeXRunestone", dependencies: ["Runestone", "TreeSitterLaTeX", "TreeSitterLaTeXQueries"]),
         .target(name: "TreeSitterLua", cSettings: [.headerSearchPath("src")]),
-        .target(name: "TreeSitterLuaQueries", resources: [.copy("queries")]),
+        .target(name: "TreeSitterLuaQueries", resources: [.copy("highlights.scm"), .copy("injections.scm")]),
         .target(name: "TreeSitterLuaRunestone", dependencies: ["Runestone", "TreeSitterLua", "TreeSitterLuaQueries"]),
         .target(name: "TreeSitterMarkdown", cSettings: [.headerSearchPath("src")]),
-        .target(name: "TreeSitterMarkdownQueries", resources: [.copy("queries")]),
+        .target(name: "TreeSitterMarkdownQueries", resources: [.copy("highlights.scm"), .copy("injections.scm")]),
         .target(name: "TreeSitterMarkdownRunestone", dependencies: ["Runestone", "TreeSitterMarkdown", "TreeSitterMarkdownQueries"]),
         .target(name: "TreeSitterOCaml", cSettings: [.headerSearchPath("src")]),
-        .target(name: "TreeSitterOCamlQueries", resources: [.copy("queries")]),
+        .target(name: "TreeSitterOCamlQueries", resources: [.copy("highlights.scm"), .copy("locals.scm"), .copy("tags.scm")]),
         .target(name: "TreeSitterOCamlRunestone", dependencies: ["Runestone", "TreeSitterOCaml", "TreeSitterOCamlQueries"]),
         .target(name: "TreeSitterPerl", cSettings: [.headerSearchPath("src")]),
-        .target(name: "TreeSitterPerlQueries", resources: [.copy("queries")]),
+        .target(name: "TreeSitterPerlQueries", resources: [.copy("highlights.scm")]),
         .target(name: "TreeSitterPerlRunestone", dependencies: ["Runestone", "TreeSitterPerl", "TreeSitterPerlQueries"]),
         .target(name: "TreeSitterPHP", cSettings: [.headerSearchPath("src")]),
-        .target(name: "TreeSitterPHPQueries", resources: [.copy("queries")]),
+        .target(name: "TreeSitterPHPQueries", resources: [.copy("highlights.scm"), .copy("injections.scm"), .copy("tags.scm")]),
         .target(name: "TreeSitterPHPRunestone", dependencies: ["Runestone", "TreeSitterPHP", "TreeSitterPHPQueries"]),
         .target(name: "TreeSitterPython", cSettings: [.headerSearchPath("src")]),
-        .target(name: "TreeSitterPythonQueries", resources: [.copy("queries")]),
+        .target(name: "TreeSitterPythonQueries", resources: [.copy("highlights.scm"), .copy("tags.scm")]),
         .target(name: "TreeSitterPythonRunestone", dependencies: ["Runestone", "TreeSitterPython", "TreeSitterPythonQueries"]),
         .target(name: "TreeSitterR", cSettings: [.headerSearchPath("src")]),
-        .target(name: "TreeSitterRQueries", resources: [.copy("queries")]),
+        .target(name: "TreeSitterRQueries", resources: [.copy("highlights.scm")]),
         .target(name: "TreeSitterRRunestone", dependencies: ["Runestone", "TreeSitterR", "TreeSitterRQueries"]),
         .target(name: "TreeSitterRegex", cSettings: [.headerSearchPath("src")]),
-        .target(name: "TreeSitterRegexQueries", resources: [.copy("queries")]),
+        .target(name: "TreeSitterRegexQueries", resources: [.copy("highlights.scm")]),
         .target(name: "TreeSitterRegexRunestone", dependencies: ["Runestone", "TreeSitterRegex", "TreeSitterRegexQueries"]),
         .target(name: "TreeSitterRuby", cSettings: [.headerSearchPath("src")]),
-        .target(name: "TreeSitterRubyQueries", resources: [.copy("queries")]),
+        .target(name: "TreeSitterRubyQueries", resources: [.copy("highlights.scm"), .copy("locals.scm"), .copy("tags.scm")]),
         .target(name: "TreeSitterRubyRunestone", dependencies: ["Runestone", "TreeSitterRuby", "TreeSitterRubyQueries"]),
         .target(name: "TreeSitterRust", cSettings: [.headerSearchPath("src")]),
-        .target(name: "TreeSitterRustQueries", resources: [.copy("queries")]),
+        .target(name: "TreeSitterRustQueries", resources: [.copy("highlights.scm"), .copy("injections.scm")]),
         .target(name: "TreeSitterRustRunestone", dependencies: ["Runestone", "TreeSitterRust", "TreeSitterRustQueries"]),
         .target(name: "TreeSitterSCSS", cSettings: [.headerSearchPath("src")]),
-        .target(name: "TreeSitterSCSSQueries", resources: [.copy("queries")]),
+        .target(name: "TreeSitterSCSSQueries", resources: [.copy("highlights.scm")]),
         .target(name: "TreeSitterSCSSRunestone", dependencies: ["Runestone", "TreeSitterSCSS", "TreeSitterSCSSQueries"]),
         .target(name: "TreeSitterSvelte", cSettings: [.headerSearchPath("src")]),
-        .target(name: "TreeSitterSvelteQueries", resources: [.copy("queries")]),
+        .target(name: "TreeSitterSvelteQueries", resources: [.copy("highlights.scm"), .copy("injections.scm")]),
         .target(name: "TreeSitterSvelteRunestone", dependencies: ["Runestone", "TreeSitterSvelte", "TreeSitterSvelteQueries"]),
         .target(name: "TreeSitterSwift", cSettings: [.headerSearchPath("src")]),
-        .target(name: "TreeSitterSwiftQueries", resources: [.copy("queries")]),
+        .target(name: "TreeSitterSwiftQueries", resources: [.copy("highlights.scm"), .copy("locals.scm")]),
         .target(name: "TreeSitterSwiftRunestone", dependencies: ["Runestone", "TreeSitterSwift", "TreeSitterSwiftQueries"]),
         .target(name: "TreeSitterTOML", cSettings: [.headerSearchPath("src")]),
-        .target(name: "TreeSitterTOMLQueries", resources: [.copy("queries")]),
+        .target(name: "TreeSitterTOMLQueries", resources: [.copy("highlights.scm")]),
         .target(name: "TreeSitterTOMLRunestone", dependencies: ["Runestone", "TreeSitterTOML", "TreeSitterTOMLQueries"]),
         .target(name: "TreeSitterTSX", cSettings: [.headerSearchPath("src")]),
-        .target(name: "TreeSitterTSXQueries", resources: [.copy("queries")]),
+        .target(name: "TreeSitterTSXQueries", resources: [.copy("highlights.scm"), .copy("locals.scm"), .copy("tags.scm")]),
         .target(name: "TreeSitterTSXRunestone", dependencies: ["Runestone", "TreeSitterTSX", "TreeSitterTSXQueries", "TreeSitterJavaScriptQueries"]),
         .target(name: "TreeSitterTypeScript", cSettings: [.headerSearchPath("src")]),
-        .target(name: "TreeSitterTypeScriptQueries", resources: [.copy("queries")]),
+        .target(name: "TreeSitterTypeScriptQueries", resources: [.copy("highlights.scm"), .copy("locals.scm"), .copy("tags.scm")]),
         .target(name: "TreeSitterTypeScriptRunestone", dependencies: ["Runestone", "TreeSitterTypeScript", "TreeSitterTypeScriptQueries", "TreeSitterJavaScriptQueries"]),
         .target(name: "TreeSitterYAML", exclude: ["src/schema.generated.cc"], cSettings: [.headerSearchPath("src")]),
-        .target(name: "TreeSitterYAMLQueries", resources: [.copy("queries")]),
+        .target(name: "TreeSitterYAMLQueries", resources: [.copy("highlights.scm")]),
         .target(name: "TreeSitterYAMLRunestone", dependencies: ["Runestone", "TreeSitterYAML", "TreeSitterYAMLQueries"])
     ]
 )

Sources/TreeSitterAstroQueries/Query.swift

@@ -12,6 +12,6 @@ public enum Query {
 
 private extension Query {
     static func url(named filename: String) -> URL {
-        return Bundle.module.url(forResource: "queries/" + filename, withExtension: "scm")!
+        return Bundle.module.url(forResource: filename, withExtension: "scm")!
     }
 }

…itterAstroQueries/queries/highlights.scm …es/TreeSitterAstroQueries/highlights.scmSources/TreeSitterAstroQueries/queries/highlights.scm renamed to Sources/TreeSitterAstroQueries/highlights.scm Sources/TreeSitterAstroQueries/queries/highlights.scm renamed to Sources/TreeSitterAstroQueries/highlights.scm

@@ -8,6 +8,6 @@ public enum Query {
 
 private extension Query {
     static func url(named filename: String) -> URL {
-        return Bundle.module.url(forResource: "queries/" + filename, withExtension: "scm")!
+        return Bundle.module.url(forResource: filename, withExtension: "scm")!
     }
 }

…itterAstroQueries/queries/injections.scm …es/TreeSitterAstroQueries/injections.scmSources/TreeSitterAstroQueries/queries/injections.scm renamed to Sources/TreeSitterAstroQueries/injections.scm Sources/TreeSitterAstroQueries/queries/injections.scm renamed to Sources/TreeSitterAstroQueries/injections.scm

@@ -8,6 +8,6 @@ public enum Query {
 
 private extension Query {
     static func url(named filename: String) -> URL {
-        return Bundle.module.url(forResource: "queries/" + filename, withExtension: "scm")!
+        return Bundle.module.url(forResource: filename, withExtension: "scm")!
     }
 }

Sources/TreeSitterBashQueries/Query.swift

@@ -8,6 +8,6 @@ public enum Query {
 
 private extension Query {
     static func url(named filename: String) -> URL {
-        return Bundle.module.url(forResource: "queries/" + filename, withExtension: "scm")!
+        return Bundle.module.url(forResource: filename, withExtension: "scm")!
     }
 }