Skip to content

feat: Allow surround sexy comments #548

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
albfan wants to merge 2 commits into
base: master
Choose a base branch
from
Open

feat: Allow surround sexy comments #548

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68987ee
feat: Explicitly set marker for sexy comments
albfan Dec 1, 2025
abfa8ea
feat: Allow surround sexy comments
albfan Dec 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions autoload/nerdcommenter.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,12 +490,16 @@ function! nerdcommenter#SetUp() abort

if has_key(s:delimiterMap, filetype)
let b:NERDCommenterDelims = copy(s:delimiterMap[filetype])
if has_key(b:NERDCommenterDelims, 'marker')
let b:NERDSexyComMarker = b:NERDCommenterDelims['marker']
let b:NERDSexyComMarkerSet = 1
endif
for i in ['left', 'leftAlt', 'right', 'rightAlt']
if !has_key(b:NERDCommenterDelims, i)
let b:NERDCommenterDelims[i] = ''
endif
endfor
for i in ['nested', 'nestedAlt']
for i in ['nested', 'nestedAlt', 'surround']
if !has_key(b:NERDCommenterDelims, i)
let b:NERDCommenterDelims[i] = 0
endif
Expand Down Expand Up @@ -909,10 +913,15 @@ function! s:CommentLinesSexy(topline, bottomline) abort
" we jam the comment as far to the right as possible
let leftAlignIndx = s:LeftMostIndx(1, 1, a:topline, a:bottomline)

if b:NERDCommenterDelims['surround']
execute a:topline . 'normal! O'
call setline(a:topline, left)
execute a:bottomline+1 . 'normal! o'
call setline(a:bottomline+2, right)
"check if we should use the compact style i.e that the left/right
"delimiters should appear on the first and last lines of the code and not
"on separate lines above/below the first/last lines of code
if g:NERDCompactSexyComs
elseif g:NERDCompactSexyComs
let spaceString = (g:NERDSpaceDelims ? s:spaceStr : '')

"comment the top line
Expand Down Expand Up @@ -2242,7 +2251,7 @@ function! s:GetSexyComMarker(space, esc) abort
let sexyComMarker = b:NERDSexyComMarker

"if there is no hardcoded marker then we find one
if sexyComMarker ==# ''
if b:NERDSexyComMarkerSet == 0 && sexyComMarker ==# ''

"if the filetype has c style comments then use standard c sexy
"comments
Expand Down