fix(align): harden hashrocket alignment with proper string/comment/heredoc safety

- Only consider => arrows that are in code context (skip those inside
  strings, comments, heredocs, and interpolations).
- Improves reliability of :OpenvoxAlign, :OpenvoxAlignBlock and <LocalLeader>a.
- Addresses cases that produced misaligned or corrupted output.
- Bump version to 1.0.1 and update documentation.

Author: cvquesty

DOCUMENTATION.md

@@ -6,7 +6,7 @@
 
 **Repository:** `cvquesty/vim-openvox`  
 **License:** Apache-2.0  
-**Version:** 1.0.0
+**Version:** 1.0.1
 
 ---
 

README.md

@@ -4,7 +4,7 @@
 
 **A comprehensive Vim plugin for OpenVox and Puppet 8+ development**
 
-[![Version](https://img.shields.io/badge/version-1.0.0--rc1-orange?style=for-the-badge)](https://github.com/cvquesty/vim-openvox/releases)
+[![Version](https://img.shields.io/badge/version-1.0.1-orange?style=for-the-badge)](https://github.com/cvquesty/vim-openvox/releases)
 [![License](https://img.shields.io/badge/license-Apache%202.0-blue?style=for-the-badge)](LICENSE)
 [![Vim](https://img.shields.io/badge/Vim-8.0+-019833?style=for-the-badge&logo=vim&logoColor=white)](https://www.vim.org)
 [![Neovim](https://img.shields.io/badge/Neovim-0.5+-57A143?style=for-the-badge&logo=neovim&logoColor=white)](https://neovim.io)
@@ -74,7 +74,7 @@ git clone https://github.com/cvquesty/vim-openvox.git
 
 vim-openvox works out of the box for syntax, folding, linting, and basic navigation.
 
-**Note on indentation & alignment**: Core features are functional. We are actively porting battle-tested logic from the vim-puppet gold standard to make auto-indent and block alignment rock-solid. Current behavior is good for most cases and improving rapidly.
+**Note on indentation & alignment**: Core features are functional and have improved safety for arrow alignment (strings, comments, and heredocs are now properly skipped). We continue hardening toward full vim-puppet parity.
 
 ### Key Mappings
 

autoload/openvox/align.vim

@@ -5,85 +5,119 @@ scriptencoding utf-8
 "
 " Puppet Style Guide: All arrows in a resource body should be aligned.
 "   file { '/etc/foo':
-"     ensure => file,
+"     ensure => 'file',
 "     owner  => 'root',
 "     mode   => '0644',
 "   }
+"
+" Safety model:
+" - Only arrows (`=>`) that are in "code" context are considered.
+" - Arrows inside strings, comments, heredocs, or interpolations are ignored.
+" - This prevents corrupting content, regexes, or comments that happen to contain '=>'.
+" - Multiline values are left untouched (the line containing the key+arrow is still aligned).
 
 function! openvox#align#arrows() range abort
   let l:lines = getline(a:firstline, a:lastline)
   let l:max_key_len = 0
   let l:arrow_count = 0
+  let l:safe_lines = []   " list of {lnum, key, indent, value, arrow_col}
 
-  " First pass: find the longest key name (text before =>).
-  " We match: leading whitespace, then the key (everything up to the
-  " first => that is preceded by optional whitespace). This handles
-  " keys like 'ensure', 'my-key', 'some_thing', and even keys with
-  " no space before => (e.g., 'ensure=>present').
+  " First pass: find longest *safe* key (only code-context arrows).
+  let l:lnum = a:firstline
   for l:line in l:lines
-    let l:match = matchlist(l:line, '^\(\s*\)\(\S.\{-}\)\s*=>')
-    if !empty(l:match)
-      let l:key_len = len(l:match[2])
-      if l:key_len > l:max_key_len
-        let l:max_key_len = l:key_len
+    let l:arrow_col = s:FindFirstSafeArrowCol(l:line, l:lnum)
+    if l:arrow_col >= 0
+      " Extract indent + key (everything before the safe =>)
+      let l:prefix = l:line[0 : l:arrow_col - 1]
+      let l:match = matchlist(l:prefix, '^\(\s*\)\(\S.*\)$')
+      if !empty(l:match)
+        let l:indent = l:match[1]
+        let l:key = substitute(l:match[2], '\s\+$', '', '')   " trim trailing ws
+        let l:key_len = len(l:key)
+
+        if l:key_len > l:max_key_len
+          let l:max_key_len = l:key_len
+        endif
+
+        " Capture the rest of the line after this safe arrow for rewriting
+        let l:after = l:line[l:arrow_col + 2 : ]   " skip '=>'
+        let l:value = substitute(l:after, '^\s*', '', '')    " trim leading ws after =>
+        call add(l:safe_lines, {
+              \ 'lnum': l:lnum,
+              \ 'indent': l:indent,
+              \ 'key': l:key,
+              \ 'value': l:value,
+              \ })
+        let l:arrow_count += 1
       endif
-      let l:arrow_count += 1
     endif
+    let l:lnum += 1
   endfor
 
   if l:arrow_count == 0
-    echo 'No arrows (=>) found in selection'
+    echo 'No arrows (=>) found in selection (in code context)'
     return
   endif
 
-  " Second pass: rewrite each line so => is aligned.
-  " The arrow column = indent + max_key_len + 1 space.
-  " Key length is measured relative to the indent, not absolute column.
-  let l:lnum = a:firstline
-  for l:line in l:lines
-    let l:match = matchlist(l:line, '^\(\s*\)\(\S.\{-}\)\s*=>\s*\(.*\)')
-    if !empty(l:match)
-      let l:indent = l:match[1]
-      let l:key = l:match[2]
-      let l:value = l:match[3]
-      " Padding = spaces needed after the key to reach the alignment column
-      let l:pad = l:max_key_len - len(l:key)
-      if l:pad < 0
-        let l:pad = 0
-      endif
-      let l:new_line = l:indent . l:key . repeat(' ', l:pad) . ' => ' . l:value
-      call setline(l:lnum, l:new_line)
-    endif
-    let l:lnum += 1
+  " Second pass: rewrite only the safe lines so => is aligned.
+  " arrow column = indent + max_key_len + 1 (one space before =>)
+  for l:entry in l:safe_lines
+    let l:pad = l:max_key_len - len(l:entry.key)
+    if l:pad < 0 | let l:pad = 0 | endif
+
+    let l:new_line = l:entry.indent . l:entry.key
+          \ . repeat(' ', l:pad) . ' => ' . l:entry.value
+
+    call setline(l:entry.lnum, l:new_line)
   endfor
 
   echo printf('Aligned %d arrow(s)', l:arrow_count)
 endfunction
 
-" Helper: check if inside string/comment/heredoc (for safe searchpair)
-function! s:IsStringOrComment(lnum, col) abort
+" Return byte column of first '=>' that is NOT inside string/comment/heredoc.
+" Returns -1 if no safe arrow on the line.
+function! s:FindFirstSafeArrowCol(line, lnum) abort
+  let l:col = 0
+  while 1
+    let l:col = match(a:line, '=>', l:col)
+    if l:col < 0
+      return -1
+    endif
+    " Check around the arrow (the '=' or the '>')
+    if !s:IsInStringOrComment(a:lnum, l:col + 1)
+      return l:col
+    endif
+    let l:col += 2
+  endwhile
+endfunction
+
+" Helper: is the given position inside a string, comment, heredoc or interpolation?
+" Matches the syntax groups defined in syntax/puppet.vim.
+function! s:IsInStringOrComment(lnum, col) abort
   let l:syn = synIDattr(synID(a:lnum, a:col, 1), 'name')
-  return l:syn =~? 'string\|comment\|heredoc\|puppetInterpolation'
+  " Covers: puppetComment, puppetCComment, puppetSQString, puppetDQString,
+  "         puppetHeredoc*, puppetHeredocNI, puppetInterpolation, etc.
+  return l:syn =~? 'Comment\|String\|Heredoc\|Interpolation'
 endfunction
 
-" Auto-align: align arrows in the current resource block
+" Auto-align: align arrows in the current resource (or hash) block.
+" Uses searchpair with string/comment skipping for finding the block.
 function! openvox#align#block() abort
-  " Find the enclosing { ... } block (skip strings/comments)
   let l:save_pos = getpos('.')
 
-  let l:open = searchpair('{', '', '}', 'bnW', 's:IsStringOrComment(line("."), col("."))')
+  let l:open = searchpair('{', '', '}', 'bnW', 's:IsInStringOrComment(line("."), col("."))')
   if l:open == 0
-    echo 'Not inside a resource block'
+    echo 'Not inside a { ... } block'
     return
   endif
 
-  let l:close = searchpair('{', '', '}', 'nW', 's:IsStringOrComment(line("."), col("."))')
+  let l:close = searchpair('{', '', '}', 'nW', 's:IsInStringOrComment(line("."), col("."))')
   if l:close == 0
     echo 'Could not find closing brace'
     return
   endif
 
-  " Align arrows in the block (skip the { and } lines)
+  " Align only the interior lines (skip the opening { line and closing } line)
   execute (l:open + 1) . ',' . (l:close - 1) . 'call openvox#align#arrows()'
 
   call setpos('.', l:save_pos)

doc/openvox.txt

@@ -2,7 +2,7 @@
 
 Author:  xAI
 License: Apache-2.0
-Version: 1.0.0
+Version: 1.0.1
 
 ==============================================================================
 CONTENTS                                                   *openvox-contents*