From bb865a18c1ff29ea7fe8535cf4e4425c110d0bbf Mon Sep 17 00:00:00 2001 From: Johannes Altmanninger Date: Sat, 16 May 2020 22:08:13 +0200 Subject: [PATCH 1/2] fish.kak: fix highlighting for single quoted strings fish allows to escape single quotes within single quoted strings, just like double quotes in double quoted strings. https://fishshell.com/docs/current/index.html#quotes --- rc/filetype/fish.kak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rc/filetype/fish.kak b/rc/filetype/fish.kak index 89c6c8f3..6fd34c4d 100644 --- a/rc/filetype/fish.kak +++ b/rc/filetype/fish.kak @@ -34,7 +34,7 @@ provide-module fish %{ add-highlighter shared/fish regions add-highlighter shared/fish/code default-region group add-highlighter shared/fish/double_string region '"' (? Date: Sat, 16 May 2020 22:10:19 +0200 Subject: [PATCH 2/2] fish.kak: add new fish builtins eval is a proper builtin as well now --- rc/filetype/fish.kak | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rc/filetype/fish.kak b/rc/filetype/fish.kak index 6fd34c4d..ca2e2557 100644 --- a/rc/filetype/fish.kak +++ b/rc/filetype/fish.kak @@ -42,8 +42,8 @@ add-highlighter shared/fish/double_string/ regex (\$\w+)|(\{\$\w+\}) 0:variable add-highlighter shared/fish/code/ regex (\$\w+)|(\{\$\w+\}) 0:variable -# Command names are collected using `builtin --names` and 'eval' from `functions --names` -add-highlighter shared/fish/code/ regex \b(and|begin|bg|bind|block|break|breakpoint|builtin|case|cd|command|commandline|complete|contains|continue|count|echo|else|emit|end|eval|exec|exit|fg|for|function|functions|history|if|jobs|not|or|printf|pwd|random|read|return|set|set_color|source|status|switch|test|ulimit|while)\b 0:keyword +# Command names are collected using `builtin --names`. +add-highlighter shared/fish/code/ regex \b(and|argparse|begin|bg|bind|block|break|breakpoint|builtin|case|cd|command|commandline|complete|contains|continue|count|disown|echo|else|emit|end|eval|exec|exit|false|fg|for|function|functions|history|if|jobs|math|not|or|printf|pwd|random|read|realpath|return|set|set_color|source|status|switch|test|time|ulimit|wait|while)\b 0:keyword # Commands # ‾‾‾‾‾‾‾‾