From 77b0476f4090ca2cf7eae54e01a44dc68ec58797 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Sat, 25 Jul 2026 06:26:38 +0800 Subject: [PATCH] vim-patch:e9234b9: runtime(go): update Go syntax file Update the Go syntax file with some recent changes made to vim-go to correctly highlight the second and later lines of concatenated strings in var or const blocks. closes: vim/vim#20835 https://github.com/vim/vim/commit/e9234b9b4ae658d1de4a3f785a2aac531d77f903 Co-authored-by: Billie Cleek --- runtime/syntax/go.vim | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/runtime/syntax/go.vim b/runtime/syntax/go.vim index feed9646fb..35d0cfd754 100644 --- a/runtime/syntax/go.vim +++ b/runtime/syntax/go.vim @@ -5,8 +5,7 @@ " go.vim: Vim syntax file for Go. " Language: Go " Maintainer: Billie Cleek -" Latest Revision: 2024-04-13 -" 2024-03-17: - fix goPackageComment highlight (by Vim Project) +" Latest Revision: 2026-07-24 " License: BSD-style. See LICENSE file in source repository. " Repository: https://github.com/fatih/vim-go @@ -191,7 +190,7 @@ else syn region goRawString start=+`+ end=+`+ endif -syn match goImportString /^\%(\s\+\|import \)\(\h\w* \)\?\zs"[^"]\+"/ contained containedin=goImport +syn match goImportString /^\%(\s\+\|import \)\(\h\w* \)\?\zs"[^"\\]\+"/ contained containedin=goImport if s:HighlightFormatStrings() " [n] notation is valid for specifying explicit argument indexes @@ -240,20 +239,20 @@ endif " var, const if s:FoldEnable('varconst') syn region goVar start='var (' end='^\s*)$' transparent fold - \ contains=ALLBUT,goParen,goBlock,goFunction,goTypeName,goReceiverType,goReceiverVar,goParamName,goParamType,goSimpleParams,goPointerOperator + \ contains=ALLBUT,goImport,goImportString,goParen,goBlock,goFunction,goTypeName,goReceiverType,goReceiverVar,goParamName,goParamType,goSimpleParams,goPointerOperator syn match goVar /var ()/ transparent fold \ contains=goVar syn region goConst start='const (' end='^\s*)$' transparent fold - \ contains=ALLBUT,goParen,goBlock,goFunction,goTypeName,goReceiverType,goReceiverVar,goParamName,goParamType,goSimpleParams,goPointerOperator + \ contains=ALLBUT,goImport,goImportString,goParen,goBlock,goFunction,goTypeName,goReceiverType,goReceiverVar,goParamName,goParamType,goSimpleParams,goPointerOperator syn match goConst /const ()/ transparent fold \ contains=goConst else syn region goVar start='var (' end='^\s*)$' transparent - \ contains=ALLBUT,goParen,goBlock,goFunction,goTypeName,goReceiverType,goReceiverVar,goParamName,goParamType,goSimpleParams,goPointerOperator + \ contains=ALLBUT,goImport,goImportString,goParen,goBlock,goFunction,goTypeName,goReceiverType,goReceiverVar,goParamName,goParamType,goSimpleParams,goPointerOperator syn match goVar /var ()/ transparent \ contains=goVar syn region goConst start='const (' end='^\s*)$' transparent - \ contains=ALLBUT,goParen,goBlock,goFunction,goTypeName,goReceiverType,goReceiverVar,goParamName,goParamType,goSimpleParams,goPointerOperator + \ contains=ALLBUT,goImport,goImportString,goParen,goBlock,goFunction,goTypeName,goReceiverType,goReceiverVar,goParamName,goParamType,goSimpleParams,goPointerOperator syn match goConst /const ()/ transparent \ contains=goConst endif