From 5db1d1beef2a4bcfff22538789ee63f061e3a794 Mon Sep 17 00:00:00 2001 From: Frank LENORMAND Date: Fri, 14 Oct 2016 22:12:01 +0300 Subject: [PATCH] Move the commenting variables back to `commenting.kak` Initialising the `comment_line_chars` and `comment_selection_chars` variables in language support scripts created a hard dependency of those scripts to `commenting.kak`, which would create errors when this script was not loaded, e.g. when running tests. --- rc/base/css.kak | 2 -- rc/base/d.kak | 2 -- rc/base/html.kak | 2 -- rc/base/lua.kak | 5 ----- rc/base/perl.kak | 3 --- rc/base/ruby.kak | 5 ----- rc/core/commenting.kak | 44 ++++++++++++++++++++++++++++++++++++++++++ rc/core/makefile.kak | 3 --- rc/extra/coffee.kak | 5 ----- rc/extra/latex.kak | 4 ---- rc/extra/moon.kak | 5 ----- 11 files changed, 44 insertions(+), 36 deletions(-) diff --git a/rc/base/css.kak b/rc/base/css.kak index 8ebc6a8a..06c483aa 100644 --- a/rc/base/css.kak +++ b/rc/base/css.kak @@ -72,8 +72,6 @@ hook global WinSetOption filetype=css %[ hook window InsertEnd .* -group css-hooks _css_filter_around_selections hook window InsertChar \n -group css-indent _css_indent_on_new_line hook window InsertChar \} -group css-indent _css_indent_on_closing_curly_brace - - set comment_line_chars "" ] hook -group css-highlight global WinSetOption filetype=(?!css).* %{ rmhl css } diff --git a/rc/base/d.kak b/rc/base/d.kak index 8822d9a6..52dfd539 100644 --- a/rc/base/d.kak +++ b/rc/base/d.kak @@ -110,8 +110,6 @@ hook global WinSetOption filetype=d %{ hook window InsertChar \n -group d-indent _d-indent-on-new-line hook window InsertChar \{ -group d-indent _d-indent-on-opening-curly-brace hook window InsertChar \} -group d-indent _d-indent-on-closing-curly-brace - - set window comment_selection_chars "/+:+/" } hook -group d-highlight global WinSetOption filetype=(?!d).* %{ rmhl d } diff --git a/rc/base/html.kak b/rc/base/html.kak index bbb2d5ec..066a01a2 100644 --- a/rc/base/html.kak +++ b/rc/base/html.kak @@ -69,8 +69,6 @@ hook global WinSetOption filetype=html %{ hook window InsertEnd .* -group html-hooks _html_filter_around_selections hook window InsertChar .* -group html-indent _html_indent_on_char hook window InsertChar \n -group html-indent _html_indent_on_new_line - - set window comment_selection_chars '' } hook -group html-highlight global WinSetOption filetype=(?!html).* %{ rmhl html } diff --git a/rc/base/lua.kak b/rc/base/lua.kak index 73c058ba..609f5036 100644 --- a/rc/base/lua.kak +++ b/rc/base/lua.kak @@ -1,8 +1,6 @@ # http://lua.org # ‾‾‾‾‾‾‾‾‾‾‾‾‾‾ -# require commenting.kak - # Detection # ‾‾‾‾‾‾‾‾‾ @@ -103,9 +101,6 @@ hook global WinSetOption filetype=lua %{ hook window InsertChar \n -group lua-indent _lua_indent_on_new_line alias window alt lua-alternative-file - - set window comment_line_chars '--' - set window comment_selection_chars '\Q--[[:]]' } hook -group lua-highlight global WinSetOption filetype=(?!lua).* %{ rmhl lua } diff --git a/rc/base/perl.kak b/rc/base/perl.kak index 2c7b0009..d4c30695 100644 --- a/rc/base/perl.kak +++ b/rc/base/perl.kak @@ -117,9 +117,6 @@ hook global WinSetOption filetype=perl %{ hook window InsertChar \n -group perl-indent _perl-indent-on-new-line hook window InsertChar \{ -group perl-indent _perl-indent-on-opening-curly-brace hook window InsertChar \} -group perl-indent _perl-indent-on-closing-curly-brace - - set window comment_selection_chars "" - set window comment_line_chars "#" } hook -group perl-highlight global WinSetOption filetype=(?!perl).* %{ rmhl perl } diff --git a/rc/base/ruby.kak b/rc/base/ruby.kak index 82984197..185db608 100644 --- a/rc/base/ruby.kak +++ b/rc/base/ruby.kak @@ -1,8 +1,6 @@ # http://ruby-lang.org # ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ -# require commenting.kak - # Detection # ‾‾‾‾‾‾‾‾‾ @@ -158,9 +156,6 @@ hook global WinSetOption filetype=ruby %{ hook window InsertChar \n -group ruby-insert _ruby_insert_on_new_line alias window alt ruby-alternative-file - - set window comment_line_chars '#' - set window comment_selection_chars '^begin=:^=end' } hook -group ruby-highlight global WinSetOption filetype=(?!ruby).* %{ rmhl ruby } diff --git a/rc/core/commenting.kak b/rc/core/commenting.kak index 8cec5de7..c2b7054a 100644 --- a/rc/core/commenting.kak +++ b/rc/core/commenting.kak @@ -4,6 +4,50 @@ decl str-list comment_selection_chars "/*:*/" ## Characters that will be inserted at the beginning of a line to comment decl str comment_line_chars "//" +## Default characters for all languages +hook global BufSetOption filetype=coffee %{ + set buffer comment_line_chars '#' + set buffer comment_selection_chars '###:###' +} + +hook global BufSetOption filetype=css %{ + set buffer comment_line_chars '' +} + +hook global BufSetOption filetype=d %{ + set buffer comment_selection_chars '/+:+/' +} + +hook global BufSetOption filetype=html %{ + set buffer comment_line_chars '' + set buffer comment_selection_chars '' +} + +hook global BufSetOption filetype=latex %{ + set buffer comment_line_chars '%' + set buffer comment_selection_chars '' +} + +hook global BufSetOption filetype=lua %{ + set buffer comment_line_chars '--' + set buffer comment_selection_chars '--[[:]]' +} + +hook global BufSetOption filetype=moon %{ + set buffer comment_line_chars '--' + set buffer comment_selection_chars '' +} + +hook global BufSetOption filetype=(perl|makefile) %{ + set buffer comment_line_chars '#' + set buffer comment_selection_chars '' +} + +hook global BufSetOption filetype=ruby %{ + set buffer comment_line_chars '#' + set buffer comment_selection_chars '^begin=:^=end' +} + def comment-selection -docstring "Comment/uncomment the current selection" %{ %sh{ function exec_proof { diff --git a/rc/core/makefile.kak b/rc/core/makefile.kak index f60bec10..7b06eef7 100644 --- a/rc/core/makefile.kak +++ b/rc/core/makefile.kak @@ -58,9 +58,6 @@ hook -group makefile-highlight global WinSetOption filetype=makefile %{ addhl re hook global WinSetOption filetype=makefile %{ hook window InsertChar \n -group makefile-indent _makefile-indent-on-new-line - - set window comment_selection_chars "" - set window comment_line_chars "#" } hook -group makefile-highlight global WinSetOption filetype=(?!makefile).* %{ rmhl makefile } diff --git a/rc/extra/coffee.kak b/rc/extra/coffee.kak index 21f5f5ed..3090e365 100644 --- a/rc/extra/coffee.kak +++ b/rc/extra/coffee.kak @@ -1,8 +1,6 @@ # http://coffeescript.org # ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ -# require commenting.kak - # Detection # ‾‾‾‾‾‾‾‾‾ @@ -80,9 +78,6 @@ hook -group coffee-highlight global WinSetOption filetype=coffee %{ addhl ref co hook global WinSetOption filetype=coffee %{ hook window InsertEnd .* -group coffee-hooks _coffee_filter_around_selections hook window InsertChar \n -group coffee-indent _coffee_indent_on_new_line - - set window comment_line_chars '#' - set window comment_selection_chars '###:###' } hook -group coffee-highlight global WinSetOption filetype=(?!coffee).* %{ rmhl coffee } diff --git a/rc/extra/latex.kak b/rc/extra/latex.kak index 86889365..ea6e22ed 100644 --- a/rc/extra/latex.kak +++ b/rc/extra/latex.kak @@ -35,8 +35,4 @@ addhl -group /latex/content regex '\\textbf\{([^}]+)\}' 1:default+b hook -group latex-highlight global WinSetOption filetype=latex %{ addhl ref latex } -hook global WinSetOption filetype=latex %{ - set window comment_line_chars '%' -} - hook -group latex-highlight global WinSetOption filetype=(?!latex).* %{ rmhl latex } diff --git a/rc/extra/moon.kak b/rc/extra/moon.kak index 191ef3cb..e5f790f3 100644 --- a/rc/extra/moon.kak +++ b/rc/extra/moon.kak @@ -1,8 +1,6 @@ # http://moonscript.org # ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ -# require commenting.kak - # Detection # ‾‾‾‾‾‾‾‾‾ @@ -106,9 +104,6 @@ hook global WinSetOption filetype=moon %{ hook window InsertChar \n -group moon-indent _moon_indent_on_new_line alias window alt moon-alternative-file - - set window comment_line_chars '--' - set window comment_selection_chars '' } hook -group moon-highlight global WinSetOption filetype=(?!moon).* %{ rmhl moon }