cody: started contains

git-svn-id: trunk@34226 -
2025-05-30 20:22:37 +02:00 · 2011-12-16 18:56:28 +00:00 · 2011-12-16 18:56:28 +00:00 · 9bf66b8e04
commit 9bf66b8e04
parent 385f41f533
2 changed files with 155 additions and 76 deletions
--- a/components/codetools/ide/codyidentifiersdlg.lfm
+++ b/components/codetools/ide/codyidentifiersdlg.lfm
@ -13,8 +13,8 @@ object CodyIdentifiersDlg: TCodyIdentifiersDlg
  LCLVersion = '0.9.31'
  object ButtonPanel1: TButtonPanel
    Left = 6
-    Height = 42
-    Top = 276
+    Height = 40
+    Top = 278
    Width = 540
    OKButton.Name = 'OKButton'
    OKButton.DefaultCaption = True
@ -29,9 +29,9 @@ object CodyIdentifiersDlg: TCodyIdentifiersDlg
  end
  object InfoLabel: TLabel
    Left = 8
-    Height = 17
+    Height = 18
    Top = 8
-    Width = 59
+    Width = 61
    Caption = 'InfoLabel'
    ParentColor = False
    WordWrap = True
@ -40,16 +40,14 @@ object CodyIdentifiersDlg: TCodyIdentifiersDlg
    AnchorSideLeft.Control = Owner
    AnchorSideTop.Control = HideOtherProjectsCheckBox
    AnchorSideTop.Side = asrBottom
-    AnchorSideRight.Control = Owner
-    AnchorSideRight.Side = asrBottom
+    AnchorSideRight.Control = StartsSpeedButton
    Left = 6
-    Height = 26
-    Top = 63
-    Width = 540
+    Height = 27
+    Top = 64
+    Width = 466
    Anchors = [akTop, akLeft, akRight]
    BorderSpacing.Left = 6
    BorderSpacing.Top = 10
-    BorderSpacing.Right = 6
    OnChange = FilterEditChange
    OnExit = FilterEditExit
    OnKeyDown = FilterEditKeyDown
@ -64,8 +62,8 @@ object CodyIdentifiersDlg: TCodyIdentifiersDlg
    AnchorSideRight.Side = asrBottom
    AnchorSideBottom.Control = UnitLabel
    Left = 6
-    Height = 120
-    Top = 89
+    Height = 118
+    Top = 91
    Width = 540
    Anchors = [akTop, akLeft, akRight, akBottom]
    BorderSpacing.Left = 6
@ -82,9 +80,9 @@ object CodyIdentifiersDlg: TCodyIdentifiersDlg
    AnchorSideLeft.Control = InfoLabel
    AnchorSideBottom.Control = PackageLabel
    Left = 8
-    Height = 17
+    Height = 18
    Top = 210
-    Width = 59
+    Width = 63
    Anchors = [akLeft, akBottom]
    BorderSpacing.Bottom = 1
    Caption = 'UnitLabel'
@ -94,9 +92,9 @@ object CodyIdentifiersDlg: TCodyIdentifiersDlg
    AnchorSideLeft.Control = InfoLabel
    AnchorSideBottom.Control = AddToImplementationUsesCheckBox
    Left = 8
-    Height = 17
-    Top = 228
-    Width = 84
+    Height = 18
+    Top = 229
+    Width = 90
    Anchors = [akLeft, akBottom]
    BorderSpacing.Bottom = 1
    Caption = 'PackageLabel'
@ -108,8 +106,8 @@ object CodyIdentifiersDlg: TCodyIdentifiersDlg
    AnchorSideTop.Side = asrBottom
    Left = 8
    Height = 22
-    Top = 31
-    Width = 193
+    Top = 32
+    Width = 207
    BorderSpacing.Top = 6
    Caption = 'HideOtherProjectsCheckBox'
    OnChange = HideOtherProjectsCheckBoxChange
@ -120,8 +118,8 @@ object CodyIdentifiersDlg: TCodyIdentifiersDlg
    AnchorSideBottom.Control = ButtonPanel1
    Left = 8
    Height = 22
-    Top = 248
-    Width = 246
+    Top = 250
+    Width = 264
    Anchors = [akLeft, akBottom]
    BorderSpacing.Top = 3
    BorderSpacing.Bottom = 3
@ -130,4 +128,41 @@ object CodyIdentifiersDlg: TCodyIdentifiersDlg
    ShowHint = True
    TabOrder = 4
  end
+  object StartsSpeedButton: TSpeedButton
+    AnchorSideTop.Control = FilterEdit
+    AnchorSideRight.Control = ContainsSpeedButton
+    AnchorSideBottom.Control = FilterEdit
+    AnchorSideBottom.Side = asrBottom
+    Left = 472
+    Height = 27
+    Top = 64
+    Width = 51
+    Anchors = [akTop, akRight, akBottom]
+    AutoSize = True
+    Caption = 'Starts with'
+    GroupIndex = 1
+    NumGlyphs = 0
+    OnClick = StartsSpeedButtonClick
+    ShowHint = True
+    ParentShowHint = False
+  end
+  object ContainsSpeedButton: TSpeedButton
+    AnchorSideTop.Control = FilterEdit
+    AnchorSideRight.Control = Owner
+    AnchorSideRight.Side = asrBottom
+    AnchorSideBottom.Control = FilterEdit
+    AnchorSideBottom.Side = asrBottom
+    Left = 523
+    Height = 27
+    Top = 64
+    Width = 23
+    Anchors = [akTop, akRight, akBottom]
+    AutoSize = True
+    BorderSpacing.Right = 6
+    Caption = 'Contains'
+    GroupIndex = 1
+    NumGlyphs = 0
+    ShowHint = True
+    ParentShowHint = False
+  end
 end
--- a/components/codetools/ide/codyidentifiersdlg.pas
+++ b/components/codetools/ide/codyidentifiersdlg.pas
@ -27,7 +27,8 @@
  ToDo:
    -quickfix for identifier not found
    -use identifier: check package version
-    -check for unit conflict
+    -check for conflict: other unit with same name already in search path
+    -check for conflict: other identifier in scope, use unitname.identifier
    -gzip? lot of cpu, may be faster on first load
 }
 unit CodyIdentifiersDlg;
@ -110,16 +111,23 @@ type
    cidaJumpToIdentifier
    );

+  TCodyIdentifierFilter = (
+    cifStartsWith,
+    cifContains
+    );
+
  { TCodyIdentifiersDlg }

  TCodyIdentifiersDlg = class(TForm)
    AddToImplementationUsesCheckBox: TCheckBox;
    ButtonPanel1: TButtonPanel;
+    ContainsSpeedButton: TSpeedButton;
    FilterEdit: TEdit;
    HideOtherProjectsCheckBox: TCheckBox;
    InfoLabel: TLabel;
    ItemsListBox: TListBox;
    PackageLabel: TLabel;
+    StartsSpeedButton: TSpeedButton;
    UnitLabel: TLabel;
    procedure ButtonPanel1OKButtonClick(Sender: TObject);
    procedure FilterEditChange(Sender: TObject);
@ -133,6 +141,7 @@ type
    procedure ItemsListBoxClick(Sender: TObject);
    procedure ItemsListBoxSelectionChange(Sender: TObject; {%H-}User: boolean);
    procedure OnIdle(Sender: TObject; var {%H-}Done: Boolean);
+    procedure StartsSpeedButtonClick(Sender: TObject);
  private
    FDlgAction: TCodyIdentifierDlgAction;
    FJumpButton: TBitBtn;
@ -142,6 +151,7 @@ type
    FMaxItems: integer;
    FNoFilterText: string;
    FItems: TStringList;
+    FLastFilterType: TCodyIdentifierFilter;
    procedure SetDlgAction(NewAction: TCodyIdentifierDlgAction);
    procedure SetIdleConnected(AValue: boolean);
    procedure SetMaxItems(AValue: integer);
@ -185,6 +195,7 @@ type
    property MaxItems: integer read FMaxItems write SetMaxItems;
    function OwnerToString(AnOwner: TObject): string;
    property DlgAction: TCodyIdentifierDlgAction read FDlgAction;
+    function GetFilterType: TCodyIdentifierFilter;
  end;

 var
@ -667,6 +678,13 @@ begin
  FJumpButton.Name:='JumpButton';
  FJumpButton.OnClick:=@JumpButtonClick;
  FJumpButton.Caption:= crsJumpTo;
+
+  StartsSpeedButton.Down:=true;
+  StartsSpeedButton.Caption:='Starts';
+  StartsSpeedButton.Hint:='Show only identifiers starting with filter text';
+  ContainsSpeedButton.Down:=false;
+  ContainsSpeedButton.Caption:='Contains';
+  ContainsSpeedButton.Hint:='Show only identifiers containing filter text';
 end;

 procedure TCodyIdentifiersDlg.HideOtherProjectsCheckBoxChange(Sender: TObject);
@ -695,11 +713,17 @@ begin
    UpdateGeneralInfo;
  end;
  if (FLastFilter<>GetFilterEditText)
-  or (FLastHideOtherProjects<>HideOtherProjectsCheckBox.Checked) then
+  or (FLastHideOtherProjects<>HideOtherProjectsCheckBox.Checked)
+  or (FLastFilterType<>GetFilterType) then
    UpdateItemsList;
  IdleConnected:=false;
 end;

+procedure TCodyIdentifiersDlg.StartsSpeedButtonClick(Sender: TObject);
+begin
+  UpdateItemsList;
+end;
+
 procedure TCodyIdentifiersDlg.SetIdleConnected(AValue: boolean);
 begin
  if FIdleConnected=AValue then Exit;
@ -748,61 +772,73 @@ var
    Node: TAVLTreeNode;
  begin
    Node:=CodyUnitDictionary.Identifiers.FindLowest;
-    //debugln(['TCodyIdentifiersDlg.UpdateItemsList Filter="',Filter,'"']);
+    debugln(['TCodyIdentifiersDlg.UpdateItemsList Filter="',FLastFilter,'" Count=',CodyUnitDictionary.Identifiers.Count]);
    while Node<>nil do begin
      Item:=TUDIdentifier(Node.Data);
-      if ComparePrefixIdent(FilterP,PChar(Pointer(Item.Name)))
-      and (AddExactMatches=(CompareIdentifiers(FilterP,PChar(Pointer(Item.Name)))=0))
-      then begin
-        if Found>MaxItems then begin
-          inc(Found); // only count, do not check
-        end else begin
-          GroupNode:=Item.DUnit.Groups.FindLowest;
-          while GroupNode<>nil do begin
-            Group:=TUDUnitGroup(GroupNode.Data);
-            GroupNode:=Item.DUnit.Groups.FindSuccessor(GroupNode);
-            if not FilenameIsAbsolute(Item.DUnit.Filename) then continue;
-            if Group.Name='' then begin
-              // it's a unit without package
-              if FLastHideOtherProjects then begin
-                // check if unit is in unit path of current owner
-                if CurUnitPath='' then continue;
-                if FindPathInSearchPath(PChar(CurUnitPath),length(CurUnitPath),
-                    PChar(CurUnitPath),length(CurUnitPath))=nil
-                then continue;
-              end;
-            end else if Group.Name=PackageNameFPCSrcDir then begin
-              // it's a FPC source directory
-              // => check if it is the current one
-              Dir:=ChompPathDelim(ExtractFilePath(Group.Filename));
-              if CompareFilenames(Dir,FPCSrcDir)<>0 then continue;
-              FPCSrcFilename:=UnitSet.GetUnitSrcFile(Item.DUnit.Name);
-              if (FPCSrcFilename<>'')
-              and (CompareFilenames(FPCSrcFilename,Item.DUnit.Filename)<>0)
-              then continue; // this is not the source for this target platform
-            end else if FileExistsCached(Group.Filename) then begin
-              // lpk exists
-            end else begin
-              // lpk does not exist any more
-              CodyUnitDictionary.CheckFileAsync(Group.Filename);
-            end;
-            s:=Item.Name+' in '+Item.DUnit.Name;
-            if Group.Name<>'' then
-              s:=s+' of '+Group.Name;
-            if FileExistsCached(Item.DUnit.Filename) then begin
-              inc(Found);
-              if Found<MaxItems then begin
-                FItems.Add(Item.Name+#10+Item.DUnit.Filename+#10+Group.Name+#10+Group.Filename);
-                sl.Add(s);
-              end;
-            end else begin
-              // unit does not exist any more
-              CodyUnitDictionary.CheckFileAsync(Item.DUnit.Filename);
-            end;
-          end;
+      Node:=CodyUnitDictionary.Identifiers.FindSuccessor(Node);
+      debugln(['AddItems checking ',Item.Name]);
+      if CompareIdentifiers(FilterP,PChar(Pointer(Item.Name)))=0 then begin
+        // exact match
+        if not AddExactMatches then continue;
+      end else begin
+        // not exact
+        if AddExactMatches then continue;
+        debugln(['AddItems ',ord(FLastFilterType),' ',Item.Name]);
+        case FLastFilterType of
+        cifStartsWith:
+          if not ComparePrefixIdent(FilterP,PChar(Pointer(Item.Name))) then continue;
+        cifContains:
+          if System.Pos(FLastFilter,Item.Name)<1 then continue;
+        end;
+      end;
+      debugln(['AddItems name FITS ',ord(FLastFilterType),' ',Item.Name]);
+      if Found>MaxItems then begin
+        inc(Found); // only count, do not check
+        continue;
+      end;
+      GroupNode:=Item.DUnit.Groups.FindLowest;
+      while GroupNode<>nil do begin
+        Group:=TUDUnitGroup(GroupNode.Data);
+        GroupNode:=Item.DUnit.Groups.FindSuccessor(GroupNode);
+        if not FilenameIsAbsolute(Item.DUnit.Filename) then continue;
+        if Group.Name='' then begin
+          // it's a unit without package
+          if FLastHideOtherProjects then begin
+            // check if unit is in unit path of current owner
+            if CurUnitPath='' then continue;
+            if FindPathInSearchPath(PChar(CurUnitPath),length(CurUnitPath),
+                PChar(CurUnitPath),length(CurUnitPath))=nil
+            then continue;
+          end;
+        end else if Group.Name=PackageNameFPCSrcDir then begin
+          // it's a FPC source directory
+          // => check if it is the current one
+          Dir:=ChompPathDelim(ExtractFilePath(Group.Filename));
+          if CompareFilenames(Dir,FPCSrcDir)<>0 then continue;
+          FPCSrcFilename:=UnitSet.GetUnitSrcFile(Item.DUnit.Name);
+          if (FPCSrcFilename<>'')
+          and (CompareFilenames(FPCSrcFilename,Item.DUnit.Filename)<>0)
+          then continue; // this is not the source for this target platform
+        end else if FileExistsCached(Group.Filename) then begin
+          // lpk exists
+        end else begin
+          // lpk does not exist any more
+          CodyUnitDictionary.CheckFileAsync(Group.Filename);
+        end;
+        s:=Item.Name+' in '+Item.DUnit.Name;
+        if Group.Name<>'' then
+          s:=s+' of '+Group.Name;
+        if FileExistsCached(Item.DUnit.Filename) then begin
+          inc(Found);
+          if Found<MaxItems then begin
+            FItems.Add(Item.Name+#10+Item.DUnit.Filename+#10+Group.Name+#10+Group.Filename);
+            sl.Add(s);
+          end;
+        end else begin
+          // unit does not exist any more
+          CodyUnitDictionary.CheckFileAsync(Item.DUnit.Filename);
        end;
      end;
-      Node:=CodyUnitDictionary.Identifiers.FindSuccessor(Node);
    end;
  end;

@ -811,6 +847,7 @@ begin
  FilterP:=PChar(FLastFilter);

  FLastHideOtherProjects:=HideOtherProjectsCheckBox.Checked;
+  FLastFilterType:=GetFilterType;

  FItems.Clear;
  sl:=TStringList.Create;
@ -818,9 +855,8 @@ begin
    Found:=0;
    UnitSet:=CodeToolBoss.GetUnitSetForDirectory('');
    FPCSrcDir:='';
-    if (UnitSet<>nil) then begin
+    if (UnitSet<>nil) then
      FPCSrcDir:=ChompPathDelim(UnitSet.FPCSourceDirectory);
-    end;
    AddItems(true);
    AddItems(false);
    if Found>sl.Count then
@ -1243,6 +1279,14 @@ begin
    Result:=TIDEPackage(AnOwner).Name;
 end;

+function TCodyIdentifiersDlg.GetFilterType: TCodyIdentifierFilter;
+begin
+  if ContainsSpeedButton.Down then
+    exit(cifContains)
+  else
+    exit(cifStartsWith);
+end;
+
 procedure TCodyIdentifiersDlg.UpdateCurOwnerOfUnit;

  procedure GetBest(OwnerList: TFPList);