@@ -816,7 +816,8 @@ function! s:ShelfFile() range
816816 return
817817 endif
818818
819- let name = input (' Shelf [' .join (files , ' , ' ).' ] to: ' )
819+ let prompt = ' Shelf [' .join (files , ' , ' ).' ] to: '
820+ let name = input (prompt , ' ' , ' customlist,VimProjectShelfFolderNames' )
820821 if empty (name)
821822 return
822823 endif
@@ -913,9 +914,8 @@ function! s:DeleteFolder()
913914 execute lnum
914915endfunction
915916
916- function ! VimProjectAllFolderNames (A, L, P )
917- let lnum = line (' .' )
918- let folder = s: GetBelongFolder (lnum)
917+ function ! VimProjectUserFolderNames (A, L, P )
918+ let folder = s: GetBelongFolder (line (' .' ))
919919
920920 let changelist = filter (copy (s: changelist ), {idex, v - > ! s: IsShelfFolder (v )})
921921 let folder_names = map (changelist, {idx, v - > v .name})
@@ -929,6 +929,15 @@ function! VimProjectAllFolderNames(A, L, P)
929929 return folder_names
930930endfunction
931931
932+ function ! VimProjectShelfFolderNames (A, L, P )
933+ let folder = s: GetBelongFolder (line (' .' ))
934+
935+ let changelist = filter (copy (s: changelist ), {idex, v - > s: IsShelfFolder (v )})
936+ let folder_names = map (changelist, {idx, v - > v .name})
937+ call filter (folder_names, {idx, v - > v = ~ a: A })
938+ return folder_names
939+ endfunction
940+
932941function ! s: NewChangelistFolder ()
933942 let name = input (' New changelist name: ' )
934943 if empty (name)
@@ -961,7 +970,7 @@ function! s:MoveToFolder() range
961970 let folder = s: GetCurrentFolder (lnum)
962971
963972 if ! empty (folder)
964- let name = input (' Move to: ' , ' ' , ' customlist,VimProjectAllFolderNames ' )
973+ let name = input (' Move to: ' , ' ' , ' customlist,VimProjectUserFolderNames ' )
965974 if s: IsInvalidMoveToName (name)
966975 return
967976 endif
@@ -970,7 +979,7 @@ function! s:MoveToFolder() range
970979 else
971980 let file = s: GetCurrentFile ()
972981 if ! empty (file )
973- let name = input (' Move to: ' , ' ' , ' customlist,VimProjectAllFolderNames ' )
982+ let name = input (' Move to: ' , ' ' , ' customlist,VimProjectUserFolderNames ' )
974983 if s: IsInvalidMoveToName (name)
975984 return
976985 endif
0 commit comments