From 9550af9711621b8c44e3b3749221eee422188fda Mon Sep 17 00:00:00 2001
From: Basile Burg <basile.b@gmx.com>
Date: Mon, 20 Apr 2020 18:59:01 +0200
Subject: [PATCH] fix #29 - DUB dependencies specified by path are not
 recognized and passed to DCD

---
 .gitmodules          | 3 +++
 CHANGELOG.md         | 4 ++++
 etc/pegged           | 1 +
 src/u_dubproject.pas | 8 ++++++--
 4 files changed, 14 insertions(+), 2 deletions(-)
 create mode 160000 etc/pegged

diff --git a/.gitmodules b/.gitmodules
index 99614c6b..bfc654d7 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "etc/stdx-allocator"]
 	path = etc/stdx-allocator
 	url = https://github.com/dlang-community/stdx-allocator.git
+[submodule "etc/pegged"]
+	path = etc/pegged
+	url = https://github.com/PhilippeSigaud/Pegged.git
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fea43048..f84b8ac0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # v3.9.0-dev
 
+## Bugs fixed
+
+- DUB projects: dependencies specified with _path_ were not available for auto-completion, also improved the detection patterns so that the _path_ property work with more packages. (#29)
+
 ## Other
 
 - Toolchain: removed the background tool _dastworx_ and replaced it with a library called _libdexed-d_. Although this will not change the user experience:
diff --git a/etc/pegged b/etc/pegged
new file mode 160000
index 00000000..146e9e0c
--- /dev/null
+++ b/etc/pegged
@@ -0,0 +1 @@
+Subproject commit 146e9e0c31d86bd8fd6450f43713e04589378e93
diff --git a/src/u_dubproject.pas b/src/u_dubproject.pas
index c4835281..dab370c5 100644
--- a/src/u_dubproject.pas
+++ b/src/u_dubproject.pas
@@ -7,7 +7,7 @@ interface
 uses
   Classes, SysUtils, fpjson, jsonparser, jsonscanner, process, strutils,
   LazFileUtils, RegExpr, fgl,
-  u_common, u_interfaces, u_observer, u_dialogs, u_processes,
+  u_common, u_interfaces, u_observer, u_dialogs, u_processes, u_projutils,
   u_writableComponent, u_compilers, u_semver, u_stringrange;
 
 type
@@ -1567,10 +1567,14 @@ procedure TDubProject.updateImportPathsFromJson;
         // local path specified
         if deps.findObject(n, c) and c.findAny('path', j) then
         begin
-          s := expandFilenameEx(fBasePath, j.AsString);
+          s := expandFilenameEx(fBasePath, j.AsString) + DirectorySeparator;
+          // as auto detected by DUB
           if (s + 'source').dirExists then
             fImportPaths.Add(s)
           else if (s + 'src').dirExists then
+            fImportPaths.Add(s)
+          // when standard src content is directly in the repo root
+          else if (s + n).dirExists then
             fImportPaths.Add(s);
           continue;
         end;