From a53409b564458f7a94c8fcd0725d1953dee58dce Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Fri, 28 Apr 2017 21:06:44 +0200 Subject: vim-patch:89bcfda6834a Updated runtime files. Remove version checks for Vim older than 6.0. https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5 --- runtime/syntax/haskell.vim | 118 +++++++++++++++++++++------------------------ 1 file changed, 54 insertions(+), 64 deletions(-) (limited to 'runtime/syntax/haskell.vim') diff --git a/runtime/syntax/haskell.vim b/runtime/syntax/haskell.vim index 8afca048cc..86d554ba36 100644 --- a/runtime/syntax/haskell.vim +++ b/runtime/syntax/haskell.vim @@ -32,10 +32,8 @@ " to attribution of work. " 2008 Dec 15: Added comments as contained element in import statements -" Remove any old syntax stuff hanging around -if version < 600 - syn clear -elseif exists("b:current_syntax") +" quit when a syntax file was already loaded +if exists("b:current_syntax") finish endif @@ -127,67 +125,59 @@ syntax match cCommentStartError display "/\*"me=e-1 contained syn region cCppString start=+L\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=cSpecial contained " Define the default highlighting. -" For version 5.7 and earlier: only when not done already -" For version 5.8 and later: only when an item doesn't have highlighting yet -if version >= 508 || !exists("did_hs_syntax_inits") - if version < 508 - let did_hs_syntax_inits = 1 - command -nargs=+ HiLink hi link - else - command -nargs=+ HiLink hi def link - endif - - HiLink hsModule hsStructure - HiLink hsImport Include - HiLink hsImportMod hsImport - HiLink hsInfix PreProc - HiLink hsStructure Structure - HiLink hsStatement Statement - HiLink hsConditional Conditional - HiLink hsSpecialChar SpecialChar - HiLink hsTypedef Typedef - HiLink hsVarSym hsOperator - HiLink hsConSym hsOperator - HiLink hsOperator Operator - if exists("hs_highlight_delimiters") - " Some people find this highlighting distracting. - HiLink hsDelimiter Delimiter - endif - HiLink hsSpecialCharError Error - HiLink hsString String - HiLink hsCharacter Character - HiLink hsNumber Number - HiLink hsFloat Float - HiLink hsConditional Conditional - HiLink hsLiterateComment hsComment - HiLink hsBlockComment hsComment - HiLink hsLineComment hsComment - HiLink hsComment Comment - HiLink hsPragma SpecialComment - HiLink hsBoolean Boolean - HiLink hsType Type - HiLink hsMaybe hsEnumConst - HiLink hsOrdering hsEnumConst - HiLink hsEnumConst Constant - HiLink hsDebug Debug - - HiLink cCppString hsString - HiLink cCommentStart hsComment - HiLink cCommentError hsError - HiLink cCommentStartError hsError - HiLink cInclude Include - HiLink cPreProc PreProc - HiLink cDefine Macro - HiLink cIncluded hsString - HiLink cError Error - HiLink cPreCondit PreCondit - HiLink cComment Comment - HiLink cCppSkip cCppOut - HiLink cCppOut2 cCppOut - HiLink cCppOut Comment - - delcommand HiLink +" Only when an item doesn't have highlighting yet +command -nargs=+ HiLink hi def link + +HiLink hsModule hsStructure +HiLink hsImport Include +HiLink hsImportMod hsImport +HiLink hsInfix PreProc +HiLink hsStructure Structure +HiLink hsStatement Statement +HiLink hsConditional Conditional +HiLink hsSpecialChar SpecialChar +HiLink hsTypedef Typedef +HiLink hsVarSym hsOperator +HiLink hsConSym hsOperator +HiLink hsOperator Operator +if exists("hs_highlight_delimiters") +" Some people find this highlighting distracting. +HiLink hsDelimiter Delimiter endif +HiLink hsSpecialCharError Error +HiLink hsString String +HiLink hsCharacter Character +HiLink hsNumber Number +HiLink hsFloat Float +HiLink hsConditional Conditional +HiLink hsLiterateComment hsComment +HiLink hsBlockComment hsComment +HiLink hsLineComment hsComment +HiLink hsComment Comment +HiLink hsPragma SpecialComment +HiLink hsBoolean Boolean +HiLink hsType Type +HiLink hsMaybe hsEnumConst +HiLink hsOrdering hsEnumConst +HiLink hsEnumConst Constant +HiLink hsDebug Debug + +HiLink cCppString hsString +HiLink cCommentStart hsComment +HiLink cCommentError hsError +HiLink cCommentStartError hsError +HiLink cInclude Include +HiLink cPreProc PreProc +HiLink cDefine Macro +HiLink cIncluded hsString +HiLink cError Error +HiLink cPreCondit PreCondit +HiLink cComment Comment +HiLink cCppSkip cCppOut +HiLink cCppOut2 cCppOut +HiLink cCppOut Comment + +delcommand HiLink let b:current_syntax = "haskell" -- cgit From 86b596dc7a49f1b148ef82a356b972b93ed0f6d4 Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Fri, 28 Apr 2017 21:14:34 +0200 Subject: vim-patch:f37506f60f87 Updated runtime files. Remove HiLink commands. https://github.com/vim/vim/commit/f37506f60f87d52a9e8850e30067645e2b13783c --- runtime/syntax/haskell.vim | 96 +++++++++++++++++++++++----------------------- 1 file changed, 47 insertions(+), 49 deletions(-) (limited to 'runtime/syntax/haskell.vim') diff --git a/runtime/syntax/haskell.vim b/runtime/syntax/haskell.vim index 86d554ba36..11f4c35a58 100644 --- a/runtime/syntax/haskell.vim +++ b/runtime/syntax/haskell.vim @@ -126,58 +126,56 @@ syn region cCppString start=+L\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end=' " Define the default highlighting. " Only when an item doesn't have highlighting yet -command -nargs=+ HiLink hi def link - -HiLink hsModule hsStructure -HiLink hsImport Include -HiLink hsImportMod hsImport -HiLink hsInfix PreProc -HiLink hsStructure Structure -HiLink hsStatement Statement -HiLink hsConditional Conditional -HiLink hsSpecialChar SpecialChar -HiLink hsTypedef Typedef -HiLink hsVarSym hsOperator -HiLink hsConSym hsOperator -HiLink hsOperator Operator + +hi def link hsModule hsStructure +hi def link hsImport Include +hi def link hsImportMod hsImport +hi def link hsInfix PreProc +hi def link hsStructure Structure +hi def link hsStatement Statement +hi def link hsConditional Conditional +hi def link hsSpecialChar SpecialChar +hi def link hsTypedef Typedef +hi def link hsVarSym hsOperator +hi def link hsConSym hsOperator +hi def link hsOperator Operator if exists("hs_highlight_delimiters") " Some people find this highlighting distracting. -HiLink hsDelimiter Delimiter +hi def link hsDelimiter Delimiter endif -HiLink hsSpecialCharError Error -HiLink hsString String -HiLink hsCharacter Character -HiLink hsNumber Number -HiLink hsFloat Float -HiLink hsConditional Conditional -HiLink hsLiterateComment hsComment -HiLink hsBlockComment hsComment -HiLink hsLineComment hsComment -HiLink hsComment Comment -HiLink hsPragma SpecialComment -HiLink hsBoolean Boolean -HiLink hsType Type -HiLink hsMaybe hsEnumConst -HiLink hsOrdering hsEnumConst -HiLink hsEnumConst Constant -HiLink hsDebug Debug - -HiLink cCppString hsString -HiLink cCommentStart hsComment -HiLink cCommentError hsError -HiLink cCommentStartError hsError -HiLink cInclude Include -HiLink cPreProc PreProc -HiLink cDefine Macro -HiLink cIncluded hsString -HiLink cError Error -HiLink cPreCondit PreCondit -HiLink cComment Comment -HiLink cCppSkip cCppOut -HiLink cCppOut2 cCppOut -HiLink cCppOut Comment - -delcommand HiLink +hi def link hsSpecialCharError Error +hi def link hsString String +hi def link hsCharacter Character +hi def link hsNumber Number +hi def link hsFloat Float +hi def link hsConditional Conditional +hi def link hsLiterateComment hsComment +hi def link hsBlockComment hsComment +hi def link hsLineComment hsComment +hi def link hsComment Comment +hi def link hsPragma SpecialComment +hi def link hsBoolean Boolean +hi def link hsType Type +hi def link hsMaybe hsEnumConst +hi def link hsOrdering hsEnumConst +hi def link hsEnumConst Constant +hi def link hsDebug Debug + +hi def link cCppString hsString +hi def link cCommentStart hsComment +hi def link cCommentError hsError +hi def link cCommentStartError hsError +hi def link cInclude Include +hi def link cPreProc PreProc +hi def link cDefine Macro +hi def link cIncluded hsString +hi def link cError Error +hi def link cPreCondit PreCondit +hi def link cComment Comment +hi def link cCppSkip cCppOut +hi def link cCppOut2 cCppOut +hi def link cCppOut Comment + let b:current_syntax = "haskell" -- cgit From 599170de8304d74baa3e18df0929330e3773a14d Mon Sep 17 00:00:00 2001 From: "Justin M. Keyes" Date: Tue, 7 Nov 2017 01:29:14 +0100 Subject: vim-patch:6aa8cea46d41 Update runtime files. https://github.com/vim/vim/commit/6aa8cea46d4179b2617daae034063dd0d8054e35 --- runtime/syntax/haskell.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'runtime/syntax/haskell.vim') diff --git a/runtime/syntax/haskell.vim b/runtime/syntax/haskell.vim index 11f4c35a58..e398085ba8 100644 --- a/runtime/syntax/haskell.vim +++ b/runtime/syntax/haskell.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: Haskell " Maintainer: Haskell Cafe mailinglist -" Last Change: 2008 Dec 15 +" Last Change: 2017 Jun 04 " Original Author: John Williams " " Thanks to Ryan Crumley for suggestions and John Meacham for @@ -62,7 +62,7 @@ syn match hsCharacter "^'\([^\\]\|\\[^']\+\|\\'\)'" contains=hsSpecialChar,hs syn match hsNumber "\<[0-9]\+\>\|\<0[xX][0-9a-fA-F]\+\>\|\<0[oO][0-7]\+\>" syn match hsFloat "\<[0-9]\+\.[0-9]\+\([eE][-+]\=[0-9]\+\)\=\>" -" Keyword definitions. These must be patters instead of keywords +" Keyword definitions. These must be patterns instead of keywords " because otherwise they would match as keywords at the start of a " "literate" comment (see lhs.vim). syn match hsModule "\" -- cgit