Skip to content

Commit 296173a

Browse files
dkearnsdkearns
committed
Whitespace and comment fixes
1 parent 25074cb commit 296173a

1 file changed

Lines changed: 6 additions & 8 deletions

File tree

‎syntax/ruby.vim‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@ syn match rubyBackslashEscape "\\\\" contained display
128128
syn match rubyQuoteEscape "\\'" contained display
129129
syn match rubySpaceEscape "\\ " contained display
130130

131-
syn match rubyParenthesisEscape "\\[()]" contained display
132-
syn match rubyCurlyBraceEscape "\\[{}]" contained display
131+
syn match rubyParenthesisEscape "\\[()]" contained display
132+
syn match rubyCurlyBraceEscape "\\[{}]" contained display
133133
syn match rubyAngleBracketEscape "\\[<>]" contained display
134134
syn match rubySquareBracketEscape "\\[[\]]" contained display
135135

@@ -334,16 +334,14 @@ syn match rubyMethodDeclaration "[^[:space:];#(]\+" contained contains=rubyCon
334334
syn match rubyClassDeclaration "[^[:space:];#<]\+" contained contains=rubyClassName,rubyScopeOperator nextgroup=rubySuperClassOperator skipwhite skipnl
335335
syn match rubyModuleDeclaration "[^[:space:];#<]\+" contained contains=rubyModuleName,rubyScopeOperator
336336

337-
syn match rubyMethodName "\<\%([_[:alpha:]]\|[^\x00-\x7F]\)\%([_[:alnum:]]\|[^\x00-\x7F]\)*[?!=]\=\%([[:alnum:]_.:?!=]\|[^\x00-\x7F]\)\@!" contained containedin=rubyMethodDeclaration
338-
syn match rubyMethodName "\%(\s\|^\)\@1<=\%([_[:alpha:]]\|[^\x00-\x7F]\)\%([_[:alnum:]]\|[^\x00-\x7F]\)*[?!=]\=\%(\s\|$\)\@=" contained containedin=rubyAliasDeclaration,rubyAliasDeclaration2
337+
syn match rubyMethodName "\<\%([_[:alpha:]]\|[^\x00-\x7F]\)\%([_[:alnum:]]\|[^\x00-\x7F]\)*[?!=]\=\%([[:alnum:]_.:?!=]\|[^\x00-\x7F]\)\@!" contained containedin=rubyMethodDeclaration
338+
syn match rubyMethodName "\%(\s\|^\)\@1<=\%([_[:alpha:]]\|[^\x00-\x7F]\)\%([_[:alnum:]]\|[^\x00-\x7F]\)*[?!=]\=\%(\s\|$\)\@=" contained containedin=rubyAliasDeclaration,rubyAliasDeclaration2
339339
syn match rubyMethodName "\%([[:space:].]\|^\)\@1<=\%(\[\]=\=\|\*\*\|[-+!~]@\=\|[*/%|&^~]\|<<\|>>\|[<>]=\=\|<=>\|===\|[=!]=\|[=!]\~\|!\|`\)\%([[:space:];#(]\|$\)\@=" contained containedin=rubyAliasDeclaration,rubyAliasDeclaration2,rubyMethodDeclaration
340340

341341
syn cluster rubyDeclaration contains=rubyAliasDeclaration,rubyAliasDeclaration2,rubyMethodDeclaration,rubyModuleDeclaration,rubyClassDeclaration,rubyMethodName
342342

343343
" Keywords {{{1
344-
" Note: the following keywords have already been defined:
345-
" begin case class def do end for if module unless until while
346-
344+
" TODO: reorganise
347345
syn match rubyControl "\<\%(break\|in\|next\|redo\|retry\|return\)\>"
348346
syn match rubyKeyword "\<\%(super\|yield\)\>"
349347
syn match rubyBoolean "\<\%(true\|false\)\>[?!]\@!"
@@ -461,7 +459,7 @@ if !exists("ruby_no_special_methods")
461459
endif
462460
syn match rubyDefinedOperator "\<defined?" display
463461

464-
" More Symbols - 1.9-style hash keys and keyword parameters {{{1
462+
" 1.9-style Hash Keys and Keyword Parameters {{{1
465463
syn match rubySymbol "\%([{(|,]\_s*\)\@<=\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*[?!]\=::\@!"he=e-1
466464
syn match rubySymbol "[]})\"':]\@1<!\<\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*[!?]\=:[[:space:],;]\@="he=e-1
467465

0 commit comments

Comments
 (0)