FIX: automatically add .lpi path to searchpaths

Author: PascalCorpsman

src/ufpc_understand.pas

@@ -111,6 +111,7 @@
     fFilename: String; // Der Dateiname in dem die Projekteinstellungen gespeichert wurden
     fChanged: Boolean;
     fCCColors: TCCColors;
+    Function GetSearchPaths: TPathList;
     Procedure SetCCColors(AValue: TCCColors);
     Procedure SetFiles(AValue: TFileList);
     Procedure SetLPISource(AValue: String);
@@ -130,7 +131,7 @@
     Property RootFolder: String read fFiles.RootFolder write SetRootFolder;
     Property LPISource: String read fFiles.LPISource write SetLPISource;
     Property Files: TFileList read fFiles.Files write SetFiles;
-    Property SearchPaths: TPathList read FSearchPaths write FSearchPaths; // relativ zu Rootfolder
+    Property SearchPaths: TPathList read GetSearchPaths write FSearchPaths; // relativ zu Rootfolder
 
     (*
      * For Internal Use
@@ -809,7 +810,12 @@
   setlength(result, length(PathList));
   For i := 0 To high(PathList) Do Begin
     result[i] := PathList[i];
-    result[i].Path := ConcatRelativePath(RootFolder, IncludeTrailingPathDelimiter(result[i].Path));
+    If result[i].Path = '' Then Begin
+      result[i].Path := RootFolder;
+    End
+    Else Begin
+      result[i].Path := ConcatRelativePath(RootFolder, IncludeTrailingPathDelimiter(result[i].Path));
+    End;
   End;
 End;
 
@@ -1063,6 +1069,30 @@
   fChanged := true;
 End;
 
+Function TProject.GetSearchPaths: TPathList;
+Var
+  i: Integer;
+  found: Boolean;
+Begin
+  result := FSearchPaths;
+  // At least make the .lpi file path the searchpath
+  If fFiles.LPISource <> '' Then Begin
+    // As all paths are relative to the .lpi file path, this is a empty string path
+    found := false;
+    For i := 0 To high(Result) Do Begin
+      If result[i].Path = '' Then Begin
+        found := true;
+        break;
+      End;
+    End;
+    If Not found Then Begin
+      SetLength(result, high(Result) + 2);
+      result[High(Result)].Path := '';
+      result[High(Result)].FromLPI := true;
+    End;
+  End;
+End;
+
 Procedure TProject.SetRootFolder(AValue: String);
 Begin
   AValue := IncludeTrailingPathDelimiter(AValue);

src/unit1.pas

@@ -1,7 +1,7 @@
 (******************************************************************************)
 (* FPC Understand                                                  30.03.2023 *)
 (*                                                                            *)
-(* Version     : 0.28                                                         *)
+(* Version     : 0.29                                                         *)
 (*                                                                            *)
 (* Author      : Uwe Schächterle (Corpsman)                                   *)
 (*                                                                            *)
@@ -67,6 +67,7 @@
 (*               0.27 - ADD: Support recursive {$I ...}                       *)
 (*                      FIX: Set carety when showing code editor              *)
 (*               0.28 - FIX: invalid Rootfolder                               *)
+(*               0.29 - FIX: automatically add .lpi path to searchpaths       *)
 (*                                                                            *)
 (* Known Bugs  : - if a project holds 2 units with the same name              *)
 (*                 the dependency graph will merge them to one                *)
@@ -95,7 +96,7 @@
   StdCtrls, ugraphs, ufpc_understand, ufpcparser, LvlGraphCtrl, Types;
 
 Const
-  Version = '0.28';
+  Version = '0.29';
   ScrollDelta = 25;
 
 Type