diff options
| -rw-r--r-- | autoload/ale/path.vim | 28 | ||||
| -rw-r--r-- | test/test_path_equality.vader | 31 |
2 files changed, 50 insertions, 9 deletions
diff --git a/autoload/ale/path.vim b/autoload/ale/path.vim index 6fd5142b..28105b1e 100644 --- a/autoload/ale/path.vim +++ b/autoload/ale/path.vim @@ -58,27 +58,37 @@ endfunction " Return 1 if a path is an absolute path. function! ale#path#IsAbsolute(filename) abort - return match(a:filename, '^\v/|^[a-zA-Z]:\\') == 0 + " Check for /foo and C:\foo, etc. + return a:filename[:0] ==# '/' || a:filename[1:2] ==# ':\' endfunction " Given a directory and a filename, resolve the path, which may be relative " or absolute, and get an absolute path to the file, following symlinks. -function! ale#path#Resolve(directory, filename) abort - return resolve( - \ ale#path#IsAbsolute(a:filename) - \ ? a:filename - \ : a:directory . '/' . a:filename - \) +function! ale#path#GetAbsPath(directory, filename) abort + " If the path is already absolute, then just resolve it. + if ale#path#IsAbsolute(a:filename) + return resolve(a:filename) + endif + + " Get an absolute path to our containing directory. + " If our directory is relative, then we'll use the CWD. + let l:absolute_directory = ale#path#IsAbsolute(a:directory) + \ ? a:directory + \ : getcwd() . '/' . a:directory + + " Resolve the relative path to the file with the absolute path to our + " directory. + return resolve(l:absolute_directory . '/' . a:filename) endfunction " Given a buffer number and a relative or absolute path, return 1 if the " two paths represent the same file on disk. function! ale#path#IsBufferPath(buffer, filename) abort let l:buffer_filename = expand('#' . a:buffer . ':p') - let l:resolved_filename = ale#path#Resolve( + let l:resolved_filename = ale#path#GetAbsPath( \ fnamemodify(l:buffer_filename, ':h'), \ a:filename \) - return resolve(l:buffer_filename) == l:resolved_filename + return resolve(l:buffer_filename) ==# l:resolved_filename endfunction diff --git a/test/test_path_equality.vader b/test/test_path_equality.vader new file mode 100644 index 00000000..b1f06967 --- /dev/null +++ b/test/test_path_equality.vader @@ -0,0 +1,31 @@ +Execute(ale#path#GetAbsPath should handle simple relative paths): + AssertEqual '/foo/bar', ale#path#GetAbsPath('/foo', 'bar') + AssertEqual 'C:\foo/bar', ale#path#GetAbsPath('C:\foo', 'bar') + AssertEqual getcwd() . '/foo/bar', ale#path#GetAbsPath('foo', 'bar') + +Execute(ale#path#GetAbsPath should handle relative paths with dots): + AssertEqual '/foo/baz', ale#path#GetAbsPath('/foo', 'bar/sub/../../baz') + AssertEqual '/foo/baz', ale#path#GetAbsPath('/foo/', 'bar/sub/../../baz') + AssertEqual '/foo/other', ale#path#GetAbsPath('/foo/bar', '../other') + AssertEqual '/foo/other', ale#path#GetAbsPath('/foo/bar/', '../other') + +Execute(ale#path#GetAbsPath should handle absolute paths): + AssertEqual '/foo/bar', ale#path#GetAbsPath('/something else', '/foo/bar') + AssertEqual 'C:\foo/bar', ale#path#GetAbsPath('D:\another thing', 'C:\foo/bar') + +Execute(ale#path#IsBufferPath should match simple relative paths): + silent file! foo.txt + + Assert ale#path#IsBufferPath(bufnr(''), 'foo.txt'), 'No match for foo.txt' + Assert !ale#path#IsBufferPath(bufnr(''), 'bar.txt'), 'Bad match for bar.txt' + +Execute(ale#path#IsBufferPath should match absolute paths): + silent file! foo.txt + + Assert ale#path#IsBufferPath(bufnr(''), getcwd() . '/foo.txt'), 'No match for foo.txt' + Assert !ale#path#IsBufferPath(bufnr(''), getcwd() . '/bar.txt'), 'Bad match for bar.txt' + +Execute(ale#path#IsBufferPath should match paths with dots): + silent file! foo.txt + + Assert ale#path#IsBufferPath(bufnr(''), './test/../foo.txt'), 'No match for ./test/../foo.txt' |