Update remaining files to new provide/require format

1 files changed, 18 insertions, 19 deletions

diff --git a/rc/filetype/java.kak b/rc/filetype/java.kak
index 21c28858..36d4e3ba 100644
--- a/rc/filetype/java.kak
+++ b/rc/filetype/java.kak
@@ -2,10 +2,27 @@ hook global BufCreate .*\.java %{
     set-option buffer filetype java
 }
 
-hook -once global BufSetOption filetype=java %{
+# Initialization
+# ‾‾‾‾‾‾‾‾‾‾‾‾‾‾
+
+hook global WinSetOption filetype=java %{
     require-module java
+
+    # cleanup trailing whitespaces when exiting insert mode
+    hook window ModeChange insert:.* -group java-trim-indent %{ try %{ execute-keys -draft <a-x>s^\h+$<ret>d } }
+    hook window InsertChar \n -group java-indent java-indent-on-new-line
+    hook window InsertChar \{ -group java-indent java-indent-on-opening-curly-brace
+    hook window InsertChar \} -group java-indent java-indent-on-closing-curly-brace
+
+    hook -once -always window WinSetOption filetype=.* %{ remove-hooks window java-.+ }
 }
 
+hook -group java-highlight global WinSetOption filetype=java %{
+    add-highlighter window/java ref java
+    hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/java }
+}
+
+
 provide-module java %🦀
 
 add-highlighter shared/java regions
@@ -52,22 +69,4 @@ define-command -hidden java-indent-on-closing-curly-brace %[
     try %[ execute-keys -itersel -draft <a-h><a-k>^\h+\}$<ret>hms\A|.\z<ret>1<a-&> ]
 ]
 
-# Initialization
-# ‾‾‾‾‾‾‾‾‾‾‾‾‾‾
-
-hook -group java-highlight global WinSetOption filetype=java %{
-    add-highlighter window/java ref java
-    hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/java }
-}
-
-hook global WinSetOption filetype=java %{
-    # cleanup trailing whitespaces when exiting insert mode
-    hook window ModeChange insert:.* -group java-trim-indent %{ try %{ execute-keys -draft <a-x>s^\h+$<ret>d } }
-    hook window InsertChar \n -group java-indent java-indent-on-new-line
-    hook window InsertChar \{ -group java-indent java-indent-on-opening-curly-brace
-    hook window InsertChar \} -group java-indent java-indent-on-closing-curly-brace
-
-    hook -once -always window WinSetOption filetype=.* %{ remove-hooks window java-.+ }
-}
-
 🦀