paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-03 23:07:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

ide: pass Project to NewFileDescriptor.Init

Browse Source
This commit is contained in:
mattias 2024-06-12 09:21:16 +02:00
parent 2fc4aa79cb
commit bd1bc6ebb5
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ide/sourcefilemanager.pas
View File

@ -2098,6 +2098,22 @@ begin
end; end;
end; end;
if NewOwner is TProject then
AProject:=TProject(NewOwner)
else
AProject:=Project1;
if NewOwner is TLazPackage then
APackage:=TLazPackage(NewOwner)
else
APackage:=nil;
IsPartOfProject:=(nfIsPartOfProject in NewFlags)
or (NewOwner is TProject)
or (AProject.FileIsInProjectDir(NewFilename)
and (not (nfIsNotPartOfProject in NewFlags)));
if IsPartOfProject then
NewOwner:=AProject;
Result:=NewFileDescriptor.Init(NewFilename,NewOwner,NewSource,nfQuiet in NewFlags); Result:=NewFileDescriptor.Init(NewFilename,NewOwner,NewSource,nfQuiet in NewFlags);
if Result<>mrOk then exit; if Result<>mrOk then exit;
@ -2109,15 +2125,6 @@ begin
exit(mrCancel); exit(mrCancel);
end; end;
if NewOwner is TProject then
AProject:=TProject(NewOwner)
else
AProject:=Project1;
if NewOwner is TLazPackage then
APackage:=TLazPackage(NewOwner)
else
APackage:=nil;
OldUnitIndex:=AProject.IndexOfFilename(NewFilename); OldUnitIndex:=AProject.IndexOfFilename(NewFilename);
if OldUnitIndex>=0 then begin if OldUnitIndex>=0 then begin
// the file is not really new // the file is not really new
@ -2131,11 +2138,6 @@ begin
end; end;
end; end;
IsPartOfProject:=(nfIsPartOfProject in NewFlags)
or (NewOwner is TProject)
or (AProject.FileIsInProjectDir(NewFilename)
and (not (nfIsNotPartOfProject in NewFlags)));
// add required packages // add required packages
//debugln(['NewFile NewFileDescriptor.RequiredPackages="',NewFileDescriptor.RequiredPackages,'" ',DbgSName(NewFileDescriptor)]); //debugln(['NewFile NewFileDescriptor.RequiredPackages="',NewFileDescriptor.RequiredPackages,'" ',DbgSName(NewFileDescriptor)]);
RequiredPackages:=NewFileDescriptor.RequiredPackages; RequiredPackages:=NewFileDescriptor.RequiredPackages;