Merge pull request vhda#233 from vhda/indent/eos_increment_decrement

Indent: Improve end-of-statement regexp to ignore increment/decrement

Author: vhda

indent/verilog_systemverilog.vim

@@ -23,7 +23,7 @@ setlocal indentkeys+==endgenerate,=endchecker,=endconfig,=endprimitive,=endtable
 setlocal indentkeys+==`else,=`endif
 setlocal indentkeys+=;
 
-let s:vlog_open_statement = '\([<>:!=?&|^%/*+]\|-[^>]\)'
+let s:vlog_open_statement = '\([<>:!=?&|^%/*]\|+\%([;+]\)\@!\|-\%([>;-]\)\@!\)'
 let s:vlog_end_statement  = ')\s*;'
 let s:vlog_comment        = '\(//.*\|/\*.*\*/\)'
 let s:vlog_macro          = '`\k\+\((.*)\)\?\s*$'

test/indent.sv

@@ -26,6 +26,11 @@ class z;
 
     int unsigned cnt=0;
 
+    // Code from: // https://github.com/vhda/verilog_systemverilog.vim/issues/232
+    foo--;
+    bar();
+    // End of copied code
+
     function new();
         super.new();
     endfunction;

test/indent.sv.html

@@ -28,6 +28,11 @@
 
     <span class="Statement">int</span> <span class="Statement">unsigned</span> cnt<span class="Special">=</span><span class="Constant">0</span><span class="Special">;</span>
 
+    <span class="Comment">// Code from: // <a href="https://github.com/vhda/verilog_systemverilog.vim/issues/232">https://github.com/vhda/verilog_systemverilog.vim/issues/232</a></span>
+    foo<span class="Special">--;</span>
+    <span class="Identifier">bar</span><span class="Special">();</span>
+    <span class="Comment">// End of copied code</span>
+
     <span class="Statement">function</span> <span class="Identifier">new</span><span class="Special">();</span>
         <span class="Type">super</span><span class="Special">.</span><span class="Identifier">new</span><span class="Special">();</span>
     <span class="Statement">endfunction</span><span class="Special">;</span>

test/indent_standalone.sv

@@ -26,6 +26,11 @@ class z;
 
     int unsigned cnt=0;
 
+    // Code from: // https://github.com/vhda/verilog_systemverilog.vim/issues/232
+    foo--;
+    bar();
+    // End of copied code
+
     function new();
         super.new();
     endfunction;