mirror of
https://github.com/neovim/neovim.git
synced 2024-12-20 03:05:11 -07:00
vim-patch:9.0.1057: conflict between supercollider and scala filetype detection (#21417)
Problem: Conflict between supercollider and scala filetype detection.
Solution: Do not check for "Class : Method", it can appear in both
filetypes. (Chris Kipp, closes vim/vim#11699)
70ef3f546b
Co-authored-by: Chris Kipp <ckipp@pm.me>
This commit is contained in:
parent
6631df9107
commit
4a78ed60a3
@ -1097,11 +1097,10 @@ function M.sc(bufnr)
|
||||
for _, line in ipairs(getlines(bufnr, 1, 25)) do
|
||||
if
|
||||
findany(line, {
|
||||
'[A-Za-z0-9]*%s:%s[A-Za-z0-9]',
|
||||
'var%s<',
|
||||
'classvar%s<',
|
||||
'%^this.*',
|
||||
'|%w*|',
|
||||
'|%w+|',
|
||||
'%+%s%w*%s{',
|
||||
'%*ar%s',
|
||||
})
|
||||
|
@ -1555,13 +1555,6 @@ endfunc
|
||||
func Test_sc_file()
|
||||
filetype on
|
||||
|
||||
" SC file methods are defined 'Class : Method'
|
||||
call writefile(['SCNvimDocRenderer : SCDocHTMLRenderer {'], 'srcfile.sc')
|
||||
split srcfile.sc
|
||||
call assert_equal('supercollider', &filetype)
|
||||
bwipe!
|
||||
call delete('srcfile.sc')
|
||||
|
||||
" SC classes are defined with '+ Class {}'
|
||||
call writefile(['+ SCNvim {', '*methodArgs {|method|'], 'srcfile.sc')
|
||||
split srcfile.sc
|
||||
|
Loading…
Reference in New Issue
Block a user