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

ide: useunitdlg: fix unit filename detection.

Browse Source 
git-svn-id: trunk@52282 -
This commit is contained in:
ondrej 2016-05-04 07:08:21 +00:00
parent 8eb99d9144
commit ae1eb7eab7
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ide/useunitdlg.pas
View File

@ -372,7 +372,7 @@ begin
s := '';
if (ProjFile <> Project1.MainUnitInfo) and (s <> '') then
if not FMainUsedUnits.Find(s, x) then
FProjUnits.Add(s);
FProjUnits.AddObject(s, ProjFile);
ProjFile := ProjFile.NextPartOfProject;
end;
FProjUnits.Sorted := True;
@ -440,15 +440,22 @@ end;
function TUseUnitDialog.SelectedUnitFileName: string;
var
CodeBuf: TCodeBuffer;
AUnit: string;
AObj: TObject;
begin
Result := '';
AUnit := SelectedUnit;
if AUnit='' then
if UnitsListBox.ItemIndex < 0 then
Exit;
CodeBuf := CodeToolBoss.FindUnitSource(SourceEditorManager.ActiveEditor.CodeBuffer, AUnit, '');
if Assigned(CodeBuf) then
Result := CodeBuf.Filename;
AObj := UnitsListBox.Items.Objects[UnitsListBox.ItemIndex];
if AObj is TIdentifierListItem then
begin
CodeBuf := CodeToolBoss.FindUnitSource(SourceEditorManager.ActiveEditor.CodeBuffer, TIdentifierListItem(AObj).Identifier, '');
if Assigned(CodeBuf) then
Result := CodeBuf.Filename;
end else
if AObj is TUnitInfo then
begin
Result := TUnitInfo(AObj).Filename;
end;
end;
function TUseUnitDialog.InterfaceSelected: Boolean;
@ -486,7 +493,7 @@ begin
curUnit := FProjUnits[i];
if not FMainUsedUnits.Find(curUnit, x)
and not FImplUsedUnits.Find(curUnit, x) then
FilterEdit.Items.Add(FProjUnits[i]);
FilterEdit.Items.AddObject(FProjUnits[i], FProjUnits.Objects[i]);
end;
FilterEdit.InvalidateFilter;
end;