From 3073ccf6ff70797d31d88435f1030635397d873e Mon Sep 17 00:00:00 2001 From: Trevor Gross Date: Mon, 11 Mar 2024 15:13:40 -0400 Subject: [PATCH] Fix comments and 0x01 in regex replacement --- build-flavored-queries.py | 4 ++-- queries-flavored/helix/injections.scm | 4 +++- queries-flavored/helix/textobjects.scm | 2 ++ queries-flavored/lapce/injections.scm | 4 +++- queries-flavored/lapce/textobjects.scm | 2 ++ queries-flavored/nvim-next/injections.scm | 2 +- queries-flavored/nvim-next/textobjects.scm | 2 ++ queries-flavored/zed/injections.scm | 4 +++- queries-flavored/zed/textobjects.scm | 2 ++ queries-src/injections.scm | 4 +++- queries-src/textobjects.scm | 2 ++ queries/just/injections.scm | 2 +- queries/just/textobjects.scm | 2 ++ 13 files changed, 28 insertions(+), 8 deletions(-) diff --git a/build-flavored-queries.py b/build-flavored-queries.py index 089e7b2..912c3e1 100755 --- a/build-flavored-queries.py +++ b/build-flavored-queries.py @@ -537,10 +537,10 @@ def main(): ) # Delete directives - contents = re.sub(r"SKIP-\w+", "", contents) + contents = re.sub(r"SKIP-[\w-]+", "", contents) # Remove trailing whitespace and duplicate newlines contents = re.sub(r"\s*;?\s+$", "", contents) - contents = re.sub(r"((?:\r?\n){2,})(?:\r?\n)+", "\1", contents) + contents = re.sub(r"((?:\r?\n){2,})(?:\r?\n)+", r"\1", contents) if not contents.endswith("\n"): contents += "\n" diff --git a/queries-flavored/helix/injections.scm b/queries-flavored/helix/injections.scm index 505ebb5..a94aa6e 100644 --- a/queries-flavored/helix/injections.scm +++ b/queries-flavored/helix/injections.scm @@ -1,6 +1,8 @@ ; File autogenerated by build-queries-nvim.py; do not edit -; FIXME: these are not compatible with helix due to precedence +; Specify nested languages that live within a `justfile` + +; FIXME: these are not compatible with helix due to precedence ; ================ Always applicable ================ diff --git a/queries-flavored/helix/textobjects.scm b/queries-flavored/helix/textobjects.scm index b1f7c4a..aadb833 100644 --- a/queries-flavored/helix/textobjects.scm +++ b/queries-flavored/helix/textobjects.scm @@ -1,5 +1,7 @@ ; File autogenerated by build-queries-nvim.py; do not edit +; Specify how to navigate around logical blocks in code + (recipe (recipe_body) @function.inside) @function.around diff --git a/queries-flavored/lapce/injections.scm b/queries-flavored/lapce/injections.scm index 505ebb5..a94aa6e 100644 --- a/queries-flavored/lapce/injections.scm +++ b/queries-flavored/lapce/injections.scm @@ -1,6 +1,8 @@ ; File autogenerated by build-queries-nvim.py; do not edit -; FIXME: these are not compatible with helix due to precedence +; Specify nested languages that live within a `justfile` + +; FIXME: these are not compatible with helix due to precedence ; ================ Always applicable ================ diff --git a/queries-flavored/lapce/textobjects.scm b/queries-flavored/lapce/textobjects.scm index b1f7c4a..aadb833 100644 --- a/queries-flavored/lapce/textobjects.scm +++ b/queries-flavored/lapce/textobjects.scm @@ -1,5 +1,7 @@ ; File autogenerated by build-queries-nvim.py; do not edit +; Specify how to navigate around logical blocks in code + (recipe (recipe_body) @function.inside) @function.around diff --git a/queries-flavored/nvim-next/injections.scm b/queries-flavored/nvim-next/injections.scm index 4c0d8e2..218b94b 100644 --- a/queries-flavored/nvim-next/injections.scm +++ b/queries-flavored/nvim-next/injections.scm @@ -1,6 +1,6 @@ ; File autogenerated by build-queries-nvim.py; do not edit -; FIXME: these are not compatible with helix due to precedence +; Specify nested languages that live within a `justfile` ; ================ Always applicable ================ diff --git a/queries-flavored/nvim-next/textobjects.scm b/queries-flavored/nvim-next/textobjects.scm index ca16587..6a0cd4f 100644 --- a/queries-flavored/nvim-next/textobjects.scm +++ b/queries-flavored/nvim-next/textobjects.scm @@ -1,5 +1,7 @@ ; File autogenerated by build-queries-nvim.py; do not edit +; Specify how to navigate around logical blocks in code + (recipe (recipe_body) .inner) .outer diff --git a/queries-flavored/zed/injections.scm b/queries-flavored/zed/injections.scm index 505ebb5..a94aa6e 100644 --- a/queries-flavored/zed/injections.scm +++ b/queries-flavored/zed/injections.scm @@ -1,6 +1,8 @@ ; File autogenerated by build-queries-nvim.py; do not edit -; FIXME: these are not compatible with helix due to precedence +; Specify nested languages that live within a `justfile` + +; FIXME: these are not compatible with helix due to precedence ; ================ Always applicable ================ diff --git a/queries-flavored/zed/textobjects.scm b/queries-flavored/zed/textobjects.scm index b1f7c4a..aadb833 100644 --- a/queries-flavored/zed/textobjects.scm +++ b/queries-flavored/zed/textobjects.scm @@ -1,5 +1,7 @@ ; File autogenerated by build-queries-nvim.py; do not edit +; Specify how to navigate around logical blocks in code + (recipe (recipe_body) @function.inside) @function.around diff --git a/queries-src/injections.scm b/queries-src/injections.scm index 83bf1b4..8e35d32 100644 --- a/queries-src/injections.scm +++ b/queries-src/injections.scm @@ -1,4 +1,6 @@ -; FIXME: these are not compatible with helix due to precedence +; Specify nested languages that live within a `justfile` + +; FIXME: these are not compatible with helix due to precedence SKIP-NVIM SKIP-NVIM-OLD ; ================ Always applicable ================ diff --git a/queries-src/textobjects.scm b/queries-src/textobjects.scm index af0aad1..af42014 100644 --- a/queries-src/textobjects.scm +++ b/queries-src/textobjects.scm @@ -1,3 +1,5 @@ +; Specify how to navigate around logical blocks in code + (recipe (recipe_body) @function.inside) @function.around diff --git a/queries/just/injections.scm b/queries/just/injections.scm index 4c0d8e2..218b94b 100644 --- a/queries/just/injections.scm +++ b/queries/just/injections.scm @@ -1,6 +1,6 @@ ; File autogenerated by build-queries-nvim.py; do not edit -; FIXME: these are not compatible with helix due to precedence +; Specify nested languages that live within a `justfile` ; ================ Always applicable ================ diff --git a/queries/just/textobjects.scm b/queries/just/textobjects.scm index 4101afd..966d36b 100644 --- a/queries/just/textobjects.scm +++ b/queries/just/textobjects.scm @@ -1,5 +1,7 @@ ; File autogenerated by build-queries-nvim.py; do not edit +; Specify how to navigate around logical blocks in code + (recipe (recipe_body) @function.inner) @function.outer