Skip to content

Commit 29c6584

Browse files
ychinychin
committed
Merge remote-tracking branch 'vim/master'
2 parents d34e798 + 2447131 commit 29c6584

Some content is hidden

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

78 files changed

+1402
-452
lines changed

‎.github/MAINTAINERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ runtime/colors/torte.vim @habamax @romainl @neutaaaaan
4545
runtime/colors/wildcharm.vim @habamax @romainl @neutaaaaan
4646
runtime/colors/zaibatsu.vim @habamax @romainl @neutaaaaan
4747
runtime/colors/zellner.vim @habamax @romainl @neutaaaaan
48+
runtime/compiler/biome.vim @Konfekt
4849
runtime/compiler/checkstyle.vim @dkearns
4950
runtime/compiler/cm3.vim @dkearns
5051
runtime/compiler/cucumber.vim @tpope

‎runtime/autoload/tutor.vim‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ function! tutor#TutorCmd(tutor_name)
211211
endif
212212

213213
call tutor#SetupVim()
214-
exe "drop ".l:to_open
214+
exe "drop ".fnameescape(l:to_open)
215215
call tutor#EnableInteractive(v:true)
216216
endfunction
217217

‎runtime/compiler/biome.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: Biome (= linter for JavaScript, TypeScript, JSX, TSX, JSON,
3+
" JSONC, HTML, Vue, Svelte, Astro, CSS, GraphQL and GritQL files)
4+
" Maintainer: @Konfekt
5+
" Last Change: 2025 Nov 12
6+
if exists("current_compiler") | finish | endif
7+
let current_compiler = "biome"
8+
9+
let s:cpo_save = &cpo
10+
set cpo&vim
11+
12+
exe 'CompilerSet makeprg=' .. escape('biome check --linter-enabled=true --formatter-enabled=false --assist-enabled=false --reporter=github '
13+
\ .. get(b:, 'biome_makeprg_params', get(g:, 'biome_makeprg_params', '')), ' \|"')
14+
15+
CompilerSet errorformat=::%trror%.%#file=%f\\,line=%l\\,%.%#col=%c\\,%.%#::%m
16+
CompilerSet errorformat+=::%tarning%.%#file=%f\\,line=%l\\,%.%#col=%c\\,%.%#::%m
17+
CompilerSet errorformat+=::%totice%.%#file=%f\\,line=%l\\,%.%#col=%c\\,%.%#::%m
18+
CompilerSet errorformat+=%-G\\s%#
19+
CompilerSet errorformat+=%-Gcheck\ %.%#
20+
CompilerSet errorformat+=%-G%.%#Some\ errors\ were\ emitted\ while\ running\ checks%.
21+
22+
let &cpo = s:cpo_save
23+
unlet s:cpo_save

‎runtime/compiler/maven.vim‎

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,54 @@
77
" Original Source: https://github.com/mikelue/vim-maven-plugin/blob/master/compiler/maven.vim
88
" (distributed under same terms as LICENSE per
99
" https://github.com/mikelue/vim-maven-plugin/issues/13)
10-
" Last Change: 2024 Nov 12
10+
" Last Change: 2025 Nov 18
1111

1212
if exists("current_compiler")
1313
finish
1414
endif
1515
let current_compiler = "maven"
1616

17+
" CompilerSet makeprg=mvn
1718
execute $'CompilerSet makeprg=mvn\ --batch-mode\ {escape(get(b:, 'maven_makeprg_params', get(g:, 'maven_makeprg_params', '')), ' \|"')}'
1819

1920
" Error message for POM
2021
CompilerSet errorformat=[FATAL]\ Non-parseable\ POM\ %f:\ %m%\\s%\\+@%.%#line\ %l\\,\ column\ %c%.%#,
2122
CompilerSet errorformat+=[%tRROR]\ Malformed\ POM\ %f:\ %m%\\s%\\+@%.%#line\ %l\\,\ column\ %c%.%#
23+
" Handle Non-parseable POM with '@<line>:<col>' embedded in the 'position:' clause.
24+
CompilerSet errorformat+=[FATAL]\ Non-parseable\ POM\ %f:\ %m%\\s%\\+%.%#@%l:%c%.%#,
25+
CompilerSet errorformat+=[%tRROR]\ Malformed\ POM\ %f:\ %m%\\s%\\+%.%#@%l:%c%.%#,
2226

23-
" Java related build messages
27+
" JavaC messages with paths relative to module root:
28+
" With column:
2429
CompilerSet errorformat+=[%tARNING]\ %f:[%l\\,%c]\ %m
2530
CompilerSet errorformat+=[%tRROR]\ %f:[%l\\,%c]\ %m
2631
CompilerSet errorformat+=%A[%t%[A-Z]%#]\ %f:[%l\\,%c]\ %m,%Z
2732
CompilerSet errorformat+=%A%f:[%l\\,%c]\ %m,%Z
33+
" Without column:
34+
CompilerSet errorformat+=[%tARNING]\ %f:[%l]\ %m
35+
CompilerSet errorformat+=[%tRROR]\ %f:[%l]\ %m
36+
CompilerSet errorformat+=%A[%t%[A-Z]%#]\ %f:[%l]\ %m,%Z
37+
CompilerSet errorformat+=%A%f:[%l]\ %m,%Z
38+
39+
" Plug-in messages with absolute paths:
40+
" with column:
41+
CompilerSet errorformat+=[%tARNING]\ %f:%l:%c:\ %m
42+
CompilerSet errorformat+=[%tRROR]\ %f:%l:%c:\ %m
43+
CompilerSet errorformat+=%A[%t%[A-Z]%#]\ %f:%l:%c:\ %m,%Z
44+
CompilerSet errorformat+=%A%f:%l:%c:\ %m,%Z
45+
" without column:
46+
CompilerSet errorformat+=[%tARNING]\ %f:%l:\ %m
47+
CompilerSet errorformat+=[%tRROR]\ %f:%l:\ %m
48+
CompilerSet errorformat+=%A[%t%[A-Z]%#]\ %f:%l:\ %m,%Z
49+
CompilerSet errorformat+=%A%f:%l:\ %m,%Z
50+
51+
" SpotBugs
52+
CompilerSet errorformat+=[%tRROR]\ %m%\\s%\\+\[%*[^]]]%\\s%\\+In\ %f\ %.%#,
53+
CompilerSet errorformat+=[%tARNING]\ %m%\\s%\\+\[%*[^]]]%\\s%\\+In\ %f\ %.%#,
54+
CompilerSet errorformat+=[%tRROR]\ %.%#\ [aA]t\ %f:\[lines\ %l-%\\d\\+]\ %.%#,
55+
CompilerSet errorformat+=[%tARNING]\ %.%#\ [aA]t\ %f:\[lines\ %l-%\\d\\+]\ %.%#,
56+
CompilerSet errorformat+=[%tRROR]\ %.%#\ [aA]t\ %f:\[line\ %l]\ %.%#,
57+
CompilerSet errorformat+=[%tARNING]\ %.%#\ [aA]t\ %f:\[line\ %l]\ %.%#,
2858

2959
" jUnit related build messages
3060
CompilerSet errorformat+=%+E\ \ %#test%m,%Z
@@ -36,5 +66,7 @@ CompilerSet errorformat+=%+Z%\\s%#at\ %f(%\\f%\\+:%l),
3666
CompilerSet errorformat+=%+C%.%#
3767

3868
" Misc message removal
69+
" CompilerSet errorformat+=%-GPicked\ up\ _JAVA_OPTIONS\ %.%#,
70+
CompilerSet errorformat+=%-GAudit\ done.,
3971
CompilerSet errorformat+=%-G[INFO]\ %.%#,
4072
CompilerSet errorformat+=%-G[debug]\ %.%#

‎runtime/compiler/rime_deployer.vim‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
" Maintainer: Wu, Zhenyu <wuzhenyu@ustc.edu>
44
" URL: https://rime.im
55
" Latest Revision: 2024-04-09
6+
" Last Change: 2025 Nov 16 by The Vim Project (set errorformat)
67

78
if exists('b:current_compiler')
89
finish
@@ -25,6 +26,8 @@ for s:shared_data_dir in ['/sdcard/rime-data', '/run/current-system/sw/share/rim
2526
endfor
2627
execute 'CompilerSet makeprg=rime_deployer\ --build\ %:p:h:S\' s:shared_data_dir
2728
unlet s:prefix s:shared_data_dir
29+
" CompilerSet errorformat=%f:%l:%c:\ %m,%f:%l:\ %m
30+
CompilerSet errorformat&
2831

2932
let &cpoptions = s:save_cpoptions
3033
unlet s:save_cpoptions

‎runtime/compiler/rustc.vim‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
" Compiler: Rust Compiler
33
" Maintainer: Chris Morgan <me@chrismorgan.info>
44
" Latest Revision: 2023-09-11
5+
" 2025 Nov 15 by Vim project: remove test for Vim patch 7.4.191
56
" For bugs, patches and license go to https://github.com/rust-lang/rust.vim
67

78
if exists("current_compiler")
@@ -17,11 +18,7 @@ set cpo&vim
1718
if get(g:, 'rustc_makeprg_no_percent', 0)
1819
CompilerSet makeprg=rustc
1920
else
20-
if has('patch-7.4.191')
21-
CompilerSet makeprg=rustc\ \%:S
22-
else
23-
CompilerSet makeprg=rustc\ \"%\"
24-
endif
21+
CompilerSet makeprg=rustc\ \%:S
2522
endif
2623

2724
" New errorformat (after nightly 2016/08/10)

‎runtime/compiler/vimdoc.vim‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
" Language: vimdoc
33
" Maintainer: Wu, Zhenyu <wuzhenyu@ustc.edu>
44
" Latest Revision: 2024-04-13
5+
" Last Change: 2025 Nov 16 by The Vim Project (set errorformat)
56
"
67
" If you can not find 'vimdoc' in the package manager of your distribution e.g
78
" 'pip', then you may need to build it from its source.
@@ -15,6 +16,8 @@ let s:save_cpoptions = &cpoptions
1516
set cpoptions&vim
1617

1718
CompilerSet makeprg=vimdoc
19+
" CompilerSet errorformat=%f:%l:%c:\ %m,%f:%l:\ %m
20+
CompilerSet errorformat&
1821

1922
let &cpoptions = s:save_cpoptions
2023
unlet s:save_cpoptions

‎runtime/compiler/yamllint.vim‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,14 @@
33
" Maintainer: Romain Lafourcade <romainlafourcade@gmail.com>
44
" Last Change: 2021 July 21
55
" 2024 Apr 03 by The Vim Project (removed :CompilerSet definition)
6+
" 2025 Nov 16 by The Vim Project (set errorformat)
67

78
if exists("current_compiler")
89
finish
910
endif
1011
let current_compiler = "yamllint"
1112

1213
CompilerSet makeprg=yamllint\ -f\ parsable
14+
" CompilerSet errorformat=%f:%l:%c:\ [%t%*[^]]]\ %m,%f:%l:%c:\ [%*[^]]]\ %m
15+
CompilerSet errorformat&
1316

‎runtime/compiler/zig_build_exe.vim‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" Vim compiler file
22
" Compiler: Zig Compiler (zig build-exe)
33
" Upstream: https://github.com/ziglang/zig.vim
4-
" Last Change: 2024 Apr 05 by The Vim Project (removed :CompilerSet definition)
4+
" Last Change: 2025 Nov 16 by The Vim Project (set errorformat)
55

66
if exists('current_compiler')
77
finish
@@ -12,11 +12,9 @@ let current_compiler = 'zig_build_exe'
1212
let s:save_cpo = &cpo
1313
set cpo&vim
1414

15-
if has('patch-7.4.191')
16-
CompilerSet makeprg=zig\ build-exe\ \%:S\ \$*
17-
else
18-
CompilerSet makeprg=zig\ build-exe\ \"%\"\ \$*
19-
endif
15+
CompilerSet makeprg=zig\ build-exe\ \%:S\ \$*
16+
" CompilerSet errorformat=%f:%l:%c: %t%*[^:]: %m, %f:%l:%c: %m, %f:%l: %m
17+
CompilerSet errorformat&
2018

2119
let &cpo = s:save_cpo
2220
unlet s:save_cpo

‎runtime/compiler/zig_test.vim‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" Vim compiler file
22
" Compiler: Zig Compiler (zig test)
33
" Upstream: https://github.com/ziglang/zig.vim
4-
" Last Change: 2024 Apr 05 by The Vim Project (removed :CompilerSet definition)
4+
" Last Change: 2025 Nov 16 by The Vim Project (set errorformat)
55

66
if exists('current_compiler')
77
finish
@@ -12,11 +12,9 @@ let current_compiler = 'zig_test'
1212
let s:save_cpo = &cpo
1313
set cpo&vim
1414

15-
if has('patch-7.4.191')
16-
CompilerSet makeprg=zig\ test\ \%:S\ \$*
17-
else
18-
CompilerSet makeprg=zig\ test\ \"%\"\ \$*
19-
endif
15+
CompilerSet makeprg=zig\ test\ \%:S\ \$*
16+
" CompilerSet errorformat=%f:%l:%c: %t%*[^:]: %m, %f:%l:%c: %m, %f:%l: %m
17+
CompilerSet errorformat&
2018

2119
let &cpo = s:save_cpo
2220
unlet s:save_cpo

0 commit comments

Comments
 (0)