Skip to content

Commit 8663578

Browse files
committed
Merge remote-tracking branch 'vim/master'
2 parents e34eb59 + 64e2db6 commit 8663578

94 files changed

Lines changed: 3585 additions & 1705 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/CODEOWNERS

Lines changed: 49 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,33 +18,75 @@
1818
#runtime/autoload/tar.vim @cecamp
1919
#runtime/autoload/vimball.vim @cecamp
2020
#runtime/autoload/zip.vim @cecamp
21+
#runtime/compiler/checkstyle.vim @dkearns
22+
#runtime/compiler/dart.vim @dkearns
23+
#runtime/compiler/dart2js.vim @dkearns
24+
#runtime/compiler/dart2native.vim @dkearns
25+
#runtime/compiler/dartanalyser.vim @dkearns
26+
#runtime/compiler/dartdevc.vim @dkearns
27+
#runtime/compiler/dartdoc.vim @dkearns
28+
#runtime/compiler/dartfmt.vim @dkearns
29+
#runtime/compiler/eruby.vim @dkearns
30+
#runtime/compiler/gawk.vim @dkearns
31+
#runtime/compiler/gjs.vim @dkearns
32+
#runtime/compiler/javac.vim @dkearns
33+
#runtime/compiler/jest.vim @dkearns
34+
#runtime/compiler/jjs.vim @dkearns
35+
#runtime/compiler/jshint.vim @dkearns
36+
#runtime/compiler/jsonlint.vim @dkearns
37+
#runtime/compiler/php.vim @dkearns
38+
#runtime/compiler/rhino.vim @dkearns
39+
#runtime/compiler/rubocop.vim @dkearns
40+
#runtime/compiler/rubyunit.vim @dkearns
41+
#runtime/compiler/se.vim @dkearns
42+
#runtime/compiler/stylelint.vim @dkearns
43+
#runtime/compiler/tcl.vim @dkearns
44+
#runtime/compiler/tidy.vim @dkearns
45+
#runtime/compiler/ts-node.vim @dkearns
46+
#runtime/compiler/tsc.vim @dkearns
47+
#runtime/compiler/typedoc.vim @dkearns
48+
#runtime/compiler/xmllint.vim @dkearns
49+
#runtime/compiler/xo.vim @dkearns
2150
#runtime/doc/pi_getscript.txt @cecamp
2251
#runtime/doc/pi_logipat.txt @cecamp
2352
#runtime/doc/pi_netrw.txt @cecamp
2453
#runtime/doc/pi_tar.txt @cecamp
2554
#runtime/doc/pi_vimball.txt @cecamp
2655
#runtime/doc/pi_zip.txt @cecamp
27-
#runtime/plugin/getscriptPlugin.vim @cecamp
28-
#runtime/plugin/logiPat.vim @cecamp
29-
#runtime/plugin/netrwPlugin.vim @cecamp
30-
#runtime/plugin/tarPlugin.vim @cecamp
31-
#runtime/plugin/vimballPlugin.vim @cecamp
32-
#runtime/plugin/zipPlugin.vim @cecamp
56+
#runtime/ftplugin/css.vim @dkearns
57+
#runtime/ftplugin/eiffel.vim @dkearns
58+
#runtime/ftplugin/javascript.vim @dkearns
59+
#runtime/ftplugin/javascriptreact.vim @dkearns
60+
#runtime/ftplugin/typescript.vim @dkearns
61+
#runtime/ftplugin/typescriptreact.vim @dkearns
3362
#runtime/plugin/amiga.vim @cecamp
3463
#runtime/plugin/csh.vim @cecamp
3564
#runtime/plugin/dcl.vim @cecamp
36-
#runtime/plugin/wlmfilt.vim @cecamp
3765
#runtime/plugin/exports.vim @cecamp
66+
#runtime/plugin/getscriptPlugin.vim @cecamp
3867
#runtime/plugin/lex.vim @cecamp
3968
#runtime/plugin/lisp.vim @cecamp
69+
#runtime/plugin/logiPat.vim @cecamp
4070
#runtime/plugin/maple.vim @cecamp
4171
#runtime/plugin/netrw.vim @cecamp
72+
#runtime/plugin/netrwPlugin.vim @cecamp
4273
#runtime/plugin/rpcgen.vim @cecamp
4374
#runtime/plugin/sh.vim @cecamp
4475
#runtime/plugin/sm.vim @cecamp
4576
#runtime/plugin/tags.vim @cecamp
77+
#runtime/plugin/tarPlugin.vim @cecamp
4678
#runtime/plugin/tex.vim @cecamp
4779
#runtime/plugin/vim.vim @cecamp
80+
#runtime/plugin/vimballPlugin.vim @cecamp
81+
#runtime/plugin/wlmfilt.vim @cecamp
4882
#runtime/plugin/xmath.vim @cecamp
4983
#runtime/plugin/xxd.vim @cecamp
5084
#runtime/plugin/yacc.vim @cecamp
85+
#runtime/plugin/zipPlugin.vim @cecamp
86+
#runtime/syntax/lynx.vim @dkearns
87+
#runtime/syntax/mailcap.vim @dkearns
88+
#runtime/syntax/privoxy.vim @dkearns
89+
#runtime/syntax/ruby.vim @dkearns
90+
#runtime/syntax/tidy.vim @dkearns
91+
#runtime/syntax/wget.vim @dkearns
92+
#runtime/syntax/xbl.vim @dkearns

Filelist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -623,7 +623,7 @@ SRC_AMI = \
623623
README_amisrc.txt.info \
624624
src.info \
625625
src/INSTALLami.txt \
626-
src/Make_morph.mak \
626+
src/Make_ami.mak \
627627
src/os_amiga.c \
628628
src/os_amiga.h \
629629
src/proto/os_amiga.pro \

runtime/compiler/dart.vim

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
" Vim compiler file
2+
" Compiler: Dart VM
3+
" Maintainer: Doug Kearns <[email protected]>
4+
" Last Change: 2019 May 08
5+
6+
if exists("current_compiler")
7+
finish
8+
endif
9+
let current_compiler = "dart"
10+
11+
if exists(":CompilerSet") != 2 " older Vim always used :setlocal
12+
command -nargs=* CompilerSet setlocal <args>
13+
endif
14+
15+
let s:cpo_save = &cpo
16+
set cpo&vim
17+
18+
CompilerSet makeprg=dart
19+
CompilerSet errorformat=%E%f:%l:%c:\ Error:\ %m,
20+
\%CTry\ %.%#,
21+
\%Z\ %#^%\\+,
22+
\%C%.%#,
23+
\%-G%.%#
24+
25+
let &cpo = s:cpo_save
26+
unlet s:cpo_save

runtime/compiler/dart2js.vim

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
" Vim compiler file
2+
" Compiler: Dart to JavaScript Compiler
3+
" Maintainer: Doug Kearns <[email protected]>
4+
" Last Change: 2019 May 08
5+
6+
if exists("current_compiler")
7+
finish
8+
endif
9+
let current_compiler = "dart2js"
10+
11+
if exists(":CompilerSet") != 2 " older Vim always used :setlocal
12+
command -nargs=* CompilerSet setlocal <args>
13+
endif
14+
15+
let s:cpo_save = &cpo
16+
set cpo&vim
17+
18+
CompilerSet makeprg=dart2js
19+
CompilerSet errorformat=%E%f:%l:%c:,
20+
\%-GError:\ Compilation\ failed.,
21+
\%CError:\ %m,
22+
\%Z\ %#^%\\+,
23+
\%C%.%#,
24+
\%trror:\ %m,
25+
\%-G%.%#
26+
27+
let &cpo = s:cpo_save
28+
unlet s:cpo_save

runtime/compiler/dart2native.vim

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
" Vim compiler file
2+
" Compiler: Dart to Native Compiler
3+
" Maintainer: Doug Kearns <[email protected]>
4+
" Last Change: 2019 May 08
5+
6+
if exists("current_compiler")
7+
finish
8+
endif
9+
let current_compiler = "dart2native"
10+
11+
if exists(":CompilerSet") != 2 " older Vim always used :setlocal
12+
command -nargs=* CompilerSet setlocal <args>
13+
endif
14+
15+
let s:cpo_save = &cpo
16+
set cpo&vim
17+
18+
CompilerSet makeprg=dart2native
19+
CompilerSet errorformat=%E%f:%l:%c:\ Error:\ %m,
20+
\%CTry\ %.%#,
21+
\%Z\ %#^%\\+,
22+
\%Z%$,
23+
\%C%.%#,
24+
\%E%f:\ %trror:\ %m,
25+
\%-G%.%#
26+
27+
let &cpo = s:cpo_save
28+
unlet s:cpo_save

runtime/compiler/dartanalyser.vim

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
" Vim compiler file
2+
" Compiler: Dart Analyzer
3+
" Maintainer: Doug Kearns <[email protected]>
4+
" Last Change: 2019 May 08
5+
6+
if exists("current_compiler")
7+
finish
8+
endif
9+
let current_compiler = "dartanalyzer"
10+
11+
if exists(":CompilerSet") != 2 " older Vim always used :setlocal
12+
command -nargs=* CompilerSet setlocal <args>
13+
endif
14+
15+
let s:cpo_save = &cpo
16+
set cpo&vim
17+
18+
CompilerSet makeprg=dartanalyzer\ --format\ machine
19+
CompilerSet errorformat=%t%\\w%\\+\|%\\w%\\+\|%\\w%\\+\|%f\|%l\|%c\|%\\d%\\+\|%m,
20+
\%-G%.%#
21+
22+
let &cpo = s:cpo_save
23+
unlet s:cpo_save

runtime/compiler/dartdevc.vim

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
" Vim compiler file
2+
" Compiler: Dart Development Compiler
3+
" Maintainer: Doug Kearns <[email protected]>
4+
" Last Change: 2019 May 08
5+
6+
if exists("current_compiler")
7+
finish
8+
endif
9+
let current_compiler = "dartdevc"
10+
11+
if exists(":CompilerSet") != 2 " older Vim always used :setlocal
12+
command -nargs=* CompilerSet setlocal <args>
13+
endif
14+
15+
let s:cpo_save = &cpo
16+
set cpo&vim
17+
18+
CompilerSet makeprg=dartdevc
19+
CompilerSet errorformat=%E%f:%l:%c:\ Error:\ %m,
20+
\%CTry\ %.%#,
21+
\%Z\ %#^%\\+,
22+
\%Z%$,
23+
\%C%.%#,
24+
\%E%f:\ %trror:\ %m,
25+
\%-G%.%#
26+
27+
let &cpo = s:cpo_save
28+
unlet s:cpo_save

runtime/compiler/dartdoc.vim

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
" Vim compiler file
2+
" Compiler: Dart Documentation Generator
3+
" Maintainer: Doug Kearns <[email protected]>
4+
" Last Change: 2019 May 08
5+
6+
if exists("current_compiler")
7+
finish
8+
endif
9+
let current_compiler = "dartdoc"
10+
11+
if exists(":CompilerSet") != 2 " older Vim always used :setlocal
12+
command -nargs=* CompilerSet setlocal <args>
13+
endif
14+
15+
let s:cpo_save = &cpo
16+
set cpo&vim
17+
18+
CompilerSet makeprg=dartdoc
19+
CompilerSet errorformat=\ \ %tarning:\ %m,
20+
\\ \ %trror:\ %m,
21+
\%+EGeneration\ failed:\ %m,
22+
\%+ISuccess!\ Docs\ generated\ into\ %f,
23+
\%-G%.%#
24+
25+
let &cpo = s:cpo_save
26+
unlet s:cpo_save

runtime/compiler/dartfmt.vim

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
" Vim compiler file
2+
" Compiler: Dart Formatter
3+
" Maintainer: Doug Kearns <[email protected]>
4+
" Last Change: 2019 May 08
5+
6+
if exists("current_compiler")
7+
finish
8+
endif
9+
let current_compiler = "dartfmt"
10+
11+
if exists(":CompilerSet") != 2 " older Vim always used :setlocal
12+
command -nargs=* CompilerSet setlocal <args>
13+
endif
14+
15+
let s:cpo_save = &cpo
16+
set cpo&vim
17+
18+
CompilerSet makeprg=dartfmt
19+
CompilerSet errorformat=%Eline\ %l\\,\ column\ %c\ of\ %f:\ %m,
20+
\%Z\ %\\{3}│\ %\\+^%\\+,
21+
\%C%.%#,
22+
\%-G%.%#
23+
24+
let &cpo = s:cpo_save
25+
unlet s:cpo_save

runtime/compiler/javac.vim

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" Vim compiler file
2-
" Compiler: javac
2+
" Compiler: Java Development Kit Compiler
33
" Maintainer: Doug Kearns <[email protected]>
4-
" Last Change: 2004 Nov 27
4+
" Last Change: 2019 Oct 21
55

66
if exists("current_compiler")
77
finish
@@ -12,6 +12,15 @@ if exists(":CompilerSet") != 2 " older Vim always used :setlocal
1212
command -nargs=* CompilerSet setlocal <args>
1313
endif
1414

15+
let s:cpo_save = &cpo
16+
set cpo&vim
17+
1518
CompilerSet makeprg=javac
19+
CompilerSet errorformat=%E%f:%l:\ error:\ %m,
20+
\%W%f:%l:\ warning:\ %m,
21+
\%-Z%p^,
22+
\%-C%.%#,
23+
\%-G%.%#
1624

17-
CompilerSet errorformat=%E%f:%l:\ %m,%-Z%p^,%-C%.%#,%-G%.%#
25+
let &cpo = s:cpo_save
26+
unlet s:cpo_save

0 commit comments

Comments
 (0)