m-vim_plugins/nerdcommenter
1
0
Fork 0
mirror of https://github.com/preservim/nerdcommenter.git synced 2025-11-11 11:13:47 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #475 from tomtomjhj/refactor

Browse Source
This commit is contained in:
Caleb Maclennan
2021-07-31 20:24:00 +03:00
committed by GitHub
parent 85364c56c4 f7333809b6
commit 2c87cae76e
1 changed files with 24 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
autoload/nerdcommenter.vim
View File

@@ -506,8 +506,8 @@ function! s:CreateDelimMapFromCms() abort
return delims return delims
endif endif
return { return {
\ 'left': substitute(&commentstring, '\([^ \t]*\)\s*%s.*', '\1', ''), \ 'left': matchstr(&commentstring, '^\S*\ze\s*%s'),
\ 'right': substitute(&commentstring, '.*%s\s*\(.*\)', '\1', 'g'), \ 'right': matchstr(&commentstring, '%s\s*\zs.*$'),
\ 'nested': 0, \ 'nested': 0,
\ 'leftAlt': '', \ 'leftAlt': '',
\ 'rightAlt': '', \ 'rightAlt': '',
@@ -1091,7 +1091,7 @@ function! s:CommentRegion(topLine, topCol, bottomLine, bottomCol, forceNested) a
"comment the bottom line "comment the bottom line
let bottom = getline(a:bottomLine) let bottom = getline(a:bottomLine)
let numLeadingSpacesTabs = strlen(substitute(bottom, '^\([ \t]*\).*$', '\1', '')) let numLeadingSpacesTabs = strlen(matchstr(bottom, '^\s*'))
call s:CommentBlock(a:bottomLine, a:bottomLine, numLeadingSpacesTabs+1, a:bottomCol, a:forceNested) call s:CommentBlock(a:bottomLine, a:bottomLine, numLeadingSpacesTabs+1, a:bottomCol, a:forceNested)
endif endif
@@ -1236,7 +1236,7 @@ function! nerdcommenter#Comment(mode, type) range abort
for i in range(firstLine, lastLine) for i in range(firstLine, lastLine)
let theLine = getline(i) let theLine = getline(i)
" if have one line no comment(not include blank/whitespace-only lines), then comment all lines " if have one line no comment(not include blank/whitespace-only lines), then comment all lines
if theLine =~# '[^ \t]\+' && !s:IsInSexyComment(firstLine) && !s:IsCommentedFromStartOfLine(s:Left(), theLine) && !s:IsCommentedFromStartOfLine(s:Left({'alt': 1}), theLine) if theLine =~# '\S\+' && !s:IsInSexyComment(firstLine) && !s:IsCommentedFromStartOfLine(s:Left(), theLine) && !s:IsCommentedFromStartOfLine(s:Left({'alt': 1}), theLine)
let l:commentAllLines = 1 let l:commentAllLines = 1
break break
else else
@@ -1259,9 +1259,9 @@ function! nerdcommenter#Comment(mode, type) range abort
endtry endtry
elseif a:type ==? 'ToEOL' elseif a:type ==? 'ToEOL'
call s:SaveScreenState() let view = winsaveview()
call s:CommentBlock(firstLine, firstLine, col('.'), col('$')-1, 1) call s:CommentBlock(firstLine, firstLine, col('.'), col('$')-1, 1)
call s:RestoreScreenState() call winrestview(view)
elseif a:type ==? 'Append' elseif a:type ==? 'Append'
call s:AppendCommentToLine() call s:AppendCommentToLine()
@@ -1671,7 +1671,7 @@ function! s:UncommentLinesSexy(topline, bottomline) abort
let theLine = getline(a:topline) let theLine = getline(a:topline)
" if the first line contains only the left delimiter then just delete it " if the first line contains only the left delimiter then just delete it
if theLine =~# '^[ \t]*' . left . '[ \t]*$' && !g:NERDCompactSexyComs if theLine =~# '^\s*' . left . '\s*$' && !g:NERDCompactSexyComs
call cursor(a:topline, 1) call cursor(a:topline, 1)
normal! dd normal! dd
let bottomline = bottomline - 1 let bottomline = bottomline - 1
@@ -1695,7 +1695,7 @@ function! s:UncommentLinesSexy(topline, bottomline) abort
let theLine = getline(bottomline) let theLine = getline(bottomline)
" if the bottomline contains only the right delimiter then just delete it " if the bottomline contains only the right delimiter then just delete it
if theLine =~# '^[ \t]*' . right . '[ \t]*$' if theLine =~# '^\s*' . right . '\s*$'
call cursor(bottomline, 1) call cursor(bottomline, 1)
normal! dd normal! dd
@@ -1712,7 +1712,7 @@ function! s:UncommentLinesSexy(topline, bottomline) abort
" if the last line also starts with a sexy comment marker then we " if the last line also starts with a sexy comment marker then we
" remove this as well " remove this as well
if theLine =~# '^[ \t]*' . sexyComMarker if theLine =~# '^\s*' . sexyComMarker
" remove the sexyComMarker. If there is a space after it then " remove the sexyComMarker. If there is a space after it then
" remove that too " remove that too
@@ -1836,7 +1836,7 @@ endfunction
" Function: s:AddLeftDelim(delim, theLine) " Function: s:AddLeftDelim(delim, theLine)
" Args: " Args:
function! s:AddLeftDelim(delim, theLine) abort function! s:AddLeftDelim(delim, theLine) abort
return substitute(a:theLine, '^\([ \t]*\)', '\1' . a:delim, '') return substitute(a:theLine, '^\(\s*\)', '\1' . a:delim, '')
endfunction endfunction
" Function: s:AddLeftDelimAligned(delim, theLine) " Function: s:AddLeftDelimAligned(delim, theLine)
@@ -1906,7 +1906,7 @@ function! s:CanCommentLine(forceNested, lineNum) abort
" make sure we don't comment lines that are just spaces or tabs or empty, " make sure we don't comment lines that are just spaces or tabs or empty,
" unless configured otherwise " unless configured otherwise
if g:NERDCommentEmptyLines ==# 0 && theLine =~# "^[ \t]*$" if g:NERDCommentEmptyLines ==# 0 && theLine =~# '^\s*$'
return 0 return 0
endif endif
@@ -1973,7 +1973,7 @@ function! s:CanToggleCommentLine(forceNested, lineNum) abort
" make sure we don't comment lines that are just spaces or tabs or empty, " make sure we don't comment lines that are just spaces or tabs or empty,
" unless configured otherwise " unless configured otherwise
if g:NERDCommentEmptyLines ==# 0 && theLine =~# "^[ \t]*$" if g:NERDCommentEmptyLines ==# 0 && theLine =~# '^\s*$'
return 0 return 0
endif endif
@@ -2194,16 +2194,16 @@ function! s:FindBoundingLinesOfSexyCom(lineNum) abort
let theLine = getline(currentLine) let theLine = getline(currentLine)
"check if the current line is the top of the sexy comment "check if the current line is the top of the sexy comment
if currentLine <= a:lineNum && theLine =~# '^[ \t]*' . left && theLine !~# '.*' . right && currentLine < s:NumLinesInBuf() if currentLine <= a:lineNum && theLine =~# '^\s*' . left && theLine !~# '.*' . right && currentLine < s:NumLinesInBuf()
let top = currentLine let top = currentLine
let currentLine = a:lineNum let currentLine = a:lineNum
"check if the current line is the bottom of the sexy comment "check if the current line is the bottom of the sexy comment
elseif theLine =~# '^[ \t]*' . right && theLine !~# '.*' . left && currentLine > 1 elseif theLine =~# '^\s*' . right && theLine !~# '.*' . left && currentLine > 1
let bottom = currentLine let bottom = currentLine
"the right delimiter is on the same line as the last sexyComMarker "the right delimiter is on the same line as the last sexyComMarker
elseif theLine =~# '^[ \t]*' . sexyComMarker . '.*' . right elseif theLine =~# '^\s*' . sexyComMarker . '.*' . right
let bottom = currentLine let bottom = currentLine
"we have not found the top or bottom line so we assume currentLine is an "we have not found the top or bottom line so we assume currentLine is an
@@ -2212,7 +2212,7 @@ function! s:FindBoundingLinesOfSexyCom(lineNum) abort
"if the line doesn't start with a sexyComMarker then it is not a sexy "if the line doesn't start with a sexyComMarker then it is not a sexy
"comment "comment
if theLine !~# '^[ \t]*' . sexyComMarker if theLine !~# '^\s*' . sexyComMarker
return [] return []
endif endif
@@ -2450,7 +2450,7 @@ endfunction
" -left: the left delimiter to check for " -left: the left delimiter to check for
function! s:IsCommentedFromStartOfLine(left, line) abort function! s:IsCommentedFromStartOfLine(left, line) abort
let theLine = s:ConvertLeadingTabsToSpaces(a:line) let theLine = s:ConvertLeadingTabsToSpaces(a:line)
let numSpaces = strlen(substitute(theLine, '^\( *\).*$', '\1', '')) let numSpaces = strlen(matchstr(theLine, '^ *'))
let delimIndx = s:FindDelimiterIndex(a:left, theLine) let delimIndx = s:FindDelimiterIndex(a:left, theLine)
return delimIndx ==# numSpaces return delimIndx ==# numSpaces
endfunction endfunction
@@ -2552,7 +2552,7 @@ function! s:IsDelimValid(delimiter, delIndx, line) abort
"if the delimiter is on the very first char of the line or is the "if the delimiter is on the very first char of the line or is the
"first non-tab/space char on the line then it is a valid comment delimiter "first non-tab/space char on the line then it is a valid comment delimiter
if a:delIndx ==# 0 || a:line =~# "^[ \t]\\{" . a:delIndx . "\\}\".*$" if a:delIndx ==# 0 || a:line =~# "^\s\\{" . a:delIndx . "\\}\".*$"
return 1 return 1
endif endif
@@ -2653,7 +2653,7 @@ function! s:IsSexyComment(topline, bottomline) abort
endif endif
"if the top line doesn't begin with a left delimiter then the comment isn't sexy "if the top line doesn't begin with a left delimiter then the comment isn't sexy
if getline(a:topline) !~# '^[ \t]*' . left if getline(a:topline) !~# '^\s*' . left
return 0 return 0
endif endif
@@ -2681,7 +2681,7 @@ function! s:IsSexyComment(topline, bottomline) abort
while currentLine < a:bottomline while currentLine < a:bottomline
let theLine = getline(currentLine) let theLine = getline(currentLine)
if theLine !~# '^[ \t]*' . sexyComMarker if theLine !~# '^\s*' . sexyComMarker
return 0 return 0
endif endif
@@ -2780,12 +2780,12 @@ function! s:LeftMostIndx(countCommentedLines, countEmptyLines, topline, bottomli
" get the next line and if it is allowed to be commented, or is not " get the next line and if it is allowed to be commented, or is not
" commented, check it " commented, check it
let theLine = getline(currentLine) let theLine = getline(currentLine)
if a:countEmptyLines || theLine !~# '^[ \t]*$' if a:countEmptyLines || theLine !~# '^\s*$'
if a:countCommentedLines || (!s:IsCommented(s:Left(), s:Right(), theLine) && !s:IsCommented(s:Left({'alt': 1}), s:Right({'alt': 1}), theLine)) if a:countCommentedLines || (!s:IsCommented(s:Left(), s:Right(), theLine) && !s:IsCommented(s:Left({'alt': 1}), s:Right({'alt': 1}), theLine))
" convert spaces to tabs and get the number of leading spaces for " convert spaces to tabs and get the number of leading spaces for
" this line and update leftMostIndx if need be " this line and update leftMostIndx if need be
let theLine = s:ConvertLeadingTabsToSpaces(theLine) let theLine = s:ConvertLeadingTabsToSpaces(theLine)
let leadSpaceOfLine = strlen( substitute(theLine, '\(^[ \t]*\).*$','\1','') ) let leadSpaceOfLine = strlen(matchstr(theLine, '^\s*'))
if leadSpaceOfLine < leftMostIndx if leadSpaceOfLine < leftMostIndx
let leftMostIndx = leadSpaceOfLine let leftMostIndx = leadSpaceOfLine
endif endif
@@ -2833,7 +2833,7 @@ endfunction
" Function: s:NumberOfLeadingTabs(s) " Function: s:NumberOfLeadingTabs(s)
" returns the number of leading tabs in the given string " returns the number of leading tabs in the given string
function! s:NumberOfLeadingTabs(s) abort function! s:NumberOfLeadingTabs(s) abort
return strlen(substitute(a:s, '^\(\t*\).*$', '\1', '')) return strlen(matchstr(a:s, '^\t*'))
endfunction endfunction
" Function: s:NumLinesInBuf() " Function: s:NumLinesInBuf()
@@ -2907,21 +2907,6 @@ function! s:ReplaceRightMostDelim(toReplace, replacor, str) abort
return line return line
endfunction endfunction
"FUNCTION: s:RestoreScreenState()
"
"Sets the screen state back to what it was when s:SaveScreenState was last
"called.
"
function! s:RestoreScreenState() abort
if !exists('t:NERDComOldTopLine') || !exists('t:NERDComOldPos')
throw 'NERDCommenter exception: cannot restore screen'
endif
call cursor(t:NERDComOldTopLine, 0)
normal! zt
call setpos('.', t:NERDComOldPos)
endfunction
" Function: s:Right(...) " Function: s:Right(...)
" returns right delimiter data " returns right delimiter data
function! s:Right(...) abort function! s:Right(...) abort
@@ -2963,7 +2948,7 @@ function! s:RightMostIndx(countCommentedLines, countEmptyLines, topline, bottoml
" get the next line and see if it is commentable, otherwise it doesn't " get the next line and see if it is commentable, otherwise it doesn't
" count " count
let theLine = getline(currentLine) let theLine = getline(currentLine)
if a:countEmptyLines || theLine !~# '^[ \t]*$' if a:countEmptyLines || theLine !~# '^\s*$'
if a:countCommentedLines || (!s:IsCommented(s:Left(), s:Right(), theLine) && !s:IsCommented(s:Left({'alt': 1}), s:Right({'alt': 1}), theLine)) if a:countCommentedLines || (!s:IsCommented(s:Left(), s:Right(), theLine) && !s:IsCommented(s:Left({'alt': 1}), s:Right({'alt': 1}), theLine))
@@ -2983,14 +2968,6 @@ function! s:RightMostIndx(countCommentedLines, countEmptyLines, topline, bottoml
return rightMostIndx return rightMostIndx
endfunction endfunction
"FUNCTION: s:SaveScreenState()
"Saves the current cursor position in the current buffer and the window
"scroll position
function! s:SaveScreenState() abort
let t:NERDComOldPos = getpos('.')
let t:NERDComOldTopLine = line('w0')
endfunction
" Function: s:SwapOuterMultiPartDelimsForPlaceHolders(line) " Function: s:SwapOuterMultiPartDelimsForPlaceHolders(line)
" This function takes a line and swaps the outer most multi-part delimiters for " This function takes a line and swaps the outer most multi-part delimiters for
" place holders " place holders