summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorantab <antab@antab.fr>2020-09-21 13:34:27 +0200
committerantab <antab@antab.fr>2020-09-21 13:34:27 +0200
commitd5ccdcfed4a2ed424bd8b854240d2be4667626df (patch)
tree732c5dad127280bd773b76b7b017ee4342f8b8cf
parentdbd7e4da79ff59a63be03c580d3f396657199596 (diff)
fix(ninja filetype): add subninja and include declarations and fix builddir highlights
-rw-r--r--rc/filetype/ninja.kak9
1 files changed, 6 insertions, 3 deletions
diff --git a/rc/filetype/ninja.kak b/rc/filetype/ninja.kak
index 7ed47390..2fb93dec 100644
--- a/rc/filetype/ninja.kak
+++ b/rc/filetype/ninja.kak
@@ -52,8 +52,8 @@ add-highlighter shared/ninja/command/linebreak regex '\$$' 0:operator
add-highlighter shared/ninja/command/variables regex '\$\w+|\$\{\w+\}' 0:value
# `build`
-add-highlighter shared/ninja/build region '^build' '\n' group
-add-highlighter shared/ninja/build/build regex '^build\h+' 0:keyword
+add-highlighter shared/ninja/build region '^build ' '\n' group
+add-highlighter shared/ninja/build/build regex '^build' 0:keyword
add-highlighter shared/ninja/build/rule regex ':\h+(\w+)' 0:function
add-highlighter shared/ninja/build/colonpipe regex ':|\||\|\|' 0:operator
add-highlighter shared/ninja/build/variables regex '\$\w+|\$\{\w+\}' 0:value
@@ -61,13 +61,16 @@ add-highlighter shared/ninja/build/variables regex '\$\w+|\$\{\w+\}' 0:value
# variables
add-highlighter shared/ninja/variable region '^\h*\w+\h*=' '\n' group
add-highlighter shared/ninja/variable/name regex '(\w+)\h*=' 0:variable
-# TODO: toplevel builddir is conflicting with build
add-highlighter shared/ninja/variable/equal regex '=' 0:operator
# `default`
add-highlighter shared/ninja/default region '^default' '\n' group
add-highlighter shared/ninja/default/default regex '^default' 0:keyword
+# `subninja` and `include`
+add-highlighter shared/ninja/subinc region '^subninja|include' '\n' group
+add-highlighter shared/ninja/subinc/default regex '^subninja|include' 0:module
+
# `pool`
add-highlighter shared/ninja/pool region '^pool' '\n' group
add-highlighter shared/ninja/pool/pool regex '^pool' 0:keyword