Fix folding and indent test suites

Author: mhluongo

syntax/solidity.vim

@@ -115,7 +115,7 @@ syn match   solModifierName      contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/ nextgrou
 syn region  solModifierArgs      contained matchgroup=solFuncParens start='(' end=')' contains=solFuncArgCommas nextgroup=solModifierName,solFuncReturns,solFuncBody skipwhite
 syn region  solFuncReturns       contained matchgroup=solFuncParens nextgroup=solFuncBody start='(' end=')' contains=solFuncArgCommas,solBuiltinType skipwhite
 syn match   solFuncArgCommas     contained ','
-syn region  solFuncBody          start="{" end="}" fold transparent
+syn region  solFuncBody          contained start="{" end="}" fold transparent
 
 hi def link solFunction          Type
 hi def link solFuncName          Function
@@ -132,12 +132,12 @@ hi def link yulVarDeclaration   Keyword
 hi def link yulAssemblyOp       Keyword
 
 " Contract
-syn match   solContract          /\<\%(contract\|library\|interface\)\>/ nextgroup=solContractName skipwhite
-syn match   solContractName      contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/ nextgroup=solContractParent,solContractBody skipwhite
-syn region  solContractParent    contained start='is' end='{' contains=solContractName,solContractNoise,solContractCommas nextgroup=solContractBody skipwhite skipempty
+syn match   solContract          /\<\%(contract\|library\|interface\)\>/ nextgroup=solContractName skipwhite skipnl skipempty
+syn match   solContractName      contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/ nextgroup=solContractBlock,solContractParent skipwhite skipnl skipempty
+syn region  solContractParent    contained start='is' end='{' contains=solContractName,solContractNoise,solContractCommas nextgroup=solContractBlock skipwhite skipempty
 syn match   solContractNoise     contained 'is' containedin=solContractParent
 syn match   solContractCommas    contained ','
-syn region  solContractBody      contained start='{' end='}' fold transparent
+syn region  solContractBlock     contained matchgroup=Delimiter start='{' end='}' fold transparent
 
 hi def link solContract          Type
 hi def link solContractName      Function

test/vader/folding.vader

@@ -1,16 +1,12 @@
 " Code folding tests for vim-solidity
 
 Before:
-  set rtp+=.
+  set rtp^=.
   filetype plugin indent on
   syntax enable
   set foldmethod=syntax
   set foldlevel=0
 
-After:
-  %bwipeout!
-  set foldmethod=manual
-
 # ==============================================================================
 # Function Folding
 # ==============================================================================
@@ -25,8 +21,8 @@ Given solidity (function with body):
 Execute (function body should be foldable):
   normal! gg
   " Check that fold exists
-  let l:foldlevel = foldlevel(1)
-  AssertNotEqual 0, l:foldlevel
+  let g:fold_level = foldlevel(1)
+  AssertNotEqual 0, g:fold_level
 
 # ==============================================================================
 # Contract Folding (Issue #11)
@@ -45,11 +41,11 @@ Execute (contract body should be foldable):
   normal! gg
   " Find the opening brace line
   normal! /{
-  let l:contract_line = line('.')
+  let g:contract_line = line('.')
   " Contract body should have a fold
-  let l:foldlevel = foldlevel(l:contract_line + 1)
+  let g:fold_level = foldlevel(g:contract_line + 1)
   " If contract folding is working, there should be a fold level
-  AssertNotEqual 0, l:foldlevel
+  AssertNotEqual 0, g:fold_level
 
 # ==============================================================================
 # Assembly Folding
@@ -66,9 +62,9 @@ Given solidity (assembly block):
 Execute (assembly block should be foldable):
   normal! /assembly
   normal! /{
-  let l:asm_line = line('.')
-  let l:foldlevel = foldlevel(l:asm_line + 1)
-  AssertNotEqual 0, l:foldlevel
+  let g:asm_line = line('.')
+  let g:fold_level = foldlevel(g:asm_line + 1)
+  AssertNotEqual 0, g:fold_level
 
 # ==============================================================================
 # Multi-line Comment Folding
@@ -82,6 +78,6 @@ Given solidity (multi-line comment):
 
 Execute (multi-line comment should be foldable):
   normal! gg
-  let l:foldlevel = foldlevel(1)
+  let g:fold_level = foldlevel(1)
   " Comments should have fold support
-  AssertNotEqual 0, l:foldlevel
+  AssertNotEqual 0, g:fold_level

test/vader/indent.vader

@@ -1,13 +1,10 @@
 " Indentation tests for vim-solidity
 
 Before:
-  set rtp+=.
+  set rtp^=.
   filetype plugin indent on
   syntax enable
 
-After:
-  %bwipeout!
-
 # ==============================================================================
 # Basic Indentation
 # ==============================================================================