Skip to content
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

Jump to bottom

Upward Commenting #303

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upward Commenting #303

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
54 changes: 39 additions & 15 deletions plugin/NERD_commenter.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1210,6 +1210,11 @@ function! NERDComment(mode, type) range
else
let firstLine = a:firstline
let lastLine = a:lastline

if a:type[0:0] == "r"
let firstLine = a:firstline - (a:lastline - a:firstline)
let lastLine = a:firstline
endif
endif
"
" Save options we need to change so we can recover them later
Expand All @@ -1219,7 +1224,13 @@ function! NERDComment(mode, type) range

let forceNested = (a:type ==? 'Nested' || g:NERDDefaultNesting)

if a:type ==? 'Comment' || a:type ==? 'Nested'
let ctype = a:type

if a:type[0:0] == "r"
let ctype = strpart(a:type, 1)
endif

if ctype ==? 'Comment' || ctype ==? 'Nested'
if isVisual && visualmode() == "\<C-V>"
call s:CommentBlock(firstLine, lastLine, firstCol, lastCol, forceNested)
elseif isVisual && visualmode() == "v" && (g:NERDCommentWholeLinesInVMode==0 || (g:NERDCommentWholeLinesInVMode==2 && s:HasMultipartDelims()))
Expand All @@ -1228,19 +1239,19 @@ function! NERDComment(mode, type) range
call s:CommentLines(forceNested, g:NERDDefaultAlign, firstLine, lastLine)
endif

elseif a:type ==? 'AlignLeft' || a:type ==? 'AlignBoth'
elseif ctype ==? 'AlignLeft' || ctype ==? 'AlignBoth'
let align = "none"
if a:type ==? "AlignLeft"
if ctype ==? "AlignLeft"
let align = "left"
elseif a:type ==? "AlignBoth"
elseif ctype ==? "AlignBoth"
let align = "both"
endif
call s:CommentLines(forceNested, align, firstLine, lastLine)

elseif a:type ==? 'Invert'
elseif ctype ==? 'Invert'
call s:InvertComment(firstLine, lastLine)

elseif a:type ==? 'Sexy'
elseif ctype ==? 'Sexy'
try
call s:CommentLinesSexy(firstLine, lastLine)
catch /NERDCommenter.Delimiters/
Expand All @@ -1249,7 +1260,7 @@ function! NERDComment(mode, type) range
call s:NerdEcho("Sexy comment aborted. Nested sexy cannot be nested", 0)
endtry

elseif a:type ==? 'Toggle'
elseif ctype ==? 'Toggle'
let theLine = getline(firstLine)

if s:IsInSexyComment(firstLine) || s:IsCommentedFromStartOfLine(s:Left(), theLine) || s:IsCommentedFromStartOfLine(s:Left({'alt': 1}), theLine)
Expand All @@ -1258,7 +1269,7 @@ function! NERDComment(mode, type) range
call s:CommentLinesToggle(forceNested, firstLine, lastLine)
endif

elseif a:type ==? 'Minimal'
elseif ctype ==? 'Minimal'
try
call s:CommentLinesMinimal(firstLine, lastLine)
catch /NERDCommenter.Delimiters/
Expand All @@ -1267,21 +1278,21 @@ function! NERDComment(mode, type) range
call s:NerdEcho("Place holders are required but disabled.", 0)
endtry

elseif a:type ==? 'ToEOL'
elseif ctype ==? 'ToEOL'
call s:SaveScreenState()
call s:CommentBlock(firstLine, firstLine, col("."), col("$")-1, 1)
call s:RestoreScreenState()

elseif a:type ==? 'Append'
elseif ctype ==? 'Append'
call s:AppendCommentToLine()

elseif a:type ==? 'Insert'
elseif ctype ==? 'Insert'
call s:PlaceDelimitersAndInsBetween()

elseif a:type ==? 'Uncomment'
elseif ctype ==? 'Uncomment'
call s:UncommentLines(firstLine, lastLine)

elseif a:type ==? 'Yank'
elseif ctype ==? 'Yank'
if isVisual
normal! gvy
elseif countWasGiven
Expand All @@ -1296,9 +1307,9 @@ function! NERDComment(mode, type) range

if isVisual
let nlines = lastLine - firstLine
silent! call repeat#set("V" . nlines . "jo" . "\<Plug>NERDCommenter". a:type)
silent! call repeat#set("V" . nlines . "jo" . "\<Plug>NERDCommenter". ctype)
else
silent! call repeat#set("\<Plug>NERDCommenter". a:type)
silent! call repeat#set("\<Plug>NERDCommenter". ctype)
endif

if exists('*NERDCommenter_after')
Expand Down Expand Up @@ -3017,20 +3028,33 @@ function! s:CreateMaps(modes, target, desc, combo)
endfor
endfunction
call s:CreateMaps('nx', 'Comment', 'Comment', 'cc')
call s:CreateMaps('nx', 'rComment', 'rComment', '<leader>cc')
call s:CreateMaps('nx', 'Toggle', 'Toggle', 'c<space>')
call s:CreateMaps('nx', 'rToggle', 'rToggle', '<leader>c<space>')
call s:CreateMaps('nx', 'Minimal', 'Minimal', 'cm')
call s:CreateMaps('nx', 'rMinimal', 'rMinimal', '<leader>cm')
call s:CreateMaps('nx', 'Nested', 'Nested', 'cn')
call s:CreateMaps('nx', 'rNested', 'rNested', '<leader>cn')
call s:CreateMaps('n', 'ToEOL', 'To EOL', 'c$')
call s:CreateMaps('n', 'rToEOL', 'rTo EOL', '<leader>c$')
call s:CreateMaps('nx', 'Invert', 'Invert', 'ci')
call s:CreateMaps('nx', 'rInvert', 'rInvert', '<leader>ci')
call s:CreateMaps('nx', 'Sexy', 'Sexy', 'cs')
call s:CreateMaps('nx', 'rSexy', 'rSexy', '<leader>cs')
call s:CreateMaps('nx', 'Yank', 'Yank then comment', 'cy')
call s:CreateMaps('nx', 'rYank', 'rYank then comment', '<leader>cy')
call s:CreateMaps('n', 'Append', 'Append', 'cA')
call s:CreateMaps('n', 'rAppend', 'rAppend', '<leader>cA')
call s:CreateMaps('', ':', '-Sep-', '')
call s:CreateMaps('nx', 'AlignLeft', 'Left aligned', 'cl')
call s:CreateMaps('nx', 'rAlignLeft', 'rLeft aligned', '<leader>cl')
call s:CreateMaps('nx', 'AlignBoth', 'Left and right aligned', 'cb')
call s:CreateMaps('nx', 'rAlignBoth', 'rLeft and right aligned', '<leader>cb')
call s:CreateMaps('', ':', '-Sep2-', '')
call s:CreateMaps('nx', 'Uncomment', 'Uncomment', 'cu')
call s:CreateMaps('nx', 'rUncomment', 'rUncomment', '<leader>cu')
call s:CreateMaps('n', 'AltDelims', 'Switch Delimiters', 'ca')
call s:CreateMaps('n', 'rAltDelims', 'rSwitch Delimiters', '<leader>ca')
call s:CreateMaps('i', 'Insert', 'Insert Comment Here', '')
call s:CreateMaps('', ':', '-Sep3-', '')
call s:CreateMaps('', ':help NERDCommenterContents<CR>', 'Help', '')
Expand Down