1
0
mirror of https://github.com/amix/vimrc synced 2025-07-12 06:05:01 +08:00

Update ui_glue.vim, lightline.txt, and 333 more files...

This commit is contained in:
geezuslucifer@gmail.com
2021-06-30 11:54:34 -05:00
parent 43c7efba8d
commit 1cca3b1df2
335 changed files with 8451 additions and 2020 deletions

View File

@ -642,8 +642,7 @@ function! s:PreviousNotMSL(msl_info) abort
" TODO (2016-10-07) Wrong/unused? How could it be "1"?
return indent(info.plnum) - 1
" If previous line is a continuation return its indent.
" TODO: the || s:IsInString() thing worries me a bit.
elseif s:Match(info.plnum, s:non_bracket_continuation_regex) || s:IsInString(info.plnum, strlen(line))
elseif s:Match(info.plnum, s:non_bracket_continuation_regex)
return indent(info.plnum)
endif
endif

View File

@ -42,4 +42,12 @@ describe "Syntax highlighting" do
validates_inclusion_of :gender, in: %w(male female), if: :gender_required?
EOF
end
specify "nested parentheses inside symbols" do
assert_correct_highlighting <<~EOF, 'bar\zs)', 'rubySymbol'
h = %i(
foo(bar)baz
)
EOF
end
end

View File

@ -2,7 +2,7 @@
let s:debug = 0
function! s:CursorHasGroup(group) abort
return synIDattr(synID(line('.'), col('.'), 0), 'name') =~ a:group
return synIDattr(synID(line('.'), col('.'), 1), 'name') =~ a:group
endfunction
function! TestSyntax(pattern, group) abort

View File

@ -133,10 +133,10 @@ syn match rubyCurlyBraceEscape "\\[{}]" contained display
syn match rubyAngleBracketEscape "\\[<>]" contained display
syn match rubySquareBracketEscape "\\[[\]]" contained display
syn region rubyNestedParentheses start="(" skip="\\\\\|\\)" matchgroup=rubyString end=")" transparent contained
syn region rubyNestedCurlyBraces start="{" skip="\\\\\|\\}" matchgroup=rubyString end="}" transparent contained
syn region rubyNestedAngleBrackets start="<" skip="\\\\\|\\>" matchgroup=rubyString end=">" transparent contained
syn region rubyNestedSquareBrackets start="\[" skip="\\\\\|\\\]" matchgroup=rubyString end="\]" transparent contained
syn region rubyNestedParentheses start="(" skip="\\\\\|\\)" end=")" transparent contained
syn region rubyNestedCurlyBraces start="{" skip="\\\\\|\\}" end="}" transparent contained
syn region rubyNestedAngleBrackets start="<" skip="\\\\\|\\>" end=">" transparent contained
syn region rubyNestedSquareBrackets start="\[" skip="\\\\\|\\\]" end="\]" transparent contained
syn cluster rubySingleCharEscape contains=rubyBackslashEscape,rubyQuoteEscape,rubySpaceEscape,rubyParenthesisEscape,rubyCurlyBraceEscape,rubyAngleBracketEscape,rubySquareBracketEscape
syn cluster rubyNestedBrackets contains=rubyNested.\+