diff options
| author | Doug Kearns <dougkearns@gmail.com> | 2021-11-26 13:01:41 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-11-26 13:01:41 +0000 |
| commit | 7329cfab36356c48edab7ed68f6244eb9e20a5b1 (patch) | |
| tree | 37ab0d73609d20da0d46922056272c1299473dda | |
| parent | 85be8563fe5aff686e9e30d6afff401ccd976f2a (diff) | |
| download | vim-git-7329cfab36356c48edab7ed68f6244eb9e20a5b1.tar.gz | |
patch 8.2.3679: objc file detected as Octavev8.2.3679
Problem: objc file detected as Octave. (Antony Lee)
Solution: Detect objc by preprocessor lines. (Doug Kearns, closes #9223,
closes #9220)
| -rw-r--r-- | runtime/autoload/dist/ft.vim | 4 | ||||
| -rw-r--r-- | src/testdir/test_filetype.vim | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 15 insertions, 1 deletions
diff --git a/runtime/autoload/dist/ft.vim b/runtime/autoload/dist/ft.vim index 7484149a2..344889249 100644 --- a/runtime/autoload/dist/ft.vim +++ b/runtime/autoload/dist/ft.vim @@ -272,6 +272,8 @@ func dist#ft#FTm() " excluding end(for|function|if|switch|while) common to Murphi let octave_block_terminators = '\<end\%(_try_catch\|classdef\|enumeration\|events\|methods\|parfor\|properties\)\>' + let objc_preprocessor = '^\s*#\s*\%(import\|include\|define\|if\|ifn\=def\|undef\|line\|error\|pragma\)\>' + let n = 1 let saw_comment = 0 " Whether we've seen a multiline comment leader. while n < 100 @@ -282,7 +284,7 @@ func dist#ft#FTm() " anything more definitive. let saw_comment = 1 endif - if line =~ '^\s*\(#\s*\(include\|import\)\>\|@import\>\|//\)' + if line =~ '^\s*//' || line =~ '^\s*@import\>' || line =~ objc_preprocessor setf objc return endif diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index 6134b328d..81ddbe9ea 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -891,6 +891,16 @@ func Test_m_file() call assert_equal('objc', &filetype) bwipe! + call writefile(['#include <header.h>'], 'Xfile.m') + split Xfile.m + call assert_equal('objc', &filetype) + bwipe! + + call writefile(['#define FORTY_TWO'], 'Xfile.m') + split Xfile.m + call assert_equal('objc', &filetype) + bwipe! + " Octave call writefile(['# Octave line comment'], 'Xfile.m') diff --git a/src/version.c b/src/version.c index b7a93edbb..ca0f16fcd 100644 --- a/src/version.c +++ b/src/version.c @@ -758,6 +758,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3679, +/**/ 3678, /**/ 3677, |