mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-02 16:08:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.3432: octave/Matlab filetype detection does not work properly (#15652)

Browse Source 
Problem:    Octave/Matlab filetype detection does not work properly.
Solution:   Update the patterns used for matching. (Doug Kearns)
ca0627df69
This commit is contained in:
Christian Clason
2021-09-13 10:00:09 +02:00
committed by GitHub
parent 643cb8a6ec
commit b9d57fa107
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
runtime/autoload/dist/ft.vim vendored
View File

@@ -269,7 +269,8 @@ func dist#ft#FTm()
return return
endif endif
let octave_block_terminators = '\<end\%(_try_catch\|classdef\|enumeration\|events\|for\|function\|if\|methods\|parfor\|properties\|switch\|while\)\>' " excluding end(for|function|if|switch|while) common to Murphi
let octave_block_terminators = '\<end\%(_try_catch\|classdef\|enumeration\|events\|methods\|parfor\|properties\)\>'
let n = 1 let n = 1
let saw_comment = 0 " Whether we've seen a multiline comment leader. let saw_comment = 0 " Whether we've seen a multiline comment leader.
@@ -285,8 +286,7 @@ func dist#ft#FTm()
setf objc setf objc
return return
endif endif
if line =~ '^\s*\%(#\|%!\|[#%]{\=\s*$\)' || if line =~ '^\s*\%(#\|%!\)' || line =~ '^\s*unwind_protect\>' ||
\ line =~ '^\s*unwind_protect\>' ||
\ line =~ '\%(^\|;\)\s*' .. octave_block_terminators \ line =~ '\%(^\|;\)\s*' .. octave_block_terminators
setf octave setf octave
return return

19
src/nvim/testdir/test_filetype.vim
View File

@@ -868,16 +868,6 @@ func Test_m_file()
call assert_equal('octave', &filetype) call assert_equal('octave', &filetype)
bwipe! bwipe!
call writefile(['#{', 'Octave block comment', '#}'], 'Xfile.m')
split Xfile.m
call assert_equal('octave', &filetype)
bwipe!
call writefile(['%{', 'Octave block comment', '%}'], 'Xfile.m')
split Xfile.m
call assert_equal('octave', &filetype)
bwipe!
call writefile(['%!test "Octave test"'], 'Xfile.m') call writefile(['%!test "Octave test"'], 'Xfile.m')
split Xfile.m split Xfile.m
call assert_equal('octave', &filetype) call assert_equal('octave', &filetype)
@@ -888,7 +878,7 @@ func Test_m_file()
call assert_equal('octave', &filetype) call assert_equal('octave', &filetype)
bwipe! bwipe!
call writefile(['function test(); 42; endfunction'], 'Xfile.m') call writefile(['try; 42; end_try_catch'], 'Xfile.m')
split Xfile.m split Xfile.m
call assert_equal('octave', &filetype) call assert_equal('octave', &filetype)
bwipe! bwipe!
@@ -900,6 +890,13 @@ func Test_m_file()
call assert_equal('mma', &filetype) call assert_equal('mma', &filetype)
bwipe! bwipe!
" MATLAB
call writefile(['% MATLAB line comment'], 'Xfile.m')
split Xfile.m
call assert_equal('matlab', &filetype)
bwipe!
" Murphi " Murphi
call writefile(['-- Murphi comment'], 'Xfile.m') call writefile(['-- Murphi comment'], 'Xfile.m')