paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-16 23:49:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

IDE: Prevent Use Unit dialog from crashing when applied on a non-pascal file.

Browse Source 
git-svn-id: trunk@34101 -
This commit is contained in:
juha 2011-12-11 15:12:08 +00:00
parent 327e84b060
commit d757beaf6d
2 changed files with 25 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ide/lazarusidestrconsts.pas
View File

@ -5269,8 +5269,7 @@ resourcestring
dlgInsertSection = 'Insert into Uses section of';
dlgInsertInterface = 'Interface';
dlgInsertImplementation = 'Implementation';
lisInsteadOfCompilePackageCreateASimpleMakefile = 'Instead of compile '
+'package create a simple Makefile.';
dlgNoAvailableUnits = 'No available units to add.';
// Custom form editor
lisCFEAnExceptionOccuredDuringDeletionOf = 'An exception occured during '

58
ide/useunitdlg.pas
View File

@ -93,19 +93,22 @@ begin
UseUnitDlg.GetProjUnits(SrcEdit);
UseUnitDlg.FillAvailableUnitsList;
// there is only main uses section in program/library/package
if SrcEdit.GetProjectFile=Project1.MainUnitInfo then begin
if SrcEdit.GetProjectFile=Project1.MainUnitInfo then
// only main (interface) section is available
UseUnitDlg.SectionRadioGroup.Enabled := False
end else begin
else
// automatic choice of dest uses-section by cursor position
UseUnitDlg.DetermineUsesSection(SrcEdit.CodeBuffer, SrcEdit.GetCursorTextXY);
end;
if UseUnitDlg.FilterEdit.Data.Count = 0 then
begin
// no available units from current project => turn on "all units"
UseUnitDlg.AllUnitsCheckBox.Checked := True;
if UseUnitDlg.FilterEdit.Data.Count = 0 then begin
// No available units. This may not be a pascal source file.
ShowMessage(dlgNoAvailableUnits);
Exit(mrCancel);
end;
if UseUnitDlg.FilterEdit.Data.Count = 0 then Exit(mrCancel);
// Show the dialog.
if UseUnitDlg.ShowModal=mrOk then begin
@ -164,10 +167,9 @@ begin
if InterfaceSelected then
AddImplUsedUnits
else
with FilterEdit.Data do
for i := Count - 1 downto 0 do
if Objects[i] is TCodeTreeNode then
Delete(i);
for i := FilterEdit.Data.Count - 1 downto 0 do
if FilterEdit.Data.Objects[i] is TCodeTreeNode then
FilterEdit.Data.Delete(i);
FilterEdit.InvalidateFilter;
if Visible then
FilterEdit.SetFocus;
@ -177,21 +179,16 @@ procedure TUseUnitDialog.AllUnitsCheckBoxChange(Sender: TObject);
var
i: Integer;
begin
if not (Assigned(FMainUsedUnits) and Assigned(FImplUsedUnits)
and Assigned(FOtherUnits)) then Exit;
if AllUnitsCheckBox.Checked then begin // Add other units
CreateOtherUnitsList;
FilterEdit.Data.AddStrings(FOtherUnits);
end
else
with FilterEdit.Data do begin // Remove other units
BeginUpdate;
try
for i := Count-1 downto 0 do
if Objects[i] is TIdentifierListItem then
Delete(i);
finally
EndUpdate;
end;
end;
for i := FilterEdit.Data.Count-1 downto 0 do
if FilterEdit.Data.Objects[i] is TIdentifierListItem then
FilterEdit.Data.Delete(i);
if Visible then
FilterEdit.SetFocus;
FilterEdit.InvalidateFilter;
@ -320,6 +317,7 @@ var
SrcEdit: TSourceEditor;
begin
if Assigned(FOtherUnits) then Exit;
if not (Assigned(FMainUsedUnits) and Assigned(FImplUsedUnits)) then Exit;
Screen.Cursor:=crHourGlass;
try
FOtherUnits := TStringList.Create;
@ -328,7 +326,6 @@ begin
if GatherUnitNames(SrcEdit.CodeBuffer) then
begin
IdentifierList.Prefix := '';
Assert(Assigned(FMainUsedUnits) and Assigned(FImplUsedUnits));
for i := 0 to IdentifierList.GetFilteredCount - 1 do
begin
curUnit := IdentifierList.FilteredItems[i].Identifier;
@ -414,22 +411,15 @@ var
curUnit: String;
i: Integer;
begin
if not (Assigned(FMainUsedUnits) and Assigned(FImplUsedUnits)) then Exit;
if not Assigned(FProjUnits) then Exit;
with FilterEdit.Data do
FilterEdit.Data.Clear;
for i := 0 to FProjUnits.Count - 1 do
begin
BeginUpdate;
try
Clear;
for i := 0 to FProjUnits.Count - 1 do
begin
curUnit := FProjUnits[i];
if (FMainUsedUnits.IndexOf(curUnit) < 0)
and (FImplUsedUnits.IndexOf(curUnit) < 0) then
Add(FProjUnits[i]);
end;
finally
EndUpdate;
end;
curUnit := FProjUnits[i];
if (FMainUsedUnits.IndexOf(curUnit) < 0)
and (FImplUsedUnits.IndexOf(curUnit) < 0) then
FilterEdit.Data.Add(FProjUnits[i]);
end;
FilterEdit.InvalidateFilter;
end;