Relativize edited paths.

Author: moll

autoload/node/lib.vim

@@ -23,7 +23,7 @@ function! node#lib#find(name, from)
 	endif
 
 	let l:path = s:resolve(s:absolutize(a:name, a:from))
-	if !empty(path) | return resolve(path) | endif
+	if !empty(path) | return fnamemodify(resolve(path), ":.") | endif
 endfunction
 
 function! node#lib#version()

test/autoload/lib_test.rb

@@ -5,6 +5,8 @@
   include WithTemporaryDirectory
 
   before do
+    # Some tests may change the working directory, so reset it to a known good.
+    $vim.command "cd #{Dir.getwd}"
     Dir.mkdir File.join(@dir, "node_modules")
   end
 

test/autoload_test.rb

@@ -156,6 +156,18 @@
       $vim.echo(%(bufname("%"))).must_equal target
     end
 
+    it "must relativize paths" do
+      touch File.join(@dir, "index.js"), %(require("root/foo"))
+      target = touch File.join(@dir, "foo.js")
+      FileUtils.mkpath File.join(@dir, "node_modules")
+      File.symlink "..", File.join(@dir, "node_modules", "root")
+
+      $vim.edit File.join(@dir, "index.js")
+      $vim.command %(:cd %:h)
+      $vim.feedkeys "$hhgf"
+      $vim.echo(%(bufname("%"))).must_equal File.basename(target)
+    end
+
     it "must not show an error when searching for nothing" do
       touch File.join(@dir, "index.js"), %("")