🐞fix: リファクタリング

.vimrc

@@ -260,14 +260,15 @@ chdir(expand('%:p:h'))
 echoh MoreMsg
 ec 'git add --dry-run ' .. a
 const c = system('git add --dry-run ' .. a)
-if !c
-ec 'none.'
-elseif !!v:shell_error
+if !!v:shell_error
 echoh ErrorMsg
 ec c
-echoh Normal
 return
-else
+endif
+if !c
+ec 'none.'
+return
+endif
 for d in split(c, '\n')
 exe 'echoh' (d =~# '^remove' ? 'DiffDelete' : 'DiffAdd')
 ec d
@@ -276,9 +277,8 @@ echoh Question
 if input('execute ? (y/n) > ', 'y') ==# 'y'
 system('git add ' .. a)
 endif
-endif
-echoh Normal
 finally
+echoh Normal
 chdir(b)
 endtry
 enddef

src/.vimrc.src.vim

@@ -339,25 +339,25 @@ def GitAdd(args: string)
 		echoh MoreMsg
 		echo 'git add --dry-run ' .. args
 		const list = system('git add --dry-run ' .. args)
-		if !list
-			echo 'none.'
-		elseif !!v:shell_error
+		if !!v:shell_error
 			echoh ErrorMsg
 			echo list
-			echoh Normal
 			return
-		else
-			for item in split(list, '\n')
-				execute 'echoh' (item =~# '^remove' ? 'DiffDelete' : 'DiffAdd')
-				echo item
-			endfor
-			echoh Question
-			if input('execute ? (y/n) > ', 'y') ==# 'y'
-				system('git add ' .. args)
-			endif
 		endif
-		echoh Normal
+		if !list
+			echo 'none.'
+			return
+		endif
+		for item in split(list, '\n')
+			execute 'echoh' (item =~# '^remove' ? 'DiffDelete' : 'DiffAdd')
+			echo item
+		endfor
+		echoh Question
+		if input('execute ? (y/n) > ', 'y') ==# 'y'
+			system('git add ' .. args)
+		endif
 	finally
+		echoh Normal
 		chdir(current_dir)
 	endtry
 enddef