Skip to content

Commit 9626ac2

Browse files
committed
Indent: Skip comments when searching block start
Fixes #158 and should also take care of #112.
1 parent 278551e commit 9626ac2

File tree

3 files changed

+26
-1
lines changed

3 files changed

+26
-1
lines changed

indent/verilog_systemverilog.vim

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,8 @@ function! s:SearchForBlockStart(start_wd, mid_wd, end_wd, current_line_no, skip_
184184
call cursor(a:current_line_no, 1)
185185

186186
" Detect whether the cursor is on a comment.
187-
let l:skip_arg = 'synIDattr(synID(".", col("."), 0), "name") == "verilogComment"'
187+
let l:skip_arg = 'synIDattr(synID(".", col("."), 0), "name") == "verilogComment"'
188+
let l:skip_arg .= ' || synIDattr(synID(".", col("."), 0), "name") == "verilogString"'
188189

189190
if a:skip_start_end == 1
190191
let l:skip_arg =

test/indent.sv

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,18 @@ class z;
364364
end
365365
something();
366366
join_none
367+
368+
// Code from: // https://github.com/vhda/verilog_systemverilog.vim/issues/158
369+
fork
370+
p1: begin
371+
myvar=1'b1;
372+
`info("some message with the word join");
373+
end
374+
p2: begin
375+
myvar2=1'b1;
376+
end
377+
join
378+
// End of copied code
367379
endfunction : hello
368380

369381
local static function void hello();

test/indent.sv.html

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,18 @@
366366
<span class="Statement">end</span>
367367
<span class="Identifier">something</span><span class="Special">();</span>
368368
<span class="Statement">join_none</span>
369+
370+
<span class="Comment">// Code from: // <a href="https://github.com/vhda/verilog_systemverilog.vim/issues/158">https://github.com/vhda/verilog_systemverilog.vim/issues/158</a></span>
371+
<span class="Statement">fork</span>
372+
p1<span class="Special">:</span> <span class="Statement">begin</span>
373+
myvar<span class="Special">=</span><span class="Constant">1'b1</span><span class="Special">;</span>
374+
<span class="PreProc">`info</span><span class="Special">(</span><span class="Constant">&quot;some message with the word join&quot;</span><span class="Special">);</span>
375+
<span class="Statement">end</span>
376+
p2<span class="Special">:</span> <span class="Statement">begin</span>
377+
myvar2<span class="Special">=</span><span class="Constant">1'b1</span><span class="Special">;</span>
378+
<span class="Statement">end</span>
379+
<span class="Statement">join</span>
380+
<span class="Comment">// End of copied code</span>
369381
<span class="Statement">endfunction</span> <span class="Special">:</span> hello
370382

371383
<span class="Statement">local</span> <span class="Statement">static</span> <span class="Statement">function</span> <span class="Statement">void</span> <span class="Identifier">hello</span><span class="Special">();</span>

0 commit comments

Comments
 (0)