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

IDE: Remove all selected units with "Remove from project..." even if user commented out the CreateForm lines. Issue #28065.

Browse Source 
git-svn-id: trunk@62194 -
This commit is contained in:
juha 2019-11-04 22:38:07 +00:00
parent 4d7fdb6248
commit d8e277a5f0
2 changed files with 22 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ide/project.pp
View File

@ -971,8 +971,7 @@ type
// Application.CreateForm statements
function AddCreateFormToProjectFile(const AClassName, AName:string):boolean;
function RemoveCreateFormFromProjectFile(const {%H-}AClassName,
AName: string):boolean;
function RemoveCreateFormFromProjectFile(const AName: string): boolean;
function FormIsCreatedInProjectFile(const AClassname, AName:string):boolean;
function GetAutoCreatedFormsList: TStrings;
property TmpAutoCreatedForms: TStrings read FTmpAutoCreatedForms write FTmpAutoCreatedForms;
@ -3997,8 +3996,7 @@ end;
function TProject.AddCreateFormToProjectFile(const AClassName, AName: string):boolean;
begin
if (pfMainUnitHasCreateFormStatements in Project1.Flags) then begin
Result:=CodeToolBoss.AddCreateFormStatement(MainUnitInfo.Source,
AClassName,AName);
Result:=CodeToolBoss.AddCreateFormStatement(MainUnitInfo.Source,AClassName,AName);
if Result then begin
MainUnitInfo.Modified:=true;
end;
@ -4007,12 +4005,11 @@ begin
end;
end;
function TProject.RemoveCreateFormFromProjectFile(const AClassName,AName:string):boolean;
function TProject.RemoveCreateFormFromProjectFile(const AName:string):boolean;
begin
Result:=CodeToolBoss.RemoveCreateFormStatement(MainUnitInfo.Source,AName);
if Result then begin
if Result then
MainUnitInfo.Modified:=true;
end;
end;
function TProject.FormIsCreatedInProjectFile(const AClassname,AName:string):boolean;

43
ide/sourcefilemanager.pas
View File

@ -7278,14 +7278,10 @@ var
ShortUnitName, UnitPath: String;
ObsoleteUnitPaths, ObsoleteIncPaths: String;
i: Integer;
Dummy: Boolean;
SomeRemoved: Boolean;
begin
Result:=mrOk;
if UnitInfos=nil then exit;
// check if something will change
i:=UnitInfos.Count-1;
while (i>=0) and (not TUnitInfo(UnitInfos[i]).IsPartOfProject) do dec(i);
if i<0 then exit;
Assert(Assigned(UnitInfos);
// check ToolStatus
if (MainIDE.ToolStatus in [itCodeTools,itCodeToolAborting]) then begin
debugln('RemoveUnitsFromProject wrong ToolStatus ',dbgs(ord(MainIDE.ToolStatus)));
@ -7293,19 +7289,21 @@ begin
end;
// commit changes from source editor to codetools
SaveEditorChangesToCodeCache(nil);
SomeRemoved:=false;
ObsoleteUnitPaths:='';
ObsoleteIncPaths:='';
Project1.BeginUpdate(true);
try
for i:=0 to UnitInfos.Count-1 do begin
for i:=0 to UnitInfos.Count-1 do
begin
AnUnitInfo:=TUnitInfo(UnitInfos[i]);
//debugln(['RemoveUnitsFromProject Unit ',AnUnitInfo.Filename]);
if not AnUnitInfo.IsPartOfProject then continue;
UnitPath:=ChompPathDelim(ExtractFilePath(AnUnitInfo.Filename));
AnUnitInfo.IsPartOfProject:=false;
SomeRemoved:=true;
Project1.Modified:=true;
if FilenameIsPascalUnit(AnUnitInfo.Filename) then begin
if FilenameIsPascalUnit(AnUnitInfo.Filename) then
begin
if FilenameIsAbsolute(AnUnitInfo.Filename) then
ObsoleteUnitPaths:=MergeSearchPaths(ObsoleteUnitPaths,UnitPath);
// remove from project's unit section
@ -7313,33 +7311,27 @@ begin
and (pfMainUnitIsPascalSource in Project1.Flags)
then begin
ShortUnitName:=ExtractFileNameOnly(AnUnitInfo.Filename);
//debugln(['RemoveUnitsFromProject UnitName=',ShortUnitName]);
if (ShortUnitName<>'') then begin
Dummy:=CodeToolBoss.RemoveUnitFromAllUsesSections(
Project1.MainUnitInfo.Source,ShortUnitName);
if not Dummy then begin
if not CodeToolBoss.RemoveUnitFromAllUsesSections(
Project1.MainUnitInfo.Source,ShortUnitName) then
begin
MainIDE.DoJumpToCodeToolBossError;
exit(mrCancel);
end;
end;
end;
// remove CreateForm statement from project
if (Project1.MainUnitID>=0)
and (pfMainUnitHasCreateFormStatements in Project1.Flags)
and (AnUnitInfo.ComponentName<>'') then begin
Dummy:=Project1.RemoveCreateFormFromProjectFile(
'T'+AnUnitInfo.ComponentName,AnUnitInfo.ComponentName);
if not Dummy then begin
MainIDE.DoJumpToCodeToolBossError;
exit(mrCancel);
end;
end;
if (Project1.MainUnitID>=0) and (AnUnitInfo.ComponentName<>'')
and (pfMainUnitHasCreateFormStatements in Project1.Flags) then
// Do not care if this fails. A user may have removed the line from source.
Project1.RemoveCreateFormFromProjectFile(AnUnitInfo.ComponentName);
end;
if CompareFileExt(AnUnitInfo.Filename,'.inc',false)=0 then
// include file
if FilenameIsAbsolute(AnUnitInfo.Filename) then
ObsoleteIncPaths:=MergeSearchPaths(ObsoleteIncPaths,UnitPath);
end;
if not SomeRemoved then exit; // No units were actually removed.
// removed directories still used for ObsoleteUnitPaths, ObsoleteIncPaths
AnUnitInfo:=Project1.FirstPartOfProject;
@ -7363,7 +7355,8 @@ begin
finally
// all changes were handled automatically by events, just clear the logs
CodeToolBoss.SourceCache.ClearAllSourceLogEntries;
if SomeRemoved then
CodeToolBoss.SourceCache.ClearAllSourceLogEntries;
Project1.EndUpdate;
end;
end;