diff options
| -rw-r--r-- | runtime/compiler/gcc.vim | 10 | ||||
| -rw-r--r-- | runtime/doc/change.txt | 6 | ||||
| -rw-r--r-- | runtime/filetype.vim | 3 | ||||
| -rw-r--r-- | runtime/makemenu.vim | 1 | ||||
| -rw-r--r-- | runtime/synmenu.vim | 85 | ||||
| -rw-r--r-- | runtime/syntax/json.vim | 24 | ||||
| -rw-r--r-- | runtime/syntax/vuejs.vim | 14 |
7 files changed, 84 insertions, 59 deletions
diff --git a/runtime/compiler/gcc.vim b/runtime/compiler/gcc.vim index 1af568de57..30e5149f9f 100644 --- a/runtime/compiler/gcc.vim +++ b/runtime/compiler/gcc.vim @@ -2,6 +2,8 @@ " Compiler: GNU C Compiler " Previous Maintainer: Nikolai Weibull <now@bitwi.se> " Latest Revision: 2010-10-14 +" changed pattern for entering/leaving directories +" by Daniel Hahler, 2019 Jul 12 " added line suggested by Anton Lindqvist 2016 Mar 31 if exists("current_compiler") @@ -27,10 +29,10 @@ CompilerSet errorformat= \%f:%l:\ %m, \%f:\\(%*[^\\)]\\):\ %m, \\"%f\"\\,\ line\ %l%*\\D%c%*[^\ ]\ %m, - \%D%*\\a[%*\\d]:\ Entering\ directory\ [`']%f', - \%X%*\\a[%*\\d]:\ Leaving\ directory\ [`']%f', - \%D%*\\a:\ Entering\ directory\ [`']%f', - \%X%*\\a:\ Leaving\ directory\ [`']%f', + \%D%*\\a[%*\\d]:\ Entering\ directory\ %*[`']%f', + \%X%*\\a[%*\\d]:\ Leaving\ directory\ %*[`']%f', + \%D%*\\a:\ Entering\ directory\ %*[`']%f', + \%X%*\\a:\ Leaving\ directory\ %*[`']%f', \%DMaking\ %*\\a\ in\ %f if exists('g:compiler_gcc_ignore_unmatched_lines') diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt index 2259eddb6a..72f2852fb9 100644 --- a/runtime/doc/change.txt +++ b/runtime/doc/change.txt @@ -1137,9 +1137,9 @@ There are ten types of registers: *registers* *E354* 2. 10 numbered registers "0 to "9 3. The small delete register "- 4. 26 named registers "a to "z or "A to "Z -5. three read-only registers ":, "., "% -6. alternate buffer register "# -7. the expression register "= +5. Three read-only registers ":, "., "% +6. Alternate buffer register "# +7. The expression register "= 8. The selection registers "* and "+ 9. The black hole register "_ 10. Last search pattern register "/ diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 6504f610a0..473c169061 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -703,6 +703,9 @@ au BufNewFile,BufRead *.t.html setf tilde " HTML (.shtml and .stm for server side) au BufNewFile,BufRead *.html,*.htm,*.shtml,*.stm call dist#ft#FThtml() +" Vue.js Single File Component +au BufNewFile,BufRead *.vue setf vuejs + " HTML with Ruby - eRuby au BufNewFile,BufRead *.erb,*.rhtml setf eruby diff --git a/runtime/makemenu.vim b/runtime/makemenu.vim index 3d76b4240e..7fb126977a 100644 --- a/runtime/makemenu.vim +++ b/runtime/makemenu.vim @@ -272,6 +272,7 @@ SynMenu HIJK.HTML.HTML\ with\ M4:htmlm4 SynMenu HIJK.HTML.HTML\ with\ Ruby\ (eRuby):eruby SynMenu HIJK.HTML.Cheetah\ HTML\ template:htmlcheetah SynMenu HIJK.HTML.Django\ HTML\ template:htmldjango +SynMenu HIJK.HTML.Vue.js\ HTML\ template:vuejs SynMenu HIJK.HTML.HTML/OS:htmlos SynMenu HIJK.HTML.XHTML:xhtml SynMenu HIJK.Host\.conf:hostconf diff --git a/runtime/synmenu.vim b/runtime/synmenu.vim index ec4c48b3da..e8c9933abf 100644 --- a/runtime/synmenu.vim +++ b/runtime/synmenu.vim @@ -252,48 +252,49 @@ an 50.50.220 &Syntax.HIJK.HTML.HTML\ with\ M4 :cal SetSyn("htmlm4")<CR> an 50.50.230 &Syntax.HIJK.HTML.HTML\ with\ Ruby\ (eRuby) :cal SetSyn("eruby")<CR> an 50.50.240 &Syntax.HIJK.HTML.Cheetah\ HTML\ template :cal SetSyn("htmlcheetah")<CR> an 50.50.250 &Syntax.HIJK.HTML.Django\ HTML\ template :cal SetSyn("htmldjango")<CR> -an 50.50.260 &Syntax.HIJK.HTML.HTML/OS :cal SetSyn("htmlos")<CR> -an 50.50.270 &Syntax.HIJK.HTML.XHTML :cal SetSyn("xhtml")<CR> -an 50.50.280 &Syntax.HIJK.Host\.conf :cal SetSyn("hostconf")<CR> -an 50.50.290 &Syntax.HIJK.Hosts\ access :cal SetSyn("hostsaccess")<CR> -an 50.50.300 &Syntax.HIJK.Hyper\ Builder :cal SetSyn("hb")<CR> -an 50.50.320 &Syntax.HIJK.Icewm\ menu :cal SetSyn("icemenu")<CR> -an 50.50.330 &Syntax.HIJK.Icon :cal SetSyn("icon")<CR> -an 50.50.340 &Syntax.HIJK.IDL\Generic\ IDL :cal SetSyn("idl")<CR> -an 50.50.350 &Syntax.HIJK.IDL\Microsoft\ IDL :cal SetSyn("msidl")<CR> -an 50.50.360 &Syntax.HIJK.Indent\ profile :cal SetSyn("indent")<CR> -an 50.50.370 &Syntax.HIJK.Inform :cal SetSyn("inform")<CR> -an 50.50.380 &Syntax.HIJK.Informix\ 4GL :cal SetSyn("fgl")<CR> -an 50.50.390 &Syntax.HIJK.Initng :cal SetSyn("initng")<CR> -an 50.50.400 &Syntax.HIJK.Inittab :cal SetSyn("inittab")<CR> -an 50.50.410 &Syntax.HIJK.Inno\ setup :cal SetSyn("iss")<CR> -an 50.50.420 &Syntax.HIJK.Innovation\ Data\ Processing.Upstream\ dat :cal SetSyn("upstreamdat")<CR> -an 50.50.430 &Syntax.HIJK.Innovation\ Data\ Processing.Upstream\ log :cal SetSyn("upstreamlog")<CR> -an 50.50.440 &Syntax.HIJK.Innovation\ Data\ Processing.Upstream\ rpt :cal SetSyn("upstreamrpt")<CR> -an 50.50.450 &Syntax.HIJK.Innovation\ Data\ Processing.Upstream\ Install\ log :cal SetSyn("upstreaminstalllog")<CR> -an 50.50.460 &Syntax.HIJK.Innovation\ Data\ Processing.Usserver\ log :cal SetSyn("usserverlog")<CR> -an 50.50.470 &Syntax.HIJK.Innovation\ Data\ Processing.USW2KAgt\ log :cal SetSyn("usw2kagtlog")<CR> -an 50.50.480 &Syntax.HIJK.InstallShield\ script :cal SetSyn("ishd")<CR> -an 50.50.490 &Syntax.HIJK.Interactive\ Data\ Lang :cal SetSyn("idlang")<CR> -an 50.50.500 &Syntax.HIJK.IPfilter :cal SetSyn("ipfilter")<CR> -an 50.50.520 &Syntax.HIJK.J :cal SetSyn("j")<CR> -an 50.50.530 &Syntax.HIJK.JAL :cal SetSyn("jal")<CR> -an 50.50.540 &Syntax.HIJK.JAM :cal SetSyn("jam")<CR> -an 50.50.550 &Syntax.HIJK.Jargon :cal SetSyn("jargon")<CR> -an 50.50.560 &Syntax.HIJK.Java.Java :cal SetSyn("java")<CR> -an 50.50.570 &Syntax.HIJK.Java.JavaCC :cal SetSyn("javacc")<CR> -an 50.50.580 &Syntax.HIJK.Java.Java\ Server\ Pages :cal SetSyn("jsp")<CR> -an 50.50.590 &Syntax.HIJK.Java.Java\ Properties :cal SetSyn("jproperties")<CR> -an 50.50.600 &Syntax.HIJK.JavaScript :cal SetSyn("javascript")<CR> -an 50.50.610 &Syntax.HIJK.Jess :cal SetSyn("jess")<CR> -an 50.50.620 &Syntax.HIJK.Jgraph :cal SetSyn("jgraph")<CR> -an 50.50.630 &Syntax.HIJK.Jovial :cal SetSyn("jovial")<CR> -an 50.50.640 &Syntax.HIJK.JSON :cal SetSyn("json")<CR> -an 50.50.660 &Syntax.HIJK.Kconfig :cal SetSyn("kconfig")<CR> -an 50.50.670 &Syntax.HIJK.KDE\ script :cal SetSyn("kscript")<CR> -an 50.50.680 &Syntax.HIJK.Kimwitu++ :cal SetSyn("kwt")<CR> -an 50.50.690 &Syntax.HIJK.Kivy :cal SetSyn("kivy")<CR> -an 50.50.700 &Syntax.HIJK.KixTart :cal SetSyn("kix")<CR> +an 50.50.260 &Syntax.HIJK.HTML.Vue.js\ HTML\ template :cal SetSyn("vuejs")<CR> +an 50.50.270 &Syntax.HIJK.HTML.HTML/OS :cal SetSyn("htmlos")<CR> +an 50.50.280 &Syntax.HIJK.HTML.XHTML :cal SetSyn("xhtml")<CR> +an 50.50.290 &Syntax.HIJK.Host\.conf :cal SetSyn("hostconf")<CR> +an 50.50.300 &Syntax.HIJK.Hosts\ access :cal SetSyn("hostsaccess")<CR> +an 50.50.310 &Syntax.HIJK.Hyper\ Builder :cal SetSyn("hb")<CR> +an 50.50.330 &Syntax.HIJK.Icewm\ menu :cal SetSyn("icemenu")<CR> +an 50.50.340 &Syntax.HIJK.Icon :cal SetSyn("icon")<CR> +an 50.50.350 &Syntax.HIJK.IDL\Generic\ IDL :cal SetSyn("idl")<CR> +an 50.50.360 &Syntax.HIJK.IDL\Microsoft\ IDL :cal SetSyn("msidl")<CR> +an 50.50.370 &Syntax.HIJK.Indent\ profile :cal SetSyn("indent")<CR> +an 50.50.380 &Syntax.HIJK.Inform :cal SetSyn("inform")<CR> +an 50.50.390 &Syntax.HIJK.Informix\ 4GL :cal SetSyn("fgl")<CR> +an 50.50.400 &Syntax.HIJK.Initng :cal SetSyn("initng")<CR> +an 50.50.410 &Syntax.HIJK.Inittab :cal SetSyn("inittab")<CR> +an 50.50.420 &Syntax.HIJK.Inno\ setup :cal SetSyn("iss")<CR> +an 50.50.430 &Syntax.HIJK.Innovation\ Data\ Processing.Upstream\ dat :cal SetSyn("upstreamdat")<CR> +an 50.50.440 &Syntax.HIJK.Innovation\ Data\ Processing.Upstream\ log :cal SetSyn("upstreamlog")<CR> +an 50.50.450 &Syntax.HIJK.Innovation\ Data\ Processing.Upstream\ rpt :cal SetSyn("upstreamrpt")<CR> +an 50.50.460 &Syntax.HIJK.Innovation\ Data\ Processing.Upstream\ Install\ log :cal SetSyn("upstreaminstalllog")<CR> +an 50.50.470 &Syntax.HIJK.Innovation\ Data\ Processing.Usserver\ log :cal SetSyn("usserverlog")<CR> +an 50.50.480 &Syntax.HIJK.Innovation\ Data\ Processing.USW2KAgt\ log :cal SetSyn("usw2kagtlog")<CR> +an 50.50.490 &Syntax.HIJK.InstallShield\ script :cal SetSyn("ishd")<CR> +an 50.50.500 &Syntax.HIJK.Interactive\ Data\ Lang :cal SetSyn("idlang")<CR> +an 50.50.510 &Syntax.HIJK.IPfilter :cal SetSyn("ipfilter")<CR> +an 50.50.530 &Syntax.HIJK.J :cal SetSyn("j")<CR> +an 50.50.540 &Syntax.HIJK.JAL :cal SetSyn("jal")<CR> +an 50.50.550 &Syntax.HIJK.JAM :cal SetSyn("jam")<CR> +an 50.50.560 &Syntax.HIJK.Jargon :cal SetSyn("jargon")<CR> +an 50.50.570 &Syntax.HIJK.Java.Java :cal SetSyn("java")<CR> +an 50.50.580 &Syntax.HIJK.Java.JavaCC :cal SetSyn("javacc")<CR> +an 50.50.590 &Syntax.HIJK.Java.Java\ Server\ Pages :cal SetSyn("jsp")<CR> +an 50.50.600 &Syntax.HIJK.Java.Java\ Properties :cal SetSyn("jproperties")<CR> +an 50.50.610 &Syntax.HIJK.JavaScript :cal SetSyn("javascript")<CR> +an 50.50.620 &Syntax.HIJK.Jess :cal SetSyn("jess")<CR> +an 50.50.630 &Syntax.HIJK.Jgraph :cal SetSyn("jgraph")<CR> +an 50.50.640 &Syntax.HIJK.Jovial :cal SetSyn("jovial")<CR> +an 50.50.650 &Syntax.HIJK.JSON :cal SetSyn("json")<CR> +an 50.50.670 &Syntax.HIJK.Kconfig :cal SetSyn("kconfig")<CR> +an 50.50.680 &Syntax.HIJK.KDE\ script :cal SetSyn("kscript")<CR> +an 50.50.690 &Syntax.HIJK.Kimwitu++ :cal SetSyn("kwt")<CR> +an 50.50.700 &Syntax.HIJK.Kivy :cal SetSyn("kivy")<CR> +an 50.50.710 &Syntax.HIJK.KixTart :cal SetSyn("kix")<CR> an 50.60.100 &Syntax.L.Lace :cal SetSyn("lace")<CR> an 50.60.110 &Syntax.L.LamdaProlog :cal SetSyn("lprolog")<CR> an 50.60.120 &Syntax.L.Latte :cal SetSyn("latte")<CR> diff --git a/runtime/syntax/json.vim b/runtime/syntax/json.vim index d80af84312..e3210a9702 100644 --- a/runtime/syntax/json.vim +++ b/runtime/syntax/json.vim @@ -1,7 +1,8 @@ " Vim syntax file " Language: JSON -" Maintainer: Eli Parra <eli@elzr.com> -" Last Change: 2014 Aug 23 +" Maintainer: vacancy +" Previous Maintainer: Eli Parra <eli@elzr.com> +" Last Change: 2019 Jul 08 " Version: 0.12 if !exists("main_syntax") @@ -16,8 +17,19 @@ syntax match jsonNoise /\%(:\|,\)/ " NOTE that for the concealing to work your conceallevel should be set to 2 +" Syntax: JSON Keywords +" Separated into a match and region because a region by itself is always greedy +syn match jsonKeywordMatch /"\([^"]\|\\\"\)\+"[[:blank:]\r\n]*\:/ contains=jsonKeyword +if has('conceal') + syn region jsonKeyword matchgroup=jsonQuote start=/"/ end=/"\ze[[:blank:]\r\n]*\:/ concealends contained +else + syn region jsonKeyword matchgroup=jsonQuote start=/"/ end=/"\ze[[:blank:]\r\n]*\:/ contained +endif + " Syntax: Strings " Separated into a match and region because a region by itself is always greedy +" Needs to come after keywords or else a json encoded string will break the +" syntax syn match jsonStringMatch /"\([^"]\|\\\"\)\+"\ze[[:blank:]\r\n]*[,}\]]/ contains=jsonString if has('conceal') syn region jsonString oneline matchgroup=jsonQuote start=/"/ skip=/\\\\\|\\"/ end=/"/ concealends contains=jsonEscape contained @@ -28,14 +40,6 @@ endif " Syntax: JSON does not allow strings with single quotes, unlike JavaScript. syn region jsonStringSQError oneline start=+'+ skip=+\\\\\|\\"+ end=+'+ -" Syntax: JSON Keywords -" Separated into a match and region because a region by itself is always greedy -syn match jsonKeywordMatch /"\([^"]\|\\\"\)\+"[[:blank:]\r\n]*\:/ contains=jsonKeyword -if has('conceal') - syn region jsonKeyword matchgroup=jsonQuote start=/"/ end=/"\ze[[:blank:]\r\n]*\:/ concealends contained -else - syn region jsonKeyword matchgroup=jsonQuote start=/"/ end=/"\ze[[:blank:]\r\n]*\:/ contained -endif " Syntax: Escape sequences syn match jsonEscape "\\["\\/bfnrt]" contained diff --git a/runtime/syntax/vuejs.vim b/runtime/syntax/vuejs.vim new file mode 100644 index 0000000000..bad0e26c42 --- /dev/null +++ b/runtime/syntax/vuejs.vim @@ -0,0 +1,14 @@ +" Vim syntax file +" Language: Vue.js Single File Component +" Maintainer: Ralph Giles <giles@thaumas.net> +" URL: https://vuejs.org/v2/guide/single-file-components.html +" Last Change: 2019 Jul 8 + +" Quit if a syntax file was already loaded. +if exists("b:current_syntax") + finish +endif + +" We have a collection of html, css and javascript wrapped in +" tags. The default HTML syntax highlight works well enough. +runtime! syntax/html.vim |