Clean import paths from last character if it's a path separator

idanarye · Aug 19, 2014 · a1d320d · a1d320d
1 parent bedac4f
commit a1d320d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/autoload/dutyl/configFile.vim b/autoload/dutyl/configFile.vim
@@ -11,7 +11,7 @@ let s:functions={}
 function! s:functions.importPaths() dict abort
     let l:result=exists('g:dutyl_stdImportPaths') ? copy(g:dutyl_stdImportPaths) : []
     let l:result=extend(l:result,s:readConfigFile().importPaths)
-    return l:result
+    return map(l:result,'dutyl#util#cleanPathFromLastCharacterIfPathSeparator(v:val)')
 endfunction
 
 "Return a Vim Dictionary of the configuration in the configuration file

diff --git a/autoload/dutyl/dub.vim b/autoload/dutyl/dub.vim
@@ -33,7 +33,7 @@ function! s:functions.importPaths() dict abort
         endfor
     endfor
 
-    return l:result
+    return map(l:result,'dutyl#util#cleanPathFromLastCharacterIfPathSeparator(v:val)')
 endfunction
 
 "Calls 'dub describe' and turns the result to Vim's data types

diff --git a/autoload/dutyl/util.vim b/autoload/dutyl/util.vim
@@ -7,3 +7,12 @@ function! dutyl#util#isPathAbsolute(path) abort
 	endif
 endfunction
 
+"Exactly what it says on the tin
+function! dutyl#util#cleanPathFromLastCharacterIfPathSeparator(path) abort
+	let l:lastCharacter=a:path[len(a:path)-1]
+	if '/'==l:lastCharacter || '\'==l:lastCharacter
+		return a:path[0:-2]
+	else
+		return a:path
+	endif
+endfunction