Skip to content

Commit 1c721f5

Browse files
committed
consolidate single and double quote strings
1 parent 9bf69e2 commit 1c721f5

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

syntax/javascript.vim

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ syntax case match
6363

6464
"" Syntax in the JavaScript code"{{{
6565
syn match javaScriptSpecial "\\\d\d\d\|\\."
66-
syn region javaScriptStringD start=+"+ skip=+\\\\\|\\"+ end=+"\|$+ contains=javaScriptSpecial,@htmlPreproc
67-
syn region javaScriptStringS start=+'+ skip=+\\\\\|\\'+ end=+'\|$+ contains=javaScriptSpecial,@htmlPreproc
66+
syn region javaScriptString start=+"+ skip=+\\\\\|\\"+ end=+"\|$+ contains=javaScriptSpecial,@htmlPreproc
67+
syn region javaScriptString start=+'+ skip=+\\\\\|\\'+ end=+'\|$+ contains=javaScriptSpecial,@htmlPreproc
6868

6969
syn match javaScriptSpecialCharacter "'\\.'"
7070
syn match javaScriptNumber "-\=\<\d\+L\=\>\|0[xX][0-9a-fA-F]\+\>"
@@ -176,7 +176,7 @@ endif "DOM/HTML/CSS
176176

177177

178178
"" Code blocks
179-
syntax cluster javaScriptAll contains=javaScriptComment,javaScriptLineComment,javaScriptDocComment,javaScriptStringD,javaScriptStringS,javaScriptRegexpString,javaScriptNumber,javaScriptFloat,javaScriptLabel,javaScriptSource,javaScriptType,javaScriptOperator,javaScriptBoolean,javaScriptNull,javaScriptFuncKeyword,javaScriptConditional,javaScriptGlobal,javaScriptRepeat,javaScriptBranch,javaScriptStatement,javaScriptGlobalObjects,javaScriptMessage,javaScriptIdentifier,javaScriptExceptions,javaScriptReserved,javaScriptDeprecated,javaScriptDomErrNo,javaScriptDomNodeConsts,javaScriptHtmlEvents,javaScriptDotNotation,javaScriptBrowserObjects,javaScriptDOMObjects,javaScriptAjaxObjects,javaScriptPropietaryObjects,javaScriptDOMMethods,javaScriptHtmlElemProperties,javaScriptDOMProperties,javaScriptEventListenerKeywords,javaScriptEventListenerMethods,javaScriptAjaxProperties,javaScriptAjaxMethods,javaScriptFuncArg
179+
syntax cluster javaScriptAll contains=javaScriptComment,javaScriptLineComment,javaScriptDocComment,javaScriptString,javaScriptRegexpString,javaScriptNumber,javaScriptFloat,javaScriptLabel,javaScriptSource,javaScriptType,javaScriptOperator,javaScriptBoolean,javaScriptNull,javaScriptFuncKeyword,javaScriptConditional,javaScriptGlobal,javaScriptRepeat,javaScriptBranch,javaScriptStatement,javaScriptGlobalObjects,javaScriptMessage,javaScriptIdentifier,javaScriptExceptions,javaScriptReserved,javaScriptDeprecated,javaScriptDomErrNo,javaScriptDomNodeConsts,javaScriptHtmlEvents,javaScriptDotNotation,javaScriptBrowserObjects,javaScriptDOMObjects,javaScriptAjaxObjects,javaScriptPropietaryObjects,javaScriptDOMMethods,javaScriptHtmlElemProperties,javaScriptDOMProperties,javaScriptEventListenerKeywords,javaScriptEventListenerMethods,javaScriptAjaxProperties,javaScriptAjaxMethods,javaScriptFuncArg
180180

181181
if main_syntax == "javascript"
182182
syntax sync clear
@@ -232,8 +232,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
232232
HiLink javaScriptDocTags Special
233233
HiLink javaScriptDocSeeTag Function
234234
HiLink javaScriptDocParam Function
235-
HiLink javaScriptStringS String
236-
HiLink javaScriptStringD String
235+
HiLink javaScriptString String
237236
HiLink javaScriptRegexpString String
238237
HiLink javaScriptGlobal Constant
239238
HiLink javaScriptCharacter Character
@@ -288,7 +287,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
288287
HiLink javaScriptFuncDef Title
289288
HiLink javascriptFuncExp Title
290289
HiLink javaScriptFuncArg Special
291-
HiLink javaScriptFuncComma Operator
290+
HiLink javaScriptFuncComma Operator
292291

293292
HiLink javaScriptHtmlEvents Special
294293
HiLink javaScriptHtmlElemProperties Type

0 commit comments

Comments
 (0)