xenia/home
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ul/replace-e-face-with-F-in-rc'

Browse Source
This commit is contained in:
Maxime Coste 2018-11-06 20:16:38 +11:00
commit 2eeb9d8deb
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rc/base/javascript.kak
View File

@ -83,7 +83,7 @@ define-command -hidden init-javascript-filetype -params 1 %~
add-highlighter "shared/%arg{1}/jsx/tag/base/" regex </?([\w-$]+) 1:keyword add-highlighter "shared/%arg{1}/jsx/tag/base/" regex </?([\w-$]+) 1:keyword
add-highlighter "shared/%arg{1}/jsx/tag/base/" regex (</?|/?>) 0:meta add-highlighter "shared/%arg{1}/jsx/tag/base/" regex (</?|/?>) 0:meta
add-highlighter "shared/%arg{1}/jsx/tag/expr/" fill default,default+e add-highlighter "shared/%arg{1}/jsx/tag/expr/" fill default,default+F
add-highlighter "shared/%arg{1}/jsx/tag/expr/" ref %arg{1} add-highlighter "shared/%arg{1}/jsx/tag/expr/" ref %arg{1}
# Keywords are collected at # Keywords are collected at

14
rc/extra/racer.kak
View File

@ -28,14 +28,14 @@ define-command racer-complete -docstring "Complete the current selection with ra
sub(/^pub /, "", menu) sub(/^pub /, "", menu)
gsub(/\|/, "\\|", menu) gsub(/\|/, "\\|", menu)
if (type == "Function") { if (type == "Function") {
sub(word, "{default+e}" word "{default+d}", menu) sub(word, "{default+F}" word "{default+d}", menu)
gsub(/^fn /, " fn ", menu) # The extra spaces are there to vertically align gsub(/^fn /, " fn ", menu) # The extra spaces are there to vertically align
# the type of element on the menu to make it easy # the type of element on the menu to make it easy
# to read # to read
menu = "{default+d}" menu menu = "{default+d}" menu
} else if (type == "Enum") { } else if (type == "Enum") {
menu = substr(menu, 0, length(menu) - 2) menu = substr(menu, 0, length(menu) - 2)
sub(word, "{default+e}" word "{default+d}", menu) sub(word, "{default+F}" word "{default+d}", menu)
gsub(/^enum /, " enum ", menu) # The extra spaces are there to vertically align gsub(/^enum /, " enum ", menu) # The extra spaces are there to vertically align
# the type of element on the menu to make it easy # the type of element on the menu to make it easy
# to read # to read
@ -47,24 +47,24 @@ define-command racer-complete -docstring "Complete the current selection with ra
menu = substr(menu, length(menu) - 29, 30) # ... trimming it, so the completion menu menu = substr(menu, length(menu) - 29, 30) # ... trimming it, so the completion menu
# doesn''t get distorted if it''s too long # doesn''t get distorted if it''s too long
} }
menu = " mod {default+e}" word "{default+d} .." menu # The extra spaces are there to vertically align menu = " mod {default+F}" word "{default+d} .." menu # The extra spaces are there to vertically align
# the type of element on the menu to make it easy # the type of element on the menu to make it easy
# to read # to read
} else if (type == "Trait") { } else if (type == "Trait") {
sub(word, "{default+e}" word "{default+d}", menu) sub(word, "{default+F}" word "{default+d}", menu)
gsub(/^trait /, " trait ", menu) # The extra spaces are there to vertically align gsub(/^trait /, " trait ", menu) # The extra spaces are there to vertically align
# the type of element on the menu to make it easy # the type of element on the menu to make it easy
# to read # to read
} else if (type == "Type") { } else if (type == "Type") {
sub(word, "{default+e}" word "{default+d}", menu) sub(word, "{default+F}" word "{default+d}", menu)
gsub(/^type /, " type ", menu) # The extra spaces are there to vertically align gsub(/^type /, " type ", menu) # The extra spaces are there to vertically align
# the type of element on the menu to make it easy # the type of element on the menu to make it easy
# to read # to read
} else if (type == "Struct") { } else if (type == "Struct") {
sub(word, "{default+e}" word "{default+d}", menu) # Struct doesn''t have extra spaces because it''s sub(word, "{default+F}" word "{default+d}", menu) # Struct doesn''t have extra spaces because it''s
# the longest keyword # the longest keyword
} else { } else {
menu = "{default+e}" word "{default+d} " menu menu = "{default+F}" word "{default+d} " menu
} }
candidate = word "|" desc "|" menu candidate = word "|" desc "|" menu
gsub(/:/, "\\:", candidate) gsub(/:/, "\\:", candidate)

4
src/commands.cc
View File

@ -2100,7 +2100,9 @@ const CommandDesc set_face_cmd = {
"colors are either a color name, or rgb:###### values.\n" "colors are either a color name, or rgb:###### values.\n"
"attributes is a combination of:\n" "attributes is a combination of:\n"
" u: underline, i: italic, b: bold, r: reverse,\n" " u: underline, i: italic, b: bold, r: reverse,\n"
" B: blink, d: dim, e: exclusive\n" " B: blink, d: dim,\n"
" f: final foreground, g: final background,\n"
" a: final attributes, F: same as +fga\n"
"facespec can as well just be the name of another face", "facespec can as well just be the name of another face",
ParameterDesc{{}, ParameterDesc::Flags::None, 3, 3}, ParameterDesc{{}, ParameterDesc::Flags::None, 3, 3},
CommandFlags::None, CommandFlags::None,