From 1fab727f2be4be4e4b6e85887c283daf86aef722 Mon Sep 17 00:00:00 2001 From: Justin Frank Date: Tue, 12 Mar 2019 22:24:33 -0700 Subject: Modified a bunch of language support files to use modules --- rc/filetype/javascript.kak | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'rc/filetype/javascript.kak') diff --git a/rc/filetype/javascript.kak b/rc/filetype/javascript.kak index 4d16ee68..7dc2034d 100644 --- a/rc/filetype/javascript.kak +++ b/rc/filetype/javascript.kak @@ -9,6 +9,12 @@ hook global BufCreate .*[.](ts)x? %{ set-option buffer filetype typescript } +hook -once global BufSetOption filetype=(java|type)script %{ + require-module javascript +} + +provide-module javascript %🦀 + # Commands # ‾‾‾‾‾‾‾‾ @@ -115,3 +121,5 @@ add-highlighter shared/typescript/code/ regex \b(array|boolean|date|number|objec # Keywords grabbed from https://github.com/Microsoft/TypeScript/issues/2536 add-highlighter shared/typescript/code/ regex \b(as|constructor|declare|enum|from|implements|interface|module|namespace|package|private|protected|public|readonly|static|type)\b 0:keyword + +🦀 -- cgit v1.2.3 From 80ac46e09de0a30c0bf590fd50b6cbf9bfd1c41b Mon Sep 17 00:00:00 2001 From: Justin Frank Date: Tue, 9 Apr 2019 20:54:19 -0700 Subject: Fixed many of the filetype support modules to not use `BufSetOption` to load --- rc/filetype/javascript.kak | 45 ++++++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 17 deletions(-) (limited to 'rc/filetype/javascript.kak') diff --git a/rc/filetype/javascript.kak b/rc/filetype/javascript.kak index 7dc2034d..d45cf3b1 100644 --- a/rc/filetype/javascript.kak +++ b/rc/filetype/javascript.kak @@ -13,6 +13,34 @@ hook -once global BufSetOption filetype=(java|type)script %{ require-module javascript } +# Initialization +# ‾‾‾‾‾‾‾‾‾‾‾‾‾‾ + +hook global WinSetOption filetype=(javascript|typescript) %{ + require-module javascript + + hook window ModeChange insert:.* -group "%val{hook_param_capture_1}-trim-indent javascript-trim-indent" + hook window InsertChar .* -group "%val{hook_param_capture_1}-indent javascript-indent-on-char" + hook window InsertChar \n -group "%val{hook_param_capture_1}-indent javascript-indent-on-new-line" + + hook -once -always window WinSetOption filetype=.* " + remove-hooks window %val{hook_param_capture_1}-.+ + " +} + +hook -group javascript-highlight global WinSetOption filetype=javascript %{ + add-highlighter window/javascript ref javascript + + hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/javascript } +} + +hook -group typescript-highlight global WinSetOption filetype=typescript %{ + add-highlighter window/typescript ref typescript + + hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/typescript } +} + + provide-module javascript %🦀 # Commands @@ -93,23 +121,6 @@ define-command -hidden init-javascript-filetype -params 1 %~ # Keywords are collected at # https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Lexical_grammar#Keywords add-highlighter "shared/%arg{1}/code/" regex \b(async|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|export|extends|finally|for|function|if|import|in|instanceof|let|new|of|return|static|super|switch|throw|try|typeof|var|void|while|with|yield)\b 0:keyword - - # Initialization - # ‾‾‾‾‾‾‾‾‾‾‾‾‾‾ - - hook -group "%arg{1}-highlight" global WinSetOption "filetype=%arg{1}" " - add-highlighter window/%arg{1} ref %arg{1} - - hook -once -always window WinSetOption filetype=.* %%{ remove-highlighter window/%arg{1} } - " - - hook global WinSetOption "filetype=%arg{1}" " - hook window ModeChange insert:.* -group %arg{1}-trim-indent javascript-trim-indent - hook window InsertChar .* -group %arg{1}-indent javascript-indent-on-char - hook window InsertChar \n -group %arg{1}-indent javascript-indent-on-new-line - - hook -once -always window WinSetOption filetype=.* %%{ remove-hooks window %arg{1}-.+ } - " ~ init-javascript-filetype javascript -- cgit v1.2.3 From e959b99050492e820e2cf39154b87e5f4696defa Mon Sep 17 00:00:00 2001 From: Justin Frank Date: Wed, 10 Apr 2019 16:48:46 -0700 Subject: Fixed several more support files. --- rc/filetype/javascript.kak | 4 ---- 1 file changed, 4 deletions(-) (limited to 'rc/filetype/javascript.kak') diff --git a/rc/filetype/javascript.kak b/rc/filetype/javascript.kak index d45cf3b1..3f794506 100644 --- a/rc/filetype/javascript.kak +++ b/rc/filetype/javascript.kak @@ -9,10 +9,6 @@ hook global BufCreate .*[.](ts)x? %{ set-option buffer filetype typescript } -hook -once global BufSetOption filetype=(java|type)script %{ - require-module javascript -} - # Initialization # ‾‾‾‾‾‾‾‾‾‾‾‾‾‾ -- cgit v1.2.3 From c2b32ebaa77aed64a0b27d199e4f3dd5907014c6 Mon Sep 17 00:00:00 2001 From: Justin Frank Date: Wed, 10 Apr 2019 17:08:05 -0700 Subject: Clean up javascript file a bit --- rc/filetype/javascript.kak | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'rc/filetype/javascript.kak') diff --git a/rc/filetype/javascript.kak b/rc/filetype/javascript.kak index 3f794506..67ef45b7 100644 --- a/rc/filetype/javascript.kak +++ b/rc/filetype/javascript.kak @@ -15,9 +15,9 @@ hook global BufCreate .*[.](ts)x? %{ hook global WinSetOption filetype=(javascript|typescript) %{ require-module javascript - hook window ModeChange insert:.* -group "%val{hook_param_capture_1}-trim-indent javascript-trim-indent" - hook window InsertChar .* -group "%val{hook_param_capture_1}-indent javascript-indent-on-char" - hook window InsertChar \n -group "%val{hook_param_capture_1}-indent javascript-indent-on-new-line" + hook window ModeChange insert:.* -group "%val{hook_param_capture_1}-trim-indent" javascript-trim-indent + hook window InsertChar .* -group "%val{hook_param_capture_1}-indent" javascript-indent-on-char + hook window InsertChar \n -group "%val{hook_param_capture_1}-indent" javascript-indent-on-new-line hook -once -always window WinSetOption filetype=.* " remove-hooks window %val{hook_param_capture_1}-.+ @@ -26,13 +26,11 @@ hook global WinSetOption filetype=(javascript|typescript) %{ hook -group javascript-highlight global WinSetOption filetype=javascript %{ add-highlighter window/javascript ref javascript - hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/javascript } } hook -group typescript-highlight global WinSetOption filetype=typescript %{ add-highlighter window/typescript ref typescript - hook -once -always window WinSetOption filetype=.* %{ remove-highlighter window/typescript } } -- cgit v1.2.3 From 48abc3cbf3f4fca560fc9e7e02ae4d23cedf144a Mon Sep 17 00:00:00 2001 From: Justin Frank Date: Sat, 13 Apr 2019 12:57:57 -0700 Subject: =?UTF-8?q?Changed=20'=F0=9F=A6=80'=20to=20'=C2=A7'=20for=20comple?= =?UTF-8?q?x=20module=20quoting?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rc/filetype/javascript.kak | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'rc/filetype/javascript.kak') diff --git a/rc/filetype/javascript.kak b/rc/filetype/javascript.kak index 67ef45b7..23a176da 100644 --- a/rc/filetype/javascript.kak +++ b/rc/filetype/javascript.kak @@ -35,7 +35,7 @@ hook -group typescript-highlight global WinSetOption filetype=typescript %{ } -provide-module javascript %🦀 +provide-module javascript %§ # Commands # ‾‾‾‾‾‾‾‾ @@ -127,4 +127,4 @@ add-highlighter shared/typescript/code/ regex \b(array|boolean|date|number|objec # Keywords grabbed from https://github.com/Microsoft/TypeScript/issues/2536 add-highlighter shared/typescript/code/ regex \b(as|constructor|declare|enum|from|implements|interface|module|namespace|package|private|protected|public|readonly|static|type)\b 0:keyword -🦀 +§ -- cgit v1.2.3