Merge remote-tracking branch 'vim/master'

Author: ychin

.github/MAINTAINERS

@@ -289,6 +289,7 @@ runtime/ftplugin/slint.vim				@ribru17
 runtime/ftplugin/snakemake.vim				@ribru17
 runtime/ftplugin/solidity.vim				@coti-z
 runtime/ftplugin/solution.vim				@dkearns
+runtime/ftplugin/soy.vim				@ribru17
 runtime/ftplugin/spajson.vim				@dseomn
 runtime/ftplugin/spec.vim				@ignatenkobrain
 runtime/ftplugin/squirrel.vim				@ribru17

.github/actions/test_artifacts/action.yml

@@ -3,11 +3,39 @@ description: "Upload failed test artifacts"
 runs:
   using: "composite"
   steps:
+    - name: Collect matrix properties for naming
+      uses: actions/github-script@v8
+      id: matrix-props
+      env:
+        MATRIX_PROPS: ${{ toJSON(matrix) }}
+      with:
+        # An array-flattening-to-string JavaScript function.
+        script: |
+          const f = function (x) { return x.toString().length > 0; }
+          const g = function (x) {
+            return (Array.isArray(x))
+              ? x.filter(f)
+                .map((function (h) { return function (y) { return h(y); }; })(g))
+                .join('-')
+              : x;
+          }
+          return Object.values(JSON.parse(process.env.MATRIX_PROPS))
+            .filter(f)
+            .map(g)
+            .join('-');
+        # By default, the JSON-encoded return value of the function is
+        # set as the "result".
+        result-encoding: string
     - name: Upload failed tests
       uses: actions/upload-artifact@v4
       with:
         # Name of the artifact to upload.
-        name: GH-${{ github.run_id }}-${{ github.run_attempt }}-${{ github.job }}-${{ join(matrix.*, '-') }}-failed-tests
+        name: ${{ format('GH-{0}-{1}-{2}-{3}-{4}-failed-tests',
+          github.run_id,
+          github.run_attempt,
+          github.job,
+          strategy.job-index,
+          steps.matrix-props.outputs.result) }}
 
         # A file, directory or wildcard pattern that describes what
         # to upload.

.github/workflows/codeql-analysis.yml

@@ -48,7 +48,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -59,7 +59,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
+      uses: github/codeql-action/autobuild@v4
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -73,4 +73,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4

runtime/autoload/dist/ft.vim

@@ -2714,6 +2714,8 @@ const ft_from_ext = {
   "hlp": "smcl",
   "ihlp": "smcl",
   "smcl": "smcl",
+  # Soy
+  "soy": "soy",
   # Stored Procedures
   "stp": "stp",
   # Standard ML

runtime/autoload/tutor.vim

@@ -211,7 +211,7 @@ function! tutor#TutorCmd(tutor_name)
     endif
 
     call tutor#SetupVim()
-    exe "edit ".l:to_open
+    exe "drop ".l:to_open
     call tutor#EnableInteractive(v:true)
 endfunction
 
@@ -225,7 +225,7 @@ endfunction
 function! tutor#EnableInteractive(enable)
     let enable = a:enable
     if enable
-        setlocal buftype=nofile
+        setlocal buftype=nowrite
         setlocal concealcursor+=inv
         setlocal conceallevel=2
         call tutor#ApplyMarks()

runtime/autoload/vimcomplete.vim

@@ -3,7 +3,7 @@ vim9script
 # Vim completion script
 # Language:    Vim script
 # Maintainer:  Maxim Kim <habamax@gmail.com>
-# Last Change: 2025-08-27
+# Last Change: 2025-10-15
 #
 # Usage:
 # setlocal omnifunc=vimcomplete#Complete
@@ -22,19 +22,23 @@ def GetTrigger(line: string): list<any>
         result = 'function'
     elseif line =~ '\v%(^|\s+)\&\k*$'
         result = 'option'
+    elseif line =~ '\vse%[t]\s+(\k+\s+)*no\k*$'
+        result = 'nooption'
+        result_len = -2
     elseif line =~ '[\[(]\s*$'
         result = 'expression'
     elseif line =~ '[lvgsb]:\k*$'
         result = 'var'
         result_len = 2
-    else
+    elseif line !~ '^\s*$'
         result = getcompletiontype(line) ?? 'cmdline'
     endif
     return [result, result_len]
 enddef
 
 export def Complete(findstart: number, base: string): any
     if findstart > 0
+        prefix = ""
         var line = getline('.')->strpart(0, col('.') - 1)
         var keyword = line->matchstr('\k\+$')
         var stx = synstack(line('.'), col('.') - 1)->map('synIDattr(v:val, "name")')->join()
@@ -57,6 +61,9 @@ export def Complete(findstart: number, base: string): any
     elseif trigger == 'option'
         items = getcompletion(base, 'option')
             ->mapnew((_, v) => ({word: v, kind: 'v', menu: 'Option', dup: 0}))
+    elseif trigger == 'nooption'
+        items = getcompletion(base[2 : ], 'option')
+            ->mapnew((_, v) => ({word: v, kind: 'v', menu: 'Option', dup: 0}))
     elseif trigger == 'var'
         items = getcompletion(base, 'var')
             ->mapnew((_, v) => ({word: v, kind: 'v', menu: 'Variable', dup: 0}))
@@ -71,8 +78,11 @@ export def Complete(findstart: number, base: string): any
         items = commands + functions
     else
         try
-            items = getcompletion(prefix, 'cmdline')
-                ->mapnew((_, v) => ({word: v->matchstr('\k\+'), kind: 'v', dup: 0}))
+            # :! and :term completion is very slow on Windows and WSL, disable it there.
+            if !((has("win32") || has("win32unix") || exists("$WSLENV")) && getcompletiontype(prefix) == 'shellcmd')
+                items = getcompletion(prefix, 'cmdline')
+                    ->mapnew((_, v) => ({word: v->matchstr('\k\+'), kind: 'v', dup: 0}))
+            endif
         catch /E220/
         endtry
 

runtime/autoload/vimgoto.vim

@@ -4,9 +4,9 @@ vim9script
 # Contributers: @lacygoill
 #               Shane-XB-Qian
 #               Andrew Radev
-# Last Change:  2025 Sep 21
+# Last Change:  2025 Oct 17
 #
-# Vim Script to handle jumping to the targets of several types of Vim commands
+# Vim script to handle jumping to the targets of several types of Vim commands
 # (:import, :packadd, :runtime, :colorscheme), and to autoloaded functions of
 # the style <path>#<function_name>.
 #

runtime/colors/blue.vim

@@ -4,7 +4,7 @@
 " Maintainer:   Original maintainer Steven Vertigan <steven@vertigan.wattle.id.au>
 " URL:          https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Change:  2025 Oct 08
+" Last Change:  2025 Oct 14
 
 " Generated by Colortemplate v3.0.0-beta10
 
@@ -95,10 +95,12 @@ hi ModeMsg guifg=#000087 guibg=#00ff00 guisp=NONE gui=NONE ctermfg=18 ctermbg=46
 hi MoreMsg guifg=#5fffff guibg=NONE guisp=NONE gui=NONE ctermfg=87 ctermbg=NONE cterm=NONE term=NONE
 hi NonText guifg=#d787d7 guibg=NONE guisp=NONE gui=NONE ctermfg=176 ctermbg=NONE cterm=NONE term=NONE
 hi Pmenu guifg=#ffffff guibg=#008787 guisp=NONE gui=NONE ctermfg=231 ctermbg=30 cterm=NONE term=reverse
+hi PmenuBorder guifg=#ffffff guibg=#008787 guisp=NONE gui=NONE ctermfg=231 ctermbg=30 cterm=NONE term=NONE
 hi PmenuMatch guifg=#ffd700 guibg=#008787 guisp=NONE gui=NONE ctermfg=220 ctermbg=30 cterm=NONE term=NONE
 hi PmenuMatchSel guifg=#ff7f50 guibg=#ffffff guisp=NONE gui=NONE ctermfg=209 ctermbg=231 cterm=NONE term=NONE
 hi PmenuSbar guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=reverse
 hi PmenuSel guifg=#008787 guibg=#ffffff guisp=NONE gui=NONE ctermfg=30 ctermbg=231 cterm=NONE term=bold
+hi PmenuShadow guifg=#008787 guibg=#121212 guisp=NONE gui=NONE ctermfg=30 ctermbg=233 cterm=NONE term=NONE
 hi PmenuThumb guifg=NONE guibg=#ffffff guisp=NONE gui=NONE ctermfg=NONE ctermbg=231 cterm=NONE term=NONE
 hi PreProc guifg=#00ff00 guibg=NONE guisp=NONE gui=NONE ctermfg=46 ctermbg=NONE cterm=NONE term=NONE
 hi Question guifg=#00ff00 guibg=NONE guisp=NONE gui=NONE ctermfg=46 ctermbg=NONE cterm=NONE term=standout
@@ -166,10 +168,12 @@ if s:t_Co >= 16
   hi MoreMsg ctermfg=cyan ctermbg=NONE cterm=NONE
   hi NonText ctermfg=magenta ctermbg=NONE cterm=NONE
   hi Pmenu ctermfg=black ctermbg=darkcyan cterm=NONE
+  hi PmenuBorder ctermfg=NONE ctermbg=darkcyan cterm=NONE
   hi PmenuMatch ctermfg=black ctermbg=darkcyan cterm=bold
   hi PmenuMatchSel ctermfg=black ctermbg=white cterm=bold
   hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
   hi PmenuSel ctermfg=black ctermbg=white cterm=NONE
+  hi PmenuShadow ctermfg=NONE ctermbg=NONE cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=white cterm=NONE
   hi PreProc ctermfg=green ctermbg=NONE cterm=NONE
   hi Question ctermfg=green ctermbg=NONE cterm=NONE
@@ -234,10 +238,12 @@ if s:t_Co >= 8
   hi MoreMsg ctermfg=cyan ctermbg=NONE cterm=NONE
   hi NonText ctermfg=magenta ctermbg=NONE cterm=NONE
   hi Pmenu ctermfg=black ctermbg=cyan cterm=NONE
+  hi PmenuBorder ctermfg=white ctermbg=darkcyan cterm=NONE
   hi PmenuMatch ctermfg=black ctermbg=cyan cterm=bold
   hi PmenuMatchSel ctermfg=black ctermbg=gray cterm=bold
   hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
   hi PmenuSel ctermfg=black ctermbg=gray cterm=NONE
+  hi PmenuShadow ctermfg=darkcyan ctermbg=black cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=white cterm=NONE
   hi PreProc ctermfg=green ctermbg=NONE cterm=NONE
   hi Question ctermfg=green ctermbg=NONE cterm=NONE

runtime/colors/darkblue.vim

@@ -3,7 +3,7 @@
 " Author:       Original author Bohdan Vlasyuk <bohdan@vstu.edu.ua>
 " URL:          https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Change:  2025 Oct 08
+" Last Change:  2025 Oct 14
 
 " Generated by Colortemplate v3.0.0-beta10
 
@@ -95,10 +95,12 @@ hi ModeMsg guifg=#90fff0 guibg=NONE guisp=NONE gui=NONE ctermfg=123 ctermbg=NONE
 hi MoreMsg guifg=#006400 guibg=NONE guisp=NONE gui=NONE ctermfg=22 ctermbg=NONE cterm=NONE term=NONE
 hi NonText guifg=#0030ff guibg=NONE guisp=NONE gui=NONE ctermfg=27 ctermbg=NONE cterm=NONE term=NONE
 hi Pmenu guifg=#ffffff guibg=#0030ff guisp=NONE gui=NONE ctermfg=231 ctermbg=27 cterm=NONE term=reverse
+hi PmenuBorder guifg=NONE guibg=#0030ff guisp=NONE gui=NONE ctermfg=NONE ctermbg=27 cterm=NONE term=NONE
 hi PmenuMatch guifg=#ff80ff guibg=#0030ff guisp=NONE gui=NONE ctermfg=213 ctermbg=27 cterm=NONE term=NONE
 hi PmenuMatchSel guifg=#ff00ff guibg=#ffffff guisp=NONE gui=NONE ctermfg=201 ctermbg=231 cterm=NONE term=NONE
 hi PmenuSbar guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=reverse
 hi PmenuSel guifg=#0030ff guibg=#ffffff guisp=NONE gui=NONE ctermfg=27 ctermbg=231 cterm=NONE term=bold
+hi PmenuShadow guifg=#808080 guibg=#000000 guisp=NONE gui=NONE ctermfg=102 ctermbg=233 cterm=NONE term=NONE
 hi PmenuThumb guifg=NONE guibg=#ffffff guisp=NONE gui=NONE ctermfg=NONE ctermbg=231 cterm=NONE term=NONE
 hi PreProc guifg=#ff80ff guibg=NONE guisp=NONE gui=NONE ctermfg=213 ctermbg=NONE cterm=NONE term=NONE
 hi Question guifg=#90f020 guibg=NONE guisp=NONE gui=NONE ctermfg=118 ctermbg=NONE cterm=NONE term=standout
@@ -163,10 +165,12 @@ if s:t_Co >= 16
   hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi NonText ctermfg=blue ctermbg=NONE cterm=NONE
   hi Pmenu ctermfg=white ctermbg=blue cterm=NONE
+  hi PmenuBorder ctermfg=NONE ctermbg=blue cterm=NONE
   hi PmenuMatch ctermfg=magenta ctermbg=blue cterm=NONE
   hi PmenuMatchSel ctermfg=darkmagenta ctermbg=white cterm=NONE
   hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
   hi PmenuSel ctermfg=blue ctermbg=white cterm=NONE
+  hi PmenuShadow ctermfg=NONE ctermbg=NONE cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=white cterm=NONE
   hi PreProc ctermfg=magenta ctermbg=NONE cterm=NONE
   hi Question ctermfg=green ctermbg=NONE cterm=NONE
@@ -229,10 +233,12 @@ if s:t_Co >= 8
   hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi NonText ctermfg=blue ctermbg=NONE cterm=NONE
   hi Pmenu ctermfg=grey ctermbg=blue cterm=NONE
+  hi PmenuBorder ctermfg=NONE ctermbg=blue cterm=NONE
   hi PmenuMatch ctermfg=grey ctermbg=blue cterm=bold
   hi PmenuMatchSel ctermfg=blue ctermbg=grey cterm=bold
   hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
   hi PmenuSel ctermfg=blue ctermbg=grey cterm=NONE
+  hi PmenuShadow ctermfg=NONE ctermbg=NONE cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=grey cterm=NONE
   hi PreProc ctermfg=darkmagenta ctermbg=NONE cterm=bold
   hi Question ctermfg=darkgreen ctermbg=NONE cterm=bold

runtime/colors/habamax.vim

@@ -3,7 +3,7 @@
 " Author:       Maxim Kim <habamax@gmail.com>
 " URL:          https://github.com/vim/colorschemes
 " License:      Same as Vim
-" Last Change:  2025 Oct 08
+" Last Change:  2025 Oct 22
 
 " Generated by Colortemplate v3.0.0-beta10
 
@@ -26,7 +26,7 @@ hi! link LineNrAbove LineNr
 hi! link LineNrBelow LineNr
 hi! link MessageWindow Pmenu
 hi! link Number Constant
-hi! link PopupNotification Todo
+hi! link PopupNotification Normal
 hi! link PopupSelected PmenuSel
 hi! link PreInsert NonText
 hi! link Quote String
@@ -102,6 +102,7 @@ hi ModeMsg guifg=NONE guibg=NONE guisp=NONE gui=bold ctermfg=NONE ctermbg=NONE c
 hi MoreMsg guifg=#5faf5f guibg=NONE guisp=NONE gui=NONE ctermfg=71 ctermbg=NONE cterm=NONE term=NONE
 hi NonText guifg=#585858 guibg=NONE guisp=NONE gui=NONE ctermfg=240 ctermbg=NONE cterm=NONE term=NONE
 hi Pmenu guifg=NONE guibg=#3a3a3a guisp=NONE gui=NONE ctermfg=NONE ctermbg=237 cterm=NONE term=reverse
+hi PmenuBorder guifg=#767676 guibg=#3a3a3a guisp=NONE gui=NONE ctermfg=243 ctermbg=237 cterm=NONE term=NONE
 hi PmenuExtra guifg=#767676 guibg=#3a3a3a guisp=NONE gui=NONE ctermfg=243 ctermbg=237 cterm=NONE term=NONE
 hi PmenuExtraSel guifg=#9e9e9e guibg=#585858 guisp=NONE gui=NONE ctermfg=247 ctermbg=240 cterm=NONE term=NONE
 hi PmenuKind guifg=#5f8787 guibg=#3a3a3a guisp=NONE gui=NONE ctermfg=66 ctermbg=237 cterm=NONE term=NONE
@@ -110,6 +111,7 @@ hi PmenuMatch guifg=#ffaf5f guibg=#3a3a3a guisp=NONE gui=NONE ctermfg=215 ctermb
 hi PmenuMatchSel guifg=#ffaf5f guibg=#585858 guisp=NONE gui=NONE ctermfg=215 ctermbg=240 cterm=NONE term=NONE
 hi PmenuSbar guifg=NONE guibg=NONE guisp=NONE gui=NONE ctermfg=NONE ctermbg=NONE cterm=NONE term=reverse
 hi PmenuSel guifg=NONE guibg=#585858 guisp=NONE gui=NONE ctermfg=NONE ctermbg=240 cterm=NONE term=bold
+hi PmenuShadow guifg=#767676 guibg=#121212 guisp=NONE gui=NONE ctermfg=243 ctermbg=233 cterm=NONE term=NONE
 hi PmenuThumb guifg=NONE guibg=#767676 guisp=NONE gui=NONE ctermfg=NONE ctermbg=243 cterm=NONE term=NONE
 hi PreProc guifg=#af875f guibg=NONE guisp=NONE gui=NONE ctermfg=137 ctermbg=NONE cterm=NONE term=NONE
 hi Question guifg=#d7af87 guibg=NONE guisp=NONE gui=NONE ctermfg=180 ctermbg=NONE cterm=NONE term=standout
@@ -195,6 +197,7 @@ if s:t_Co >= 16
   hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi NonText ctermfg=darkgrey ctermbg=NONE cterm=NONE
   hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi PmenuBorder ctermfg=NONE ctermbg=NONE cterm=reverse
   hi PmenuExtra ctermfg=NONE ctermbg=NONE cterm=reverse
   hi PmenuExtraSel ctermfg=NONE ctermbg=NONE cterm=bold
   hi PmenuKind ctermfg=NONE ctermbg=NONE cterm=bold,reverse
@@ -203,6 +206,7 @@ if s:t_Co >= 16
   hi PmenuMatchSel ctermfg=darkyellow ctermbg=NONE cterm=bold
   hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
   hi PmenuSel ctermfg=darkyellow ctermbg=NONE cterm=reverse
+  hi PmenuShadow ctermfg=NONE ctermbg=NONE cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=reverse
   hi PreProc ctermfg=darkyellow ctermbg=NONE cterm=NONE
   hi Question ctermfg=yellow ctermbg=NONE cterm=NONE
@@ -275,6 +279,7 @@ if s:t_Co >= 8
   hi MoreMsg ctermfg=darkgreen ctermbg=NONE cterm=NONE
   hi NonText ctermfg=NONE ctermbg=NONE cterm=NONE
   hi Pmenu ctermfg=NONE ctermbg=NONE cterm=reverse
+  hi PmenuBorder ctermfg=NONE ctermbg=NONE cterm=reverse
   hi PmenuExtra ctermfg=NONE ctermbg=NONE cterm=reverse
   hi PmenuExtraSel ctermfg=NONE ctermbg=NONE cterm=bold
   hi PmenuKind ctermfg=NONE ctermbg=NONE cterm=bold,reverse
@@ -283,6 +288,7 @@ if s:t_Co >= 8
   hi PmenuMatchSel ctermfg=darkyellow ctermbg=NONE cterm=bold
   hi PmenuSbar ctermfg=NONE ctermbg=NONE cterm=NONE
   hi PmenuSel ctermfg=darkyellow ctermbg=NONE cterm=reverse
+  hi PmenuShadow ctermfg=NONE ctermbg=NONE cterm=NONE
   hi PmenuThumb ctermfg=NONE ctermbg=NONE cterm=reverse
   hi PreProc ctermfg=darkyellow ctermbg=NONE cterm=NONE
   hi Question ctermfg=darkyellow ctermbg=NONE cterm=NONE