From f98f73221cfc4068757d51630eb6471e9bbc0765 Mon Sep 17 00:00:00 2001 From: Ches Martin Date: Sun, 1 May 2011 20:54:59 +0700 Subject: [PATCH] Clean up duplicate code --- plugin/NERD_commenter.vim | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/plugin/NERD_commenter.vim b/plugin/NERD_commenter.vim index 7cd4bc1..a08f89f 100644 --- a/plugin/NERD_commenter.vim +++ b/plugin/NERD_commenter.vim @@ -1394,6 +1394,12 @@ endfunction function s:UncommentLineNormal(line) let line = a:line + "get the positions of all delim types on the line + let indxLeft = s:FindDelimiterIndex(s:Left(), line) + let indxLeftAlt = s:FindDelimiterIndex(s:Left({'alt': 1}), line) + let indxRight = s:FindDelimiterIndex(s:Right(), line) + let indxRightAlt = s:FindDelimiterIndex(s:Right({'alt': 1}), line) + "get the comment status on the line so we know how it is commented let lineCommentStatus = s:IsCommentedOuttermost(s:Left(), s:Right(), s:Left({'alt': 1}), s:Right({'alt': 1}), line) @@ -1408,12 +1414,6 @@ function s:UncommentLineNormal(line) "it is not properly commented with any delims so we check if it has "any random left or right delims on it and remove the outtermost ones else - "get the positions of all delim types on the line - let indxLeft = s:FindDelimiterIndex(s:Left(), line) - let indxLeftAlt = s:FindDelimiterIndex(s:Left({'alt': 1}), line) - let indxRight = s:FindDelimiterIndex(s:Right(), line) - let indxRightAlt = s:FindDelimiterIndex(s:Right({'alt': 1}), line) - "remove the outter most left comment delim if indxLeft != -1 && (indxLeft < indxLeftAlt || indxLeftAlt == -1) let line = s:RemoveDelimiters(s:Left(), '', line) @@ -1430,12 +1430,7 @@ function s:UncommentLineNormal(line) endif - let indxLeft = s:FindDelimiterIndex(s:Left(), line) - let indxLeftAlt = s:FindDelimiterIndex(s:Left({'alt': 1}), line) let indxLeftPlace = s:FindDelimiterIndex(g:NERDLPlace, line) - - let indxRightPlace = s:FindDelimiterIndex(g:NERDRPlace, line) - let indxRightAlt = s:FindDelimiterIndex(s:Right({'alt': 1}), line) let indxRightPlace = s:FindDelimiterIndex(g:NERDRPlace, line) let right = s:Right()