From beab7dbf41a62e277831259cfe9e548b4bea31fb Mon Sep 17 00:00:00 2001 From: Maxime Coste Date: Wed, 4 Nov 2015 09:48:47 +0000 Subject: [PATCH] Cleanup the various trailing space removal hooks --- rc/cabal.kak | 7 ++----- rc/coffee.kak | 7 ++----- rc/css.kak | 7 ++----- rc/cucumber.kak | 7 ++----- rc/fish.kak | 7 ++----- rc/haml.kak | 7 ++----- rc/haskell.kak | 7 ++----- rc/html.kak | 7 ++----- rc/javascript.kak | 7 ++----- rc/json.kak | 7 ++----- rc/lisp.kak | 7 ++----- rc/markdown.kak | 4 ++-- rc/python.kak | 7 ++----- rc/ragel.kak | 7 ++----- rc/ruby.kak | 7 ++----- rc/rust.kak | 7 ++----- rc/sass.kak | 7 ++----- rc/scala.kak | 7 ++----- rc/yaml.kak | 7 ++----- 19 files changed, 38 insertions(+), 92 deletions(-) diff --git a/rc/cabal.kak b/rc/cabal.kak index c280e4e8..93abafa4 100644 --- a/rc/cabal.kak +++ b/rc/cabal.kak @@ -29,11 +29,8 @@ addhl -group /cabal/code regex ^\h*([A-Za-z][A-Za-z0-9_-]*)\h*: 1:identifier # ‾‾‾‾‾‾‾‾ def -hidden _cabal_filter_around_selections %{ - eval -draft -itersel %{ - exec - # remove trailing white spaces - try %{ exec -draft s \h+$ d } - } + # remove trailing white spaces + try %{ exec -draft -itersel s \h+$ d } } def -hidden _cabal_indent_on_new_line %[ diff --git a/rc/coffee.kak b/rc/coffee.kak index 2d2cc420..b7732592 100644 --- a/rc/coffee.kak +++ b/rc/coffee.kak @@ -50,11 +50,8 @@ addhl -group /coffee/code regex \<(break|case|catch|class|const|continue|debugge # ‾‾‾‾‾‾‾‾ def -hidden _coffee_filter_around_selections %{ - eval -draft -itersel %{ - exec - # remove trailing white spaces - try %{ exec -draft s \h+$ d } - } + # remove trailing white spaces + try %{ exec -draft -itersel s \h+$ d } } def -hidden _coffee_indent_on_new_line %{ diff --git a/rc/css.kak b/rc/css.kak index 4eae7166..a8af297b 100644 --- a/rc/css.kak +++ b/rc/css.kak @@ -41,11 +41,8 @@ addhl -group /css/selector regex [*]|[#.][A-Za-z][A-Za-z0-9_-]* 0:identifier # ‾‾‾‾‾‾‾‾ def -hidden _css_filter_around_selections %{ - eval -draft -itersel %{ - exec - # remove trailing white spaces - try %{ exec -draft s \h+$ d } - } + # remove trailing white spaces + try %{ exec -draft -itersel s \h+$ d } } def -hidden _css_indent_on_new_line %[ diff --git a/rc/cucumber.kak b/rc/cucumber.kak index fd3a557e..2b0e51d1 100644 --- a/rc/cucumber.kak +++ b/rc/cucumber.kak @@ -61,11 +61,8 @@ addhl -group /cucumber/code regex \<(Feature|Business\h+Need|Ability|Background| # ‾‾‾‾‾‾‾‾ def -hidden _cucumber_filter_around_selections %{ - eval -draft -itersel %{ - exec - # remove trailing white spaces - try %{ exec -draft s \h+$ d } - } + # remove trailing white spaces + try %{ exec -draft -itersel s \h+$ d } } def -hidden _cucumber_indent_on_new_line %{ diff --git a/rc/fish.kak b/rc/fish.kak index bf20a4d6..b08e7e70 100644 --- a/rc/fish.kak +++ b/rc/fish.kak @@ -34,11 +34,8 @@ addhl -group /fish/code regex \<(and|begin|bg|bind|block|break|breakpoint|builti # ‾‾‾‾‾‾‾‾ def -hidden _fish_filter_around_selections %{ - eval -draft -itersel %{ - exec - # remove trailing white spaces - try %{ exec -draft s \h+$ d } - } + # remove trailing white spaces + try %{ exec -draft -itersel s \h+$ d } } def -hidden _fish_indent_on_char %{ diff --git a/rc/haml.kak b/rc/haml.kak index 20a898e9..65e09a31 100644 --- a/rc/haml.kak +++ b/rc/haml.kak @@ -38,11 +38,8 @@ addhl -group /haml/code regex ^\h*%([A-Za-z][A-Za-z0-9_-]*)([#.][A-Za-z][A-Za-z0 # ‾‾‾‾‾‾‾‾ def -hidden _haml_filter_around_selections %{ - eval -draft -itersel %{ - exec - # remove trailing white spaces - try %{ exec -draft s \h+$ d } - } + # remove trailing white spaces + try %{ exec -draft -itersel s \h+$ d } } def -hidden _haml_indent_on_new_line %{ diff --git a/rc/haskell.kak b/rc/haskell.kak index 1a59927e..f3fb6c80 100644 --- a/rc/haskell.kak +++ b/rc/haskell.kak @@ -36,11 +36,8 @@ addhl -group /haskell/code regex \<(Int|Integer|Char|Bool|Float|Double|IO|Void|A # http://en.wikibooks.org/wiki/Haskell/Indentation def -hidden _haskell_filter_around_selections %{ - eval -draft -itersel %{ - exec - # remove trailing white spaces - try %{ exec -draft s \h+$ d } - } + # remove trailing white spaces + try %{ exec -draft -itersel s \h+$ d } } def -hidden _haskell_indent_on_new_line %{ diff --git a/rc/html.kak b/rc/html.kak index 6dd36882..14f2dd27 100644 --- a/rc/html.kak +++ b/rc/html.kak @@ -38,11 +38,8 @@ addhl -group /html/tag/content/string fill string # ‾‾‾‾‾‾‾‾ def -hidden _html_filter_around_selections %{ - eval -draft -itersel %{ - exec - # remove trailing white spaces - try %{ exec -draft s \h+$ d } - } + # remove trailing white spaces + try %{ exec -draft -itersel s \h+$ d } } def -hidden _html_indent_on_char %{ diff --git a/rc/javascript.kak b/rc/javascript.kak index 6c5e3b10..86e0b9f3 100644 --- a/rc/javascript.kak +++ b/rc/javascript.kak @@ -40,11 +40,8 @@ addhl -group /javascript/code regex \<(break|case|catch|class|const|continue|deb # ‾‾‾‾‾‾‾‾ def -hidden _javascript_filter_around_selections %{ - eval -draft -itersel %{ - exec - # remove trailing white spaces - try %{ exec -draft s \h+$ d } - } + # remove trailing white spaces + try %{ exec -draft -itersel s \h+$ d } } def -hidden _javascript_indent_on_char %< diff --git a/rc/json.kak b/rc/json.kak index dcc18db3..0882ec2e 100644 --- a/rc/json.kak +++ b/rc/json.kak @@ -26,11 +26,8 @@ addhl -group /json/code regex \<(true|false|null)\> 0:value # ‾‾‾‾‾‾‾‾ def -hidden _json_filter_around_selections %{ - eval -draft -itersel %{ - exec - # remove trailing white spaces - try %{ exec -draft s \h+$ d } - } + # remove trailing white spaces + try %{ exec -draft -itersel s \h+$ d } } def -hidden _json_indent_on_char " diff --git a/rc/lisp.kak b/rc/lisp.kak index 84e9e86d..77c31679 100644 --- a/rc/lisp.kak +++ b/rc/lisp.kak @@ -31,11 +31,8 @@ addhl -group /lisp/code regex \<(def[a-z]+|if|do|let|lambda|catch|and|assert|whi # ‾‾‾‾‾‾‾‾ def -hidden _lisp_filter_around_selections %{ - eval -draft -itersel %{ - exec - # remove trailing white spaces - try %{ exec -draft s \h+$ d } - } + # remove trailing white spaces + try %{ exec -draft -itersel s \h+$ d } } def -hidden _lisp_indent_on_new_line %{ diff --git a/rc/markdown.kak b/rc/markdown.kak index 6947265e..1573ef5a 100644 --- a/rc/markdown.kak +++ b/rc/markdown.kak @@ -52,8 +52,8 @@ def -hidden _markdown_indent_on_new_line %{ eval -draft -itersel %{ # preserve previous line indent try %{ exec -draft K } - # filter previous line - try %{ exec -draft k : _markdown_filter_around_selections } + # remove trailing white spaces + try %{ exec -draft -itersel %{ k s \h+$ d } } # copy block quote(s), list item prefix and following white spaces try %{ exec -draft k x s ^\h*\K((>\h*)|[*+-])+\h* y j p } } diff --git a/rc/python.kak b/rc/python.kak index 981137fd..4891f200 100644 --- a/rc/python.kak +++ b/rc/python.kak @@ -38,11 +38,8 @@ addhl -group /python/code regex \<(bool|buffer|bytearray|complex|dict|file|float # ‾‾‾‾‾‾‾‾ def -hidden _python_filter_around_selections %{ - eval -draft -itersel %{ - exec - # remove trailing white spaces - try %{ exec -draft s \h+$ d } - } + # remove trailing white spaces + try %{ exec -draft -itersel s \h+$ d } } def -hidden _python_indent_on_new_line %{ diff --git a/rc/ragel.kak b/rc/ragel.kak index bb2748ef..4d7ecd2e 100644 --- a/rc/ragel.kak +++ b/rc/ragel.kak @@ -34,11 +34,8 @@ addhl -group /ragel/code regex \<(action|alnum|alpha|any|ascii|case|cntrl|contai # ‾‾‾‾‾‾‾‾ def -hidden _ragel_filter_around_selections %{ - eval -draft -itersel %{ - exec - # remove trailing white spaces - try %{ exec -draft s \h+$ d } - } + # remove trailing white spaces + try %{ exec -draft -itersel s \h+$ d } } def -hidden _ragel_indent_on_char " diff --git a/rc/ruby.kak b/rc/ruby.kak index 2871de4b..6c4ae28f 100644 --- a/rc/ruby.kak +++ b/rc/ruby.kak @@ -60,11 +60,8 @@ addhl -group /ruby/code regex \<(alias|and|begin|break|case|class|def|defined|do # ‾‾‾‾‾‾‾‾ def -hidden _ruby_filter_around_selections %{ - eval -draft -itersel %{ - exec - # remove trailing white spaces - try %{ exec -draft s \h+$ d } - } + # remove trailing white spaces + try %{ exec -draft -itersel s \h+$ d } } def -hidden _ruby_indent_on_char " diff --git a/rc/rust.kak b/rc/rust.kak index a69cd811..7577912c 100644 --- a/rc/rust.kak +++ b/rc/rust.kak @@ -36,11 +36,8 @@ addhl -group /rust/code regex \<(Share|Copy|Send|Sized|Add|Sub|Mul|Div|Rem|Neg|N # ‾‾‾‾‾‾‾‾ def -hidden _rust_filter_around_selections %{ - eval -draft -itersel %{ - exec - # remove trailing white spaces - try %{ exec -draft s \h+$ d } - } + # remove trailing white spaces + try %{ exec -draft -itersel s \h+$ d } } def -hidden _rust_indent_on_new_line %~ diff --git a/rc/sass.kak b/rc/sass.kak index f1f61ab5..ba66f2a8 100644 --- a/rc/sass.kak +++ b/rc/sass.kak @@ -34,11 +34,8 @@ addhl -group /sass/code regex !important 0:keyword # ‾‾‾‾‾‾‾‾ def -hidden _sass_filter_around_selections %{ - eval -draft -itersel %{ - exec - # remove trailing white spaces - try %{ exec -draft s \h+$ d } - } + # remove trailing white spaces + try %{ exec -draft -itersel s \h+$ d } } def -hidden _sass_indent_on_new_line %{ diff --git a/rc/scala.kak b/rc/scala.kak index 1a55ca49..565725f2 100644 --- a/rc/scala.kak +++ b/rc/scala.kak @@ -39,11 +39,8 @@ addhl -group /scala/code regex "'[_A-Za-z0-9$]+" 0:identifier # ‾‾‾‾‾‾‾‾ def -hidden _scala_filter_around_selections %{ - eval -draft -itersel %{ - exec - # remove trailing white spaces - try %{ exec -draft s \h+$ d } - } + # remove trailing white spaces + try %{ exec -draft -itersel s \h+$ d } } def -hidden _scala_indent_on_new_line %[ diff --git a/rc/yaml.kak b/rc/yaml.kak index 16643ccd..8a0ab829 100644 --- a/rc/yaml.kak +++ b/rc/yaml.kak @@ -32,11 +32,8 @@ addhl -group /yaml/code regex \<(true|false|null)\> 0:value # ‾‾‾‾‾‾‾‾ def -hidden _yaml_filter_around_selections %{ - eval -draft -itersel %{ - exec - # remove trailing white spaces - try %{ exec -draft s \h+$ d } - } + # remove trailing white spaces + try %{ exec -draft -itersel s \h+$ d } } def -hidden _yaml_indent_on_new_line %{