Merge pull request #1200 from elixir-lsp/codex/normalize-directory-path-in-path_in_dir

Fix trailing slash handling in path_in_dir? and add tests

Author: lukaszsamson

apps/language_server/lib/language_server/source_file/path.ex

@@ -147,6 +147,8 @@ defmodule ElixirLS.LanguageServer.SourceFile.Path do
 
   # This function expects absolute paths with universal separators
   def path_in_dir?(file, dir) do
+    dir = if dir == "/", do: "/", else: String.trim_trailing(dir, "/")
+
     case String.starts_with?(file, dir) do
       true ->
         # Get the grapheme after the directory in the file path

apps/language_server/test/source_file/path_test.exs

@@ -191,4 +191,18 @@ defmodule ElixirLS.LanguageServer.SourceFile.PathTest do
       end
     end
   end
+
+  describe "path_in_dir?/2" do
+    test "matches regardless of trailing slash" do
+      assert path_in_dir?("/foo/bar.ex", "/foo")
+      assert path_in_dir?("/foo/bar.ex", "/foo/")
+      assert path_in_dir?("c:/foo/bar.ex", "c:/foo")
+      assert path_in_dir?("c:/foo/bar.ex", "c:/foo/")
+    end
+
+    test "non-matching paths" do
+      refute path_in_dir?("/foobar/baz.ex", "/foo")
+      refute path_in_dir?("/foobar/baz.ex", "/foo/")
+    end
+  end
 end