Do not expand ~ when not followed by a path separator

Author: José Valim

lib/elixir/lib/path.ex

@@ -687,14 +687,9 @@ defmodule Path do
 
   defp resolve_home(rest) do
     case {rest, major_os_type()} do
-      {"\\" <> _, :win32} ->
-        System.user_home!() <> rest
-
-      {"/" <> _, _} ->
-        System.user_home!() <> rest
-
-      _ ->
-        rest
+      {"\\" <> _, :win32} -> System.user_home!() <> rest
+      {"/" <> _, _} -> System.user_home!() <> rest
+      _ -> "~" <> rest
     end
   end
 

lib/elixir/test/elixir/path_test.exs

@@ -135,9 +135,9 @@ defmodule PathTest do
 
     assert Path.expand("~/file") == Path.join(home, "file")
     assert Path.expand("~/file", "whatever") == Path.join(home, "file")
-    assert Path.expand("file", Path.expand("~")) == Path.expand("~/file")
+    assert Path.expand("file", Path.expand("~")) == Path.join(home, "file")
     assert Path.expand("file", "~") == Path.join(home, "file")
-    assert Path.expand("~file") == Path.join(File.cwd!(), "file")
+    assert Path.expand("~file") == Path.join(File.cwd!(), "~file")
   end
 
   test "expand/1,2" do