IDE: select units/forms/frames: using a special list

git-svn-id: trunk@42320 -

ide/main.pp

@@ -59,7 +59,8 @@ uses
   MemCheck,
 {$ENDIF}
   // fpc packages
-  Math, Classes, SysUtils, Process, AsyncProcess, TypInfo, types, strutils, AVL_Tree,
+  Math, Classes, SysUtils, Process, AsyncProcess, TypInfo, types, strutils,
+  AVL_Tree, contnrs,
   // lazutils
   LazUTF8, Laz2_XMLCfg, AvgLvlTree,
   // lcl
@@ -944,7 +945,7 @@ type
     procedure DoJumpToGuessedMisplacedIFDEF(FindNextUTF8: boolean);
 
     procedure DoGotoIncludeDirective;
-    function SelectProjectItems(ItemList: TStringList;
+    function SelectProjectItems(ItemList: TViewUnitEntries;
                                 ItemType: TIDEProjectItem;
                                 MultiSelect: boolean;
                                 var MultiSelectCheckedState: Boolean): TModalResult;
@@ -5603,7 +5604,7 @@ begin
   Result:=SourceFileMgr.OpenEditorFile(AFileName, PageIndex, WindowIndex, AEditorInfo, Flags);
 end;
 
-function TMainIDE.SelectProjectItems(ItemList: TStringList;
+function TMainIDE.SelectProjectItems(ItemList: TViewUnitEntries;
   ItemType: TIDEProjectItem; MultiSelect: boolean;
   var MultiSelectCheckedState: Boolean): TModalResult;
 var
@@ -5633,9 +5634,8 @@ begin
       begin
         if (ItemType = piComponent) or
            ((ItemType = piFrame) and (CurUnitInfo.ResourceBaseClass = pfcbcFrame)) then
-          ItemList.AddObject(CurUnitInfo.Unit_Name,
+          ItemList.Add(CurUnitInfo.ComponentName,
-            TViewUnitsEntry.Create(CurUnitInfo.ComponentName, CurUnitInfo.Filename,
+                       CurUnitInfo.Filename, i, CurUnitInfo = ActiveUnitInfo);
-                                   i, CurUnitInfo = ActiveUnitInfo));
       end else if FilenameIsAbsolute(CurUnitInfo.Filename)
       and FilenameIsPascalSource(CurUnitInfo.Filename)
       and FileExistsCached(CurUnitInfo.Filename) then begin
@@ -5648,9 +5648,8 @@ begin
           anUnitName:=CurUnitInfo.Unit_Name;
           if anUnitName='' then
             anUnitName:=ExtractFileNameOnly(LFMFilename);
-          ItemList.AddObject(anUnitName,
+          ItemList.Add(LFMComponentName, CurUnitInfo.Filename,
-            TViewUnitsEntry.Create(LFMComponentName, CurUnitInfo.Filename, i,
+            i, CurUnitInfo = ActiveUnitInfo);
-                                   CurUnitInfo = ActiveUnitInfo));
         end;
       end;
     end else
@@ -5659,10 +5658,9 @@ begin
       if (CurUnitInfo.FileName <> '') then
       begin
         AUnitName := ExtractFileName(CurUnitInfo.Filename);
-        if ItemList.IndexOf(AUnitName) = -1 then
+        if ItemList.Find(AUnitName) = nil then
-          ItemList.AddObject(AUnitName,
+          ItemList.Add(AUnitName, CurUnitInfo.Filename,
-            TViewUnitsEntry.Create(AUnitName, CurUnitInfo.Filename,
+                       i, CurUnitInfo = ActiveUnitInfo);
-                                   i, CurUnitInfo = ActiveUnitInfo));
       end
       else
       if Project1.MainUnitID = i then
@@ -5671,11 +5669,10 @@ begin
         if pfMainUnitIsPascalSource in Project1.Flags then
         begin
           AUnitName := ExtractFileName(MainUnitInfo.Filename);
-          if (AUnitName <> '') and (ItemList.IndexOf(AUnitName) = -1) then
+          if (AUnitName <> '') and (ItemList.Find(AUnitName) = nil) then
           begin
-            ItemList.AddObject(AUnitName,
+            ItemList.Add(AUnitName, MainUnitInfo.Filename,
-              TViewUnitsEntry.Create(AUnitName, MainUnitInfo.Filename,
+                         i, MainUnitInfo = ActiveUnitInfo);
-                                     i, MainUnitInfo = ActiveUnitInfo));
           end;
         end;
       end;
@@ -5763,7 +5760,7 @@ var
   S2SItem: PStringToStringTreeItem;
   AnUnitName: String;
   AFilename: String;
-  UnitList: TStringList;
+  UnitList: TViewUnitEntries;
   Entry: TViewUnitsEntry;
 begin
   Result:=mrCancel;
@@ -5773,7 +5770,7 @@ begin
   UnitPath:=CodeToolBoss.GetCompleteSrcPathForDirectory(ExtractFilePath(ActiveUnitInfo.Filename));
   PkgList:=nil;
   UnitToFilename:=TStringToStringTree.Create(false);
-  UnitList:=TStringList.Create;
+  UnitList:=TViewUnitEntries.Create;
   try
     // fetch owner of active unit
     AProject:=nil;
@@ -5822,23 +5819,19 @@ begin
     for S2SItem in UnitToFilename do begin
       AnUnitName:=S2SItem^.Name;
       AFilename:=S2SItem^.Value;
-      UnitList.AddObject(AnUnitName,TViewUnitsEntry.Create(AnUnitName,AFilename,i,false));
+      UnitList.Add(AnUnitName,AFilename,i,false);
       inc(i);
     end;
     // show dialog
     Result := ShowViewUnitsDlg(UnitList, MultiSelect, MultiSelectCheckedState,
                                DlgCaption, ItemType, ActiveUnitInfo.Filename);
-
     // create list of selected files
-    for i:=0 to UnitList.Count-1 do begin
+    for Entry in UnitList do begin
-      Entry:=TViewUnitsEntry(UnitList.Objects[i]);
       if Entry.Selected then
         Files.Add(Entry.Filename);
     end;
 
   finally
-    for i := 0 to UnitList.Count-1 do
-      TViewUnitsEntry(UnitList.Objects[i]).Free;
     UnitList.Free;
     PkgList.Free;
     Owners.Free;
@@ -5883,25 +5876,24 @@ const
   UseItemType: array[Boolean] of TIDEProjectItem = (piUnit, piComponent);
   MultiSelectCheckedState: Array [Boolean] of Boolean = (True,True);
 var
-  UnitList: TStringList;
+  UnitList: TViewUnitEntries;
-  i: integer;
   AForm: TCustomForm;
   AnUnitInfo: TUnitInfo;
+  UEntry: TViewUnitsEntry;
 begin
   if Project1=nil then exit(mrCancel);
-  UnitList := TStringList.Create;
+  UnitList := TViewUnitEntries.Create;
-  UnitList.Sorted := True;
   try
     if SelectProjectItems(UnitList, UseItemType[OnlyForms],
       true, MultiSelectCheckedState[OnlyForms]) = mrOk then
     begin
       { This is where we check what the user selected. }
       AnUnitInfo := nil;
-      for i := 0 to UnitList.Count-1 do
+      for UEntry in UnitList do
       begin
-        if TViewUnitsEntry(UnitList.Objects[i]).Selected then
+        if UEntry.Selected then
         begin
-          AnUnitInfo := Project1.Units[TViewUnitsEntry(UnitList.Objects[i]).ID];
+          AnUnitInfo := Project1.Units[UEntry.ID];
           if AnUnitInfo.OpenEditorInfoCount > 0 then
           begin
             SourceEditorManager.ActiveEditor := TSourceEditor(AnUnitInfo.OpenEditorInfo[0].EditorComponent);
@@ -5925,8 +5917,6 @@ begin
         SourceEditorManager.ShowActiveWindowOnTop(True);
     end;  { if ShowViewUnitDlg... }
   finally
-    for i := 0 to UnitList.Count-1 do
-      TViewUnitsEntry(UnitList.Objects[i]).Free;
     UnitList.Free;
   end;
   Result := mrOk;
@@ -6660,17 +6650,17 @@ end;
 
 function TMainIDE.DoRemoveFromProjectDialog: TModalResult;
 var
-  ViewUnitEntries: TStringList;
+  ViewUnitEntries: TViewUnitEntries;
   i:integer;
   AName: string;
   AnUnitInfo: TUnitInfo;
   UnitInfos: TFPList;
+  UEntry: TViewUnitsEntry;
 const
   MultiSelectCheckedState: Boolean = true;
 Begin
   if Project1=nil then exit(mrCancel);
-  ViewUnitEntries := TStringList.Create;
+  ViewUnitEntries := TViewUnitEntries.Create;
-  ViewUnitEntries.Sorted := True;
   UnitInfos:=nil;
   try
     for i := 0 to Project1.UnitCount-1 do
@@ -6679,8 +6669,7 @@ Begin
       if (AnUnitInfo.IsPartOfProject) and (i<>Project1.MainUnitID) then
       begin
         AName := Project1.RemoveProjectPathFromFilename(AnUnitInfo.FileName);
-        ViewUnitEntries.AddObject(AName,
+        ViewUnitEntries.Add(AName,AnUnitInfo.FileName,i,false);
-                     TViewUnitsEntry.Create(AName,AnUnitInfo.FileName,i,false));
       end;
     end;
     if ShowViewUnitsDlg(ViewUnitEntries, true, MultiSelectCheckedState,
@@ -6688,11 +6677,11 @@ Begin
       exit(mrOk);
     { This is where we check what the user selected. }
     UnitInfos:=TFPList.Create;
-    for i:=0 to ViewUnitEntries.Count-1 do
+    for UEntry in ViewUnitEntries do
     begin
-      if TViewUnitsEntry(ViewUnitEntries.Objects[i]).Selected then
+      if UEntry.Selected then
       begin
-        AnUnitInfo:=Project1.Units[TViewUnitsEntry(ViewUnitEntries.Objects[i]).ID];
+        AnUnitInfo:=Project1.Units[UEntry.ID];
         if AnUnitInfo.IsPartOfProject then
           UnitInfos.Add(AnUnitInfo);
       end;
@@ -6703,8 +6692,6 @@ Begin
       Result:=mrOk;
   finally
     UnitInfos.Free;
-    for i := 0 to ViewUnitEntries.Count-1 do
-      TViewUnitsEntry(ViewUnitEntries.Objects[i]).Free;
     ViewUnitEntries.Free;
   end;
 end;

ide/viewunit_dlg.pp

@@ -40,7 +40,7 @@ interface
 uses
   SysUtils, Classes, Math, Controls, Forms, Dialogs, Buttons, StdCtrls,
   LazarusIdeStrConsts, IDEProcs, CustomFormEditor, LCLType, LCLIntf, LMessages,
-  ExtCtrls, ButtonPanel, Menus, StrUtils, AVL_Tree, ImgList, ComCtrls,
+  ExtCtrls, ButtonPanel, Menus, StrUtils, AVL_Tree, contnrs, ImgList, ComCtrls,
   PackageDefs, IDEWindowIntf, IDEHelpIntf, IDEImagesIntf, ListFilterEdit,
   CodeToolsStructs, CodeToolManager, FileProcs, lazutf8sysutils, LazFileUtils,
   LazLogger;
@@ -63,6 +63,37 @@ type
     constructor Create(const AName, AFilename: string; AnID: integer; ASelected: boolean);
   end;
 
+  { TViewUnitsEntryEnumerator }
+
+  TViewUnitsEntryEnumerator = class
+  private
+    FTree: TAVLTree;
+    FCurrent: TAVLTreeNode;
+    function GetCurrent: TViewUnitsEntry;
+  public
+    constructor Create(Tree: TAVLTree);
+    function MoveNext: boolean;
+    property Current: TViewUnitsEntry read GetCurrent;
+  end;
+
+  { TViewUnitEntries }
+
+  TViewUnitEntries = class
+  private
+    fItems: TStringToPointerTree; // tree of TViewUnitsEntry
+  public
+    constructor Create;
+    destructor Destroy; override;
+    procedure Clear;
+    function Add(AName, AFilename: string; AnID: integer; ASelected: boolean): TViewUnitsEntry;
+    function Find(const aName: string): TViewUnitsEntry; inline;
+    function Count: integer; inline;
+    function GetFiles: TStringList;
+    function GetNames: TStringList;
+    function GetEntries: TFPList;
+    function GetEnumerator: TViewUnitsEntryEnumerator;
+  end;
+
   { TViewUnitDialog }
 
   TViewUnitDialog = class(TForm)
@@ -97,6 +128,7 @@ type
     fSearchDirectories: TFilenameToStringTree; // queued directories to search
     fSearchFiles: TFilenameToStringTree; // queued files to search
     fFoundFiles: TFilenameToStringTree; // filename to caption
+    fEntries: TViewUnitEntries;
     procedure SetIdleConnected(AValue: boolean);
     procedure SetItemType(AValue: TIDEProjectItem);
     procedure SetSortAlphabetically(const AValue: boolean);
@@ -104,28 +136,27 @@ type
     constructor Create(TheOwner: TComponent); override;
     procedure Init(const aCaption: string;
       AllowMultiSelect, EnableMultiSelect: Boolean; aItemType: TIDEProjectItem;
-      Entries: TStringList; aStartFilename: string = '');
+      TheEntries: TViewUnitEntries; aStartFilename: string = '');
     property SortAlphabetically: boolean read FSortAlphabetically write SetSortAlphabetically;
     property ItemType: TIDEProjectItem read FItemType write SetItemType;
     property IdleConnected: boolean read FIdleConnected write SetIdleConnected;
   end;
 
 // Entries is a list of TViewUnitsEntry(s)
-function ShowViewUnitsDlg(Entries: TStringList; AllowMultiSelect: boolean;
+function ShowViewUnitsDlg(Entries: TViewUnitEntries; AllowMultiSelect: boolean;
   var CheckMultiSelect: Boolean; const aCaption: string; ItemType: TIDEProjectItem;
-  StartFilename: string = ''): TModalResult;
+  StartFilename: string = '' // if StartFilename is given the Entries are automatically updated
+  ): TModalResult;
 
 implementation
 
 {$R *.lfm}
 
-function ShowViewUnitsDlg(Entries: TStringList; AllowMultiSelect: boolean;
+function ShowViewUnitsDlg(Entries: TViewUnitEntries; AllowMultiSelect: boolean;
   var CheckMultiSelect: Boolean; const aCaption: string;
   ItemType: TIDEProjectItem; StartFilename: string): TModalResult;
 var
   ViewUnitDialog: TViewUnitDialog;
-  UEntry: TViewUnitsEntry;
-  i: integer;
 begin
   ViewUnitDialog:=TViewUnitDialog.Create(nil);
   try
@@ -134,12 +165,6 @@ begin
     // Show the dialog
     Result:=ViewUnitDialog.ShowModal;
     if Result=mrOk then begin
-      // Return new selections from the dialog
-      ViewUnitDialog.FilterEdit.StoreSelection;
-      for i:=0 to Entries.Count-1 do begin
-        UEntry:=TViewUnitsEntry(Entries.Objects[i]);
-        UEntry.Selected:=ViewUnitDialog.FilterEdit.SelectionList.IndexOf(UEntry.Name)>-1;
-      end;
       CheckMultiSelect := ViewUnitDialog.mniMultiselect.Checked;
     end;
   finally
@@ -147,6 +172,108 @@ begin
   end;
 end;
 
+{ TViewUnitsEntryEnumerator }
+
+function TViewUnitsEntryEnumerator.GetCurrent: TViewUnitsEntry;
+begin
+  Result:=TViewUnitsEntry(PStringToPointerTreeItem(FCurrent.Data)^.Value);
+end;
+
+constructor TViewUnitsEntryEnumerator.Create(Tree: TAVLTree);
+begin
+  FTree:=Tree;
+end;
+
+function TViewUnitsEntryEnumerator.MoveNext: boolean;
+begin
+  if FCurrent=nil then
+    FCurrent:=FTree.FindLowest
+  else
+    FCurrent:=FTree.FindSuccessor(FCurrent);
+  Result:=FCurrent<>nil;
+end;
+
+{ TViewUnitEntries }
+
+// inline
+function TViewUnitEntries.Count: integer;
+begin
+  Result:=fItems.Count;
+end;
+
+// inline
+function TViewUnitEntries.Find(const aName: string): TViewUnitsEntry;
+begin
+  Result:=TViewUnitsEntry(fItems[aName]);
+end;
+
+function TViewUnitEntries.GetFiles: TStringList;
+var
+  S2PItem: PStringToPointerTreeItem;
+begin
+  Result:=TStringList.Create;
+  for S2PItem in fItems do
+    Result.Add(TViewUnitsEntry(S2PItem^.Value).Filename);
+end;
+
+function TViewUnitEntries.GetNames: TStringList;
+var
+  S2PItem: PStringToPointerTreeItem;
+begin
+  Result:=TStringList.Create;
+  for S2PItem in fItems do
+    Result.Add(TViewUnitsEntry(S2PItem^.Value).Name);
+end;
+
+function TViewUnitEntries.GetEntries: TFPList;
+var
+  S2PItem: PStringToPointerTreeItem;
+begin
+  Result:=TFPList.Create;
+  for S2PItem in fItems do
+    Result.Add(TViewUnitsEntry(S2PItem^.Value));
+end;
+
+function TViewUnitEntries.GetEnumerator: TViewUnitsEntryEnumerator;
+begin
+  Result:=TViewUnitsEntryEnumerator.Create(fItems.Tree);
+end;
+
+constructor TViewUnitEntries.Create;
+begin
+  fItems:=TStringToPointerTree.create(false);
+end;
+
+destructor TViewUnitEntries.Destroy;
+begin
+  Clear;
+  inherited Destroy;
+end;
+
+procedure TViewUnitEntries.Clear;
+var
+  S2PItem: PStringToPointerTreeItem;
+begin
+  for S2PItem in fItems do
+    TViewUnitsEntry(S2PItem^.Value).Free;
+  fItems.Clear;
+end;
+
+function TViewUnitEntries.Add(AName, AFilename: string; AnID: integer;
+  ASelected: boolean): TViewUnitsEntry;
+var
+  i: Integer;
+begin
+  if Find(AName)<>nil then begin
+    i:=2;
+    while Find(AName+'('+IntToStr(i)+')')<>nil do
+      inc(i);
+    AName:=AName+'('+IntToStr(i)+')';
+  end;
+  Result:=TViewUnitsEntry.Create(AName,AFilename,AnID,ASelected);
+  fItems[AName]:=Result;
+end;
+
 { TViewUnitsEntry }
 
 constructor TViewUnitsEntry.Create(const AName, AFilename: string;
@@ -168,10 +295,9 @@ begin
 end;
 
 procedure TViewUnitDialog.Init(const aCaption: string; AllowMultiSelect,
-  EnableMultiSelect: Boolean; aItemType: TIDEProjectItem; Entries: TStringList;
+  EnableMultiSelect: Boolean; aItemType: TIDEProjectItem;
-  aStartFilename: string);
+  TheEntries: TViewUnitEntries; aStartFilename: string);
 var
-  i: Integer;
   UEntry: TViewUnitsEntry;
   SearchPath: String;
   p: Integer;
@@ -179,21 +305,18 @@ var
 begin
   Caption:=aCaption;
   ItemType:=aItemType;
+  fEntries:=TheEntries;
   mniMultiselect.Enabled := AllowMultiSelect;
   mniMultiselect.Checked := EnableMultiSelect;
   ListBox.MultiSelect := mniMultiselect.Enabled;
   // Data items
-  for i:=0 to Entries.Count-1 do begin
+  for UEntry in fEntries do
-    UEntry:=TViewUnitsEntry(Entries.Objects[i]);
     FilterEdit.Items.Add(UEntry.Name);
-  end;
   FilterEdit.InvalidateFilter;
   // Initial selection
-  for i:=0 to Entries.Count-1 do begin
+  for UEntry in fEntries do
-    UEntry:=TViewUnitsEntry(Entries.Objects[i]);
     if UEntry.Selected then
       FilterEdit.SelectionList.Add(UEntry.Name);
-  end;
 
   if aStartFilename<>'' then begin
     // init search for units
@@ -333,8 +456,16 @@ begin
 end;
 
 procedure TViewUnitDialog.OKButtonClick(Sender: TObject);
+var
+  S2PItem: PStringToPointerTreeItem;
+  Entry: TViewUnitsEntry;
 Begin
   IDEDialogLayoutList.SaveLayout(Self);
+  FilterEdit.StoreSelection;
+  for S2PItem in fEntries.fItems do begin
+    Entry:=TViewUnitsEntry(S2PItem^.Value);
+    Entry.Selected:=FilterEdit.SelectionList.IndexOf(Entry.Name)>-1;
+  end;
   ModalResult := mrOK;
 End;