Skip to content

Commit dd7cd49

Browse files
rbtnnrbtnn
committed
Merge remote-tracking branch 'upstream/master' into tabsidebar
2 parents 0d3a66d + 2347330 commit dd7cd49

20 files changed

+93
-76
lines changed

‎runtime/compiler/context.vim

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ vim9script
66
# Contributors: Enno Nagel
77
# Last Change: 2024 Mar 29
88
# 2024 Apr 03 by The Vim Project (removed :CompilerSet definition)
9+
# 2025 Mar 11 by The Vim Project (add comment for Dispatch)
910

1011
if exists("g:current_compiler")
1112
finish
@@ -15,6 +16,7 @@ import autoload '../autoload/context.vim'
1516

1617
g:current_compiler = 'context'
1718

19+
# CompilerSet makeprg=context
1820
if get(b:, 'context_ignore_makefile', get(g:, 'context_ignore_makefile', 0)) ||
1921
(!filereadable('Makefile') && !filereadable('makefile'))
2022
var makeprg = join(context.ConTeXtCmd(shellescape(expand('%:p:t'))), ' ')

‎runtime/compiler/javac.vim

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
" Compiler: Java Development Kit Compiler
33
" Maintainer: Doug Kearns <[email protected]>
44
" Last Change: 2024 Nov 19 (enable local javac_makeprg_params)
5+
" 2025 Mar 11 (add comment for Dispatch)
56

67
if exists("current_compiler")
78
finish
@@ -11,6 +12,7 @@ let current_compiler = "javac"
1112
let s:cpo_save = &cpo
1213
set cpo&vim
1314

15+
" CompilerSet makeprg=javac
1416
execute $'CompilerSet makeprg=javac\ {escape(get(b:, 'javac_makeprg_params', get(g:, 'javac_makeprg_params', '')), ' \|"')}'
1517

1618
CompilerSet errorformat=%E%f:%l:\ error:\ %m,

‎runtime/compiler/powershell.vim

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
" 2024 Apr 03 by the Vim Project (removed :CompilerSet definition)
77
" 2024 Apr 05 by the Vim Project (avoid leaving behind g:makeprg)
88
" 2024 Nov 19 by the Vim Project (properly escape makeprg setting)
9+
" 2025 Mar 11 by the Vim Project (add comment for Dispatch)
910

1011
if exists("current_compiler")
1112
finish
@@ -50,6 +51,8 @@ let s:makeprg = g:ps1_makeprg_cmd .. ' %:p:S'
5051
" + CategoryInfo : ObjectNotFound: (Write-Ouput:String) [], CommandNotFoundException
5152
" + FullyQualifiedErrorId : CommandNotFoundException
5253

54+
" CompilerSet makeprg=pwsh
55+
" CompilerSet makeprg=powershell
5356
execute 'CompilerSet makeprg=' .. escape(s:makeprg, ' \|"')
5457

5558
" Showing error in context with underlining.

‎runtime/compiler/tex.vim

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
" 2024 Apr 03 by the Vim Project (removed :CompilerSet definition)
77
" 2024 Apr 05 by the Vim Project (avoid leaving behind g:makeprg)
88
" 2024 Nov 19 by the Vim Project (properly escape makeprg setting)
9+
" 2025 Mar 11 by the Vim Project (add comment for Dispatch)
910

1011
if exists("current_compiler")
1112
finish
@@ -28,6 +29,7 @@ if exists('b:tex_ignore_makefile') || exists('g:tex_ignore_makefile') ||
2829
let current_compiler = "latex"
2930
endif
3031
let s:makeprg=current_compiler .. ' -interaction=nonstopmode'
32+
" CompilerSet makeprg=latex
3133
execute 'CompilerSet makeprg=' .. escape(s:makeprg, ' \|"')
3234
else
3335
let current_compiler = 'make'

‎runtime/compiler/tsc.vim

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
" Compiler: TypeScript Compiler
33
" Maintainer: Doug Kearns <[email protected]>
44
" Last Change: 2024 Apr 03
5+
" 2025 Mar 11 by The Vim Project (add comment for Dispatch, add tsc_makeprg variable)
56

67
if exists("current_compiler")
78
finish
@@ -11,9 +12,9 @@ let current_compiler = "tsc"
1112
let s:cpo_save = &cpo
1213
set cpo&vim
1314

15+
" CompilerSet makeprg=tsc
1416
" CompilerSet makeprg=npx\ tsc
15-
16-
CompilerSet makeprg=tsc
17+
execute $'CompilerSet makeprg={escape(get(b:, 'tsc_makeprg', get(g:, 'tsc_makeprg', 'tsc')), ' \|"')}'
1718
CompilerSet errorformat=%f\ %#(%l\\,%c):\ %trror\ TS%n:\ %m,
1819
\%trror\ TS%n:\ %m,
1920
\%-G%.%#

‎runtime/compiler/typst.vim

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
" Language: Typst
33
" Previous Maintainer: Gregory Anders
44
" Maintainer: Luca Saccarola <[email protected]>
5+
" Based On: https://github.com/kaarmu/typst.vim
56
" Last Change: 2024 Dec 09
6-
" Based on: https://github.com/kaarmu/typst.vim
7+
" 2025 Mar 11 by the Vim Project (add comment for Dispatch)
78

89
if exists('current_compiler')
910
finish
@@ -13,4 +14,5 @@ let current_compiler = get(g:, 'typst_cmd', 'typst')
1314
" With `--diagnostic-format` we can use the default errorformat
1415
let s:makeprg = [current_compiler, 'compile', '--diagnostic-format', 'short', '%:S']
1516

17+
" CompilerSet makeprg=typst
1618
execute 'CompilerSet makeprg=' . join(s:makeprg, '\ ')

‎runtime/doc/builtin.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*builtin.txt* For Vim version 9.1. Last change: 2025 Feb 23
1+
*builtin.txt* For Vim version 9.1. Last change: 2025 Mar 11
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -7587,9 +7587,8 @@ mkdir({name} [, {flags} [, {prot}]]) *mkdir()* *E739*
75877587
If {prot} is given it is used to set the protection bits of
75887588
the new directory. The default is 0o755 (rwxr-xr-x: r/w for
75897589
the user, readable for others). Use 0o700 to make it
7590-
unreadable for others. This is only used for the last part of
7591-
{name}. Thus if you create /tmp/foo/bar then /tmp/foo will be
7592-
created with 0o755.
7590+
unreadable for others. This is used for the newly created
7591+
directories. Note an umask is applied to {prot} (on Unix).
75937592
Example: >
75947593
:call mkdir($HOME .. "/tmp/foo/bar", "p", 0o700)
75957594

‎runtime/doc/quickfix.txt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*quickfix.txt* For Vim version 9.1. Last change: 2025 Jan 11
1+
*quickfix.txt* For Vim version 9.1. Last change: 2025 Mar 11
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1722,6 +1722,13 @@ shells and OSes and also does not allow to use other available TeX options,
17221722
if any. If your TeX doesn't support "-interaction=nonstopmode", please
17231723
report it with different means to express \nonstopmode from the command line.
17241724

1725+
TSC COMPILER *compiler-tsc*
1726+
1727+
The executable and compiler options can be added to 'makeprg' by setting the
1728+
b/g:tsc_makeprg variable. For example: >
1729+
1730+
let b:tsc_makeprg = "npx tsc --noEmit"
1731+
17251732
TYPST COMPILER *compiler-typst*
17261733

17271734
Vim includes a compiler plugin for Typst files. This compiler is enabled

‎runtime/doc/tags

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6604,6 +6604,7 @@ compiler-ruff quickfix.txt /*compiler-ruff*
66046604
compiler-select quickfix.txt /*compiler-select*
66056605
compiler-spotbugs quickfix.txt /*compiler-spotbugs*
66066606
compiler-tex quickfix.txt /*compiler-tex*
6607+
compiler-tsc quickfix.txt /*compiler-tsc*
66076608
compiler-typst quickfix.txt /*compiler-typst*
66086609
compiler-vaxada ft_ada.txt /*compiler-vaxada*
66096610
compl-current insert.txt /*compl-current*

‎runtime/syntax/tera.vim

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" Vim syntax file
22
" Language: Tera
33
" Maintainer: Muntasir Mahmud <[email protected]>
4-
" Last Change: 2025 Mar 09
4+
" Last Change: 2025 Mar 11
55

66
if exists("b:current_syntax")
77
finish
@@ -31,21 +31,21 @@ else
3131
endif
3232

3333
" Tera comment blocks: {# comment #}
34-
syn region teraCommentBlock start="{#" end="#}" contains=@Spell containedin=cssDefinition,cssStyle,htmlHead,htmlTitle
34+
syn region teraCommentBlock start="{#" end="#}" contains=@Spell
3535

3636
" Tera statements: {% if condition %}
37-
syn region teraStatement start="{%" end="%}" contains=teraKeyword,teraString,teraNumber,teraFunction,teraBoolean,teraFilter,teraOperator containedin=cssDefinition,cssStyle,htmlHead,htmlTitle
37+
syn region teraStatement start="{%" end="%}" contains=teraKeyword,teraString,teraNumber,teraFunction,teraBoolean,teraFilter,teraOperator
3838

3939
" Tera expressions: {{ variable }}
40-
syn region teraExpression start="{{" end="}}" contains=teraString,teraNumber,teraFunction,teraBoolean,teraFilter,teraOperator,teraIdentifier containedin=cssDefinition,cssStyle,htmlHead,htmlTitle
40+
syn region teraExpression start="{{" end="}}" contains=teraString,teraNumber,teraFunction,teraBoolean,teraFilter,teraOperator,teraIdentifier
4141

4242
" Special handling for raw blocks - content inside shouldn't be processed
4343
syn region teraRawBlock start="{% raw %}" end="{% endraw %}" contains=TOP,teraCommentBlock,teraStatement,teraExpression
4444

4545
" Control structure keywords
4646
syn keyword teraKeyword contained if else elif endif for endfor in macro endmacro
4747
syn keyword teraKeyword contained block endblock extends include import set endset
48-
syn keyword teraKeyword contained break continue filter endfilter raw endraw with endwith
48+
syn keyword teraKeyword contained break continue filter endfilter raw endraw
4949

5050
" Identifiers - define before operators for correct priority
5151
syn match teraIdentifier contained "\<\w\+\>"
@@ -79,11 +79,9 @@ hi def link teraIdentifier Identifier
7979
hi def link teraString String
8080
hi def link teraNumber Number
8181
hi def link teraBoolean Boolean
82-
hi def link teraFilter PreProc
83-
84-
" Special highlighting for blocks and expressions
85-
hi def link teraStatement PreProc
86-
hi def link teraExpression PreProc
82+
hi def link teraFilter Function
83+
hi def link teraStatement Statement
84+
hi def link teraExpression Statement
8785

8886
" Clean up script-local variables
8987
unlet s:filename

0 commit comments

Comments
 (0)