paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-21 18:20:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: Simplify symlink loading. Project directory is already in source path. Don't ask questions while IDE starts.

Browse Source 
git-svn-id: trunk@55996 -
This commit is contained in:
juha 2017-10-07 22:34:26 +00:00
parent 5ac6230db9
commit 28389af5d2
1 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ide/sourcefilemanager.pas
View File

@ -389,26 +389,6 @@ begin
LazProjectFileDescriptors.DefaultPascalFileExt:=DefPasExt; LazProjectFileDescriptors.DefaultPascalFileExt:=DefPasExt;
end; end;
function UseCurrentDirInSrcPath(const ASearchPath, ACurrentDir: string): string;
// Replace path "." with ACurrentDir in a ";" separated list of search paths.
var
p: Integer;
Dir: String;
begin
Result := '';
p := 1;
while p <= length(ASearchPath) do
begin
Dir := GetNextDirectoryInSearchPath(ASearchPath,p);
if Dir <> '' then
begin
if Dir = '.' then
Dir := ACurrentDir;
Result := Result + Dir + ';';
end;
end;
end;
// Wrappers for TFileOpener methods. // Wrappers for TFileOpener methods.
function GetAvailableUnitEditorInfo(AnUnitInfo: TUnitInfo; function GetAvailableUnitEditorInfo(AnUnitInfo: TUnitInfo;
@ -1221,14 +1201,12 @@ var
SPath, Target: String; // Search path and target file for the symlink. SPath, Target: String; // Search path and target file for the symlink.
begin begin
Result := mrOK; Result := mrOK;
Assert(FileExistsCached(FFilename),'TFileOpener.ResolveSymlink: '+FFilename+' does not exist.'); if not MainIDE.IDEStarted then Exit; // Use the given name at initial load.
Target := GetPhysicalFilenameCached(FFileName,false); Target := GetPhysicalFilenameCached(FFileName,false);
if Target = FFilename then Exit; // Not a symlink, continue with FFilename. if Target = FFilename then Exit; // Not a symlink, continue with FFilename.
// ToDo: Check if there is an editor with a symlink for this "physical" file. // ToDo: Check if there is an editor with a symlink for this "physical" file.
// Include absolute Project1.Directory in the search path. SPath := CodeToolBoss.GetCompleteSrcPathForDirectory('');
SPath := UseCurrentDirInSrcPath(CodeToolBoss.GetCompleteSrcPathForDirectory(''),
Project1.Directory);
// Check if "physical" target for a symlink is found in search path or in editor. // Check if "physical" target for a symlink is found in search path or in editor.
if (SearchDirectoryInSearchPath(SPath, ExtractFilePath(Target)) > 0) if (SearchDirectoryInSearchPath(SPath, ExtractFilePath(Target)) > 0)
or Assigned(SourceEditorManager.SourceEditorIntfWithFilename(Target)) or Assigned(SourceEditorManager.SourceEditorIntfWithFilename(Target))