Created
October 28, 2016 00:12
-
-
Save mattn/f1762dccacf5151787cfb4dd7b274175 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/syntax/c.vim b/syntax/c.vim | |
index 57d99ab..17b01a1 100644 | |
--- a/syntax/c.vim | |
+++ b/syntax/c.vim | |
@@ -1,7 +1,7 @@ | |
" Vim syntax file | |
" Language: C | |
" Maintainer: Bram Moolenaar <Bram@vim.org> | |
-" Last Change: 2016 Jul 07 | |
+" Last Change: 2016 Apr 10 | |
" Quit when a (custom) syntax file was already loaded | |
if exists("b:current_syntax") | |
@@ -182,6 +182,11 @@ syn match cNumbersCom display contained transparent "\<\d\|\.\d" contains=cNumbe | |
syn match cNumber display contained "\d\+\(u\=l\{0,2}\|ll\=u\)\>" | |
"hex number | |
syn match cNumber display contained "0x\x\+\(u\=l\{0,2}\|ll\=u\)\>" | |
+if s:ft ==# 'cpp' && !exists("cpp_no_cpp14") | |
+ syn match cNumber display contained "\d\('\=\d\+\)*\(u\=l\{0,2}\|ll\=u\)\>" | |
+ syn match cNumber display contained "0x\x\('\=\x\+\)*\(u\=l\{0,2}\|ll\=u\)\>" | |
+ syn match cNumber display contained "0b[01]\('\=[01]\+\)*\(u\=l\{0,2}\|ll\=u\)\>" | |
+endif | |
" Flag the first zero of an octal number as something special | |
syn match cOctal display contained "0\o\+\(u\=l\{0,2}\|ll\=u\)\>" contains=cOctalZero | |
syn match cOctalZero display contained "\<0" | |
@@ -383,11 +388,11 @@ if !exists("c_no_if0") | |
endif | |
syn region cIncluded display contained start=+"+ skip=+\\\\\|\\"+ end=+"+ | |
syn match cIncluded display contained "<[^>]*>" | |
-syn match cInclude display "^\s*\(%:\|#\)\s*include\>\s*["<]" contains=cIncluded | |
+syn match cInclude display "\(%:\|#\)\s*include\>\s*["<]" contains=cIncluded | |
"syn match cLineSkip "\\$" | |
syn cluster cPreProcGroup contains=cPreCondit,cIncluded,cInclude,cDefine,cErrInParen,cErrInBracket,cUserLabel,cSpecial,cOctalZero,cCppOutWrapper,cCppInWrapper,@cCppOutInGroup,cFormat,cNumber,cFloat,cOctal,cOctalError,cNumbersCom,cString,cCommentSkip,cCommentString,cComment2String,@cCommentGroup,cCommentStartError,cParen,cBracket,cMulti,cBadBlock | |
-syn region cDefine start="^\s*\(%:\|#\)\s*\(define\|undef\)\>" skip="\\$" end="$" keepend contains=ALLBUT,@cPreProcGroup,@Spell | |
-syn region cPreProc start="^\s*\(%:\|#\)\s*\(pragma\>\|line\>\|warning\>\|warn\>\|error\>\)" skip="\\$" end="$" keepend contains=ALLBUT,@cPreProcGroup,@Spell | |
+syn region cDefine start="\(%:\|#\)\s*\(define\|undef\)\>" skip="\\$" end="$" keepend contains=ALLBUT,@cPreProcGroup,@Spell | |
+syn region cPreProc start="\(%:\|#\)\s*\(pragma\>\|line\>\|warning\>\|warn\>\|error\>\)" skip="\\$" end="$" keepend contains=ALLBUT,@cPreProcGroup,@Spell | |
" Highlight User Labels | |
syn cluster cMultiGroup contains=cIncluded,cSpecial,cCommentSkip,cCommentString,cComment2String,@cCommentGroup,cCommentStartError,cUserCont,cUserLabel,cBitField,cOctalZero,cCppOutWrapper,cCppInWrapper,@cCppOutInGroup,cFormat,cNumber,cFloat,cOctal,cOctalError,cNumbersCom,cCppParen,cCppBracket,cCppString | |
@@ -396,8 +401,8 @@ if s:ft ==# 'c' || exists("cpp_no_cpp11") | |
endif | |
" Avoid matching foo::bar() in C++ by requiring that the next char is not ':' | |
syn cluster cLabelGroup contains=cUserLabel | |
-syn match cUserCont display "^\s*\I\i*\s*:$" contains=@cLabelGroup | |
-syn match cUserCont display ";\s*\I\i*\s*:$" contains=@cLabelGroup | |
+syn match cUserCont display "^\s*\zs\I\i*\s*:$" contains=@cLabelGroup | |
+syn match cUserCont display ";\s*\zs\I\i*\s*:$" contains=@cLabelGroup | |
if s:ft ==# 'cpp' | |
syn match cUserCont display "^\s*\%(class\|struct\|enum\)\@!\I\i*\s*:[^:]"me=e-1 contains=@cLabelGroup | |
syn match cUserCont display ";\s*\%(class\|struct\|enum\)\@!\I\i*\s*:[^:]"me=e-1 contains=@cLabelGroup | |
diff --git a/syntax/cpp.vim b/syntax/cpp.vim | |
index fefd0ff..842df74 100644 | |
--- a/syntax/cpp.vim | |
+++ b/syntax/cpp.vim | |
@@ -2,7 +2,7 @@ | |
" Language: C++ | |
" Current Maintainer: vim-jp (https://github.com/vim-jp/vim-cpp) | |
" Previous Maintainer: Ken Shan <ccshan@post.harvard.edu> | |
-" Last Change: 2016 Jul 07 | |
+" Last Change: 2015 Nov 10 | |
" For version 5.x: Clear all syntax items | |
" For version 6.x: Quit when a syntax file was already loaded | |
@@ -37,7 +37,7 @@ syn keyword cppConstant __cplusplus | |
" C++ 11 extensions | |
if !exists("cpp_no_cpp11") | |
- syn keyword cppModifier override final | |
+ syn keyword cppModifier override final auto | |
syn keyword cppType nullptr_t | |
syn keyword cppExceptions noexcept | |
syn keyword cppStorageClass constexpr decltype thread_local |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment