Merge pull request #3579 from bhcleek/syntax/empty-lists

syntax: reduce contains of empty const, var, and import lists
fatih · Sep 4, 2023 · fd9286e · fd9286e
2 parents 2a15f50 + 6f80c88
commit fd9286e
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/syntax/go.vim b/syntax/go.vim
@@ -158,20 +158,20 @@ if go#config#FoldEnable('varconst')
  syn region goVar start='var (' end='^\s*)$' transparent fold
  \ contains=ALLBUT,goParen,goBlock,goFunction,goTypeName,goReceiverType,goReceiverVar,goParamName,goParamType,goSimpleParams,goPointerOperator
  syn match goVar /var ()/ transparent fold
- \ contains=ALLBUT,goParen,goBlock,goFunction,goTypeName,goReceiverType,goReceiverVar,goParamName,goParamType,goSimpleParams,goPointerOperator
+ \ contains=goVar
  syn region goConst start='const (' end='^\s*)$' transparent fold
  \ contains=ALLBUT,goParen,goBlock,goFunction,goTypeName,goReceiverType,goReceiverVar,goParamName,goParamType,goSimpleParams,goPointerOperator
  syn match goConst /const ()/ transparent fold
- \ contains=ALLBUT,goParen,goBlock,goFunction,goTypeName,goReceiverType,goReceiverVar,goParamName,goParamType,goSimpleParams,goPointerOperator
+ \ contains=goConst
 else
  syn region goVar start='var (' end='^\s*)$' transparent
  \ contains=ALLBUT,goParen,goBlock,goFunction,goTypeName,goReceiverType,goReceiverVar,goParamName,goParamType,goSimpleParams,goPointerOperator
  syn match goVar /var ()/ transparent
- \ contains=ALLBUT,goParen,goBlock,goFunction,goTypeName,goReceiverType,goReceiverVar,goParamName,goParamType,goSimpleParams,goPointerOperator
+ \ contains=goVar
  syn region goConst start='const (' end='^\s*)$' transparent
  \ contains=ALLBUT,goParen,goBlock,goFunction,goTypeName,goReceiverType,goReceiverVar,goParamName,goParamType,goSimpleParams,goPointerOperator
  syn match goConst /const ()/ transparent
- \ contains=ALLBUT,goParen,goBlock,goFunction,goTypeName,goReceiverType,goReceiverVar,goParamName,goParamType,goSimpleParams,goPointerOperator
+ \ contains=goConst
 endif
 
 " Single-line var, const, and import.