Wrap filetype detection hooks in module to allow order of evaluation specification with ModuleLoaded hook

rc/filetype/apl.kak

@@ -1,3 +1,4 @@
+provide-module detect-apl %<
 
 # Detection
 # ‾‾‾‾‾‾‾‾‾
@@ -26,6 +27,10 @@ hook -group apl-highlight global WinSetOption filetype=apl %{
     hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/apl }
 }
 
+>
+
+require-module detect-apl
+
 provide-module apl %¹
 
 # Highlighters & Completion

rc/filetype/arch-linux.kak

@@ -1,4 +1,11 @@
 # package build description file
+
+provide-module detect-arch-linux %{
+
 hook global BufCreate (.*/)?PKGBUILD %{
     set-option buffer filetype sh
 }
+
+}
+
+require-module detect-arch-linux

rc/filetype/asciidoc.kak

@@ -1,6 +1,8 @@
 # http://asciidoc.org/
 # ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
 
+provide-module detect-asciidoc %{
+
 # Detection
 # ‾‾‾‾‾‾‾‾‾
 
@@ -18,6 +20,10 @@ hook -group asciidoc-highlight global WinSetOption filetype=asciidoc %{
     hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/asciidoc }
 }
 
+}
+
+require-module detect-asciidoc
+
 provide-module asciidoc %{
 
 # Highlighters

rc/filetype/awk.kak

@@ -1,3 +1,5 @@
+provide-module detect-awk %{
+
 # Detection
 # ---------
 
@@ -22,6 +24,10 @@ hook -group awk-highlight global WinSetOption filetype=awk %{
     hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/awk }
 }
 
+}
+
+require-module detect-awk
+
 provide-module awk %@
 
 # Highlighters

rc/filetype/c-family.kak

@@ -1,3 +1,5 @@
+provide-module detect-c-family %[
+
 # Detection
 hook global BufCreate .*\.(cc|cpp|cxx|C|hh|hpp|hxx|H)$ %{
     set-option buffer filetype cpp
@@ -59,6 +61,10 @@ hook -group objc-highlight global WinSetOption filetype=objc %{
     hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/objc }
 }
 
+]
+
+require-module detect-c-family
+
 
 provide-module c-family %§
 

rc/filetype/cabal.kak

@@ -1,6 +1,8 @@
 # http://haskell.org/cabal
 # ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
 
+provide-module detect-cabal %[
+
 # Detection
 # ‾‾‾‾‾‾‾‾‾
 
@@ -28,6 +30,10 @@ hook -group cabal-highlight global WinSetOption filetype=cabal %{
     hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/cabal }
 }
 
+]
+
+require-module detect-cabal
+
 
 provide-module cabal %[
 

rc/filetype/clojure.kak

@@ -1,6 +1,8 @@
 # http://clojure.org
 # ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
 
+provide-module detect-clojure %{
+
 # Detection
 # ‾‾‾‾‾‾‾‾‾
 
@@ -25,6 +27,10 @@ hook -group clojure-insert global BufNewFile .*[.](clj|cljc|cljs|cljx) %{
     clojure-insert-ns
 }
 
+}
+
+require-module detect-clojure
+
 provide-module clojure %{
 
 require-module lisp

rc/filetype/cmake.kak

@@ -1,3 +1,5 @@
+provide-module detect-cmake %{
+
 hook global BufCreate .+\.cmake|.*/CMakeLists.txt %{
     set-option buffer filetype cmake
 }
@@ -15,6 +17,10 @@ hook -group cmake-highlight global WinSetOption filetype=cmake %{
     hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/cmake }
 }
 
+}
+
+require-module detect-cmake
+
 provide-module cmake %{
 
 add-highlighter shared/cmake regions

rc/filetype/coffee.kak

@@ -1,6 +1,8 @@
 # http://coffeescript.org
 # ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
 
+provide-module detect-coffee %{
+
 # Detection
 # ‾‾‾‾‾‾‾‾‾
 
@@ -26,6 +28,10 @@ hook -group coffee-highlight global WinSetOption filetype=coffee %{
     hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/coffee }
 }
 
+}
+
+require-module detect-coffee
+
 
 provide-module coffee %[
 

rc/filetype/conf.kak

@@ -1,3 +1,5 @@
+provide-module detect-conf %{
+
 hook global BufCreate .+\.(repo|cfg|properties|desktop) %{
     set-option buffer filetype conf
 }
@@ -18,6 +20,10 @@ hook -group conf-highlight global WinSetOption filetype=conf %{
     hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/conf }
 }
 
+}
+
+require-module detect-conf
+
 provide-module conf %{
 
 add-highlighter shared/conf regions

rc/filetype/coq.kak

@@ -1,3 +1,4 @@
+provide-module detect-coq %{
 
 # Detection
 # --------
@@ -23,6 +24,10 @@ hook global WinSetOption filetype=coq %{
     }
 }
 
+}
+
+require-module detect-coq
+
 provide-module coq %{
 
 # Syntax

rc/filetype/crystal.kak

@@ -1,6 +1,8 @@
 # Crystal
 # https://crystal-lang.org
 
+provide-module detect-crystal %{
+
 # Detection
 # ‾‾‾‾‾‾‾‾‾
 
@@ -28,6 +30,10 @@ hook global WinSetOption filetype=crystal %{
     }
 }
 
+}
+
+require-module detect-crystal
+
 provide-module crystal %§
 
 declare-option -hidden str-list crystal_keywords 'abstract' 'alias' 'annotation' 'as' 'asm' 'begin' 'break' 'case' 'class' 'def' 'do' 'else' 'elsif' 'end' 'ensure' 'enum' 'extend' 'false' 'for' 'fun' 'if' 'include' 'instance_sizeof' 'is_a?' 'lib' 'macro' 'module' 'next' 'nil' 'nil?' 'of' 'offsetof' 'out' 'pointerof' 'private' 'protected' 'require' 'rescue' 'responds_to?' 'return' 'select' 'self' 'sizeof' 'struct' 'super' 'then' 'true' 'type' 'typeof' 'uninitialized' 'union' 'unless' 'until' 'verbatim' 'when' 'while' 'with' 'yield'

rc/filetype/css.kak

@@ -1,6 +1,8 @@
 # http://w3.org/Style/CSS
 # ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
 
+provide-module detect-css %[
+
 # Detection
 # ‾‾‾‾‾‾‾‾‾
 
@@ -29,6 +31,10 @@ hook -group css-highlight global WinSetOption filetype=css %{
     hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/css }
 }
 
+]
+
+require-module detect-css
+
 
 provide-module css %[
 

rc/filetype/cucumber.kak

@@ -1,6 +1,8 @@
 # http://cukes.info
 # ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
 
+provide-module detect-cucumber %{
+
 # Detection
 # ‾‾‾‾‾‾‾‾‾
 
@@ -26,6 +28,10 @@ hook -group cucumber-highlight global WinSetOption filetype=cucumber %{
     hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/cucumber }
 }
 
+}
+
+require-module detect-cucumber
+
 
 provide-module cucumber %{
 

rc/filetype/cue.kak

@@ -1,6 +1,8 @@
 # https://cuelang.org
 # ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
 
+provide-module detect-cue %[
+
 # Detection
 # ‾‾‾‾‾‾‾‾‾
 
@@ -29,6 +31,10 @@ hook -group cue-highlight global WinSetOption filetype=cue %{
     hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/cue }
 }
 
+]
+
+require-module detect-cue
+
 provide-module cue %§
 
 # Highlighters

rc/filetype/d.kak

@@ -1,6 +1,8 @@
 # http://dlang.org/
 #
 
+provide-module detect-d %{
+
 # Detection
 # ‾‾‾‾‾‾‾‾‾
 
@@ -31,6 +33,10 @@ hook -group d-highlight global WinSetOption filetype=d %{
     hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/d }
 }
 
+}
+
+require-module detect-d
+
 provide-module d %§
 
 # Highlighters

rc/filetype/dart.kak

@@ -1,6 +1,8 @@
 # https://dartlang.org/
 #
 
+provide-module detect-dart %{
+
 # Detection
 # ‾‾‾‾‾‾‾‾‾
 
@@ -31,6 +33,10 @@ hook -group dart-highlight global WinSetOption filetype=dart %{
     hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/dart }
 }
 
+}
+
+require-module detect-dart
+
 
 provide-module dart %§
 

rc/filetype/dhall.kak

@@ -1,6 +1,8 @@
 # https://dhall-lang.org
 #                       
 
+provide-module detect-dhall %{
+
 # Detection
 # ‾‾‾‾‾‾‾‾‾
 
@@ -26,6 +28,10 @@ hook -group dhall-highlight global WinSetOption filetype=dhall %{
     hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/dhall }
 }
 
+}
+
+require-module detect-dhall
+
 
 provide-module dhall %[
 

rc/filetype/diff.kak

@@ -1,3 +1,5 @@
+provide-module detect-diff %{
+
 hook global BufCreate .*\.(diff|patch) %{
     set-option buffer filetype diff
 }
@@ -12,6 +14,10 @@ hook -group diff-highlight global WinSetOption filetype=diff %{
     hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/diff }
 }
 
+}
+
+require-module detect-diff
+
 provide-module diff %§
 
 add-highlighter shared/diff group

rc/filetype/dockerfile.kak

@@ -3,6 +3,8 @@
 
 # See https://docs.docker.com/reference/builder
 
+provide-module detect-dockerfile %{
+
 # Detection
 # ‾‾‾‾‾‾‾‾‾
 
@@ -23,6 +25,10 @@ hook -group dockerfile-highlight global WinSetOption filetype=dockerfile %{
     hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/dockerfile }
 }
 
+}
+
+require-module detect-dockerfile
+
 provide-module dockerfile %{
 
 # Highlighters

rc/filetype/elixir.kak

@@ -1,6 +1,8 @@
 # http://elixir-lang.org
 # ----------------------
 
+provide-module detect-elixir %{
+
 # Detection
 # ‾‾‾‾‾‾‾‾‾
 
@@ -41,6 +43,10 @@ hook -group eex-highlight global WinSetOption filetype=eex %{
     hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/eex }
 }
 
+}
+
+require-module detect-elixir
+
 provide-module eex %{
 require-module html
 require-module elixir