Add do begin case foldable_groups options

bootleq · bootleq · commit efa55ac886fa · 2015-09-28T23:45:36.000+08:00
Put there simple blocks into one `blocks` example.
diff --git a/doc/ft-ruby-syntax.txt b/doc/ft-ruby-syntax.txt
@@ -59,8 +59,9 @@ value is space-separated keywords, known keywords were:
     def        "def" block
     class      "class" block
     module     "module" block
-    case       "case" block
     do         "do" block
+    begin      "begin" block
+    case       "case" block
     %          Literal with "%" notation, e.g.: %w(STRING), %!STRING!
     /          Regexp
     string     String and shell command output (surrounded by ', ", `)
diff --git a/etc/examples/generators/syntax/percent_generator.rb b/etc/examples/generators/syntax/percent_generator.rb
@@ -363,9 +363,9 @@
 
 
 
-# def  {{{
-# rubyMethodBlock and rubyBlock
-if arg == 'def'
+# blocks  {{{
+# simple blocks (def, class, module, do, begin, case)
+if arg == 'blocks'
   puts <<-END.gsub(/^\s{4}/, '')
     def
       foo
@@ -377,7 +377,7 @@
 
   END
 
-  %w(class module).each do |s|
+  %w(class module do begin case).each do |s|
     puts <<-END.gsub(/^\s{6}/, '')
       #{s}
         foo
diff --git a/etc/examples/syntax/percent/blocks.rb b/etc/examples/syntax/percent/blocks.rb
@@ -1,4 +1,4 @@
-# Generated by `./etc/examples/generators/syntax/percent_generator.rb def > etc/examples/syntax/percent/def.rb`
+# Generated by `./etc/examples/generators/syntax/percent_generator.rb blocks > etc/examples/syntax/percent/blocks.rb`
 
 def
   foo
@@ -18,4 +18,19 @@
 end
 
 
+do
+  foo
+end
+
+
+begin
+  foo
+end
+
+
+case
+  foo
+end
+
+
 # vim:foldmethod=syntax
diff --git a/syntax/ruby.vim b/syntax/ruby.vim
@@ -351,14 +351,29 @@ if !exists("b:ruby_no_expensive") && !exists("ruby_no_expensive")
   syn match rubyConditionalModifier "\<\%(if\|unless\)\>"    display
   syn match rubyRepeatModifier	     "\<\%(while\|until\)\>" display
 
-  syn region rubyDoBlock      matchgroup=rubyControl start="\<do\>" end="\<end\>"                 contains=ALLBUT,@rubyNotTop fold
+  if s:foldable('do')
+    syn region rubyDoBlock matchgroup=rubyControl start="\<do\>" end="\<end\>" contains=ALLBUT,@rubyNotTop fold
+  else
+    syn region rubyDoBlock matchgroup=rubyControl start="\<do\>" end="\<end\>" contains=ALLBUT,@rubyNotTop
+  endif
+
   " curly bracket block or hash literal
   syn region rubyCurlyBlock	matchgroup=rubyCurlyBlockDelimiter  start="{" end="}"				contains=ALLBUT,@rubyNotTop fold
   syn region rubyArrayLiteral	matchgroup=rubyArrayDelimiter	    start="\%(\w\|[\]})]\)\@<!\[" end="]"	contains=ALLBUT,@rubyNotTop fold
 
   " statements without 'do'
-  syn region rubyBlockExpression       matchgroup=rubyControl	  start="\<begin\>" end="\<end\>" contains=ALLBUT,@rubyNotTop fold
-  syn region rubyCaseExpression	       matchgroup=rubyConditional start="\<case\>"  end="\<end\>" contains=ALLBUT,@rubyNotTop fold
+  if s:foldable('begin')
+    syn region rubyBlockExpression matchgroup=rubyControl start="\<begin\>" end="\<end\>" contains=ALLBUT,@rubyNotTop fold
+  else
+    syn region rubyBlockExpression matchgroup=rubyControl start="\<begin\>" end="\<end\>" contains=ALLBUT,@rubyNotTop
+  endif
+
+  if s:foldable('case')
+    syn region rubyCaseExpression matchgroup=rubyConditional start="\<case\>" end="\<end\>" contains=ALLBUT,@rubyNotTop fold
+  else
+    syn region rubyCaseExpression matchgroup=rubyConditional start="\<case\>" end="\<end\>" contains=ALLBUT,@rubyNotTop
+  endif
+
   syn region rubyConditionalExpression matchgroup=rubyConditional start="\%(\%(^\|\.\.\.\=\|[{:,;([<>~\*%&^|+=-]\|\%(\<[_[:lower:]][_[:alnum:]]*\)\@<![?!]\)\s*\)\@<=\%(\\\n\s*\)\@<!\%(if\|unless\)\>" end="\%(\%(\%(\.\@<!\.\)\|::\)\s*\)\@<!\<end\>" contains=ALLBUT,@rubyNotTop fold
 
   syn match rubyConditional "\<\%(then\|else\|when\)\>[?!]\@!"	contained containedin=rubyCaseExpression
