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:
Christian Clason
2022-12-14 19:46:17 +01:00
committed by GitHub
parent 6631df9107
commit 4a78ed60a3
2 changed files with 1 additions and 9 deletions

View File

@@ -1097,11 +1097,10 @@ function M.sc(bufnr)
for _, line in ipairs(getlines(bufnr, 1, 25)) do for _, line in ipairs(getlines(bufnr, 1, 25)) do
if if
findany(line, { findany(line, {
'[A-Za-z0-9]*%s:%s[A-Za-z0-9]',
'var%s<', 'var%s<',
'classvar%s<', 'classvar%s<',
'%^this.*', '%^this.*',
'|%w*|', '|%w+|',
'%+%s%w*%s{', '%+%s%w*%s{',
'%*ar%s', '%*ar%s',
}) })

View File

@@ -1555,13 +1555,6 @@ endfunc
func Test_sc_file() func Test_sc_file()
filetype on 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 {}' " SC classes are defined with '+ Class {}'
call writefile(['+ SCNvim {', '*methodArgs {|method|'], 'srcfile.sc') call writefile(['+ SCNvim {', '*methodArgs {|method|'], 'srcfile.sc')
split srcfile.sc split srcfile.sc