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

* Allow lettern matching

Browse Source
This commit is contained in:
Michaël Van Canneyt 2024-09-26 23:21:48 +02:00
parent fd95ef0ad7
commit 623f913154
5 changed files with 96 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
components/filebrowser/ctrlfilebrowser.pas
View File

@ -9,9 +9,12 @@ uses
LazIDEIntf, MenuIntf, IDECommands, ProjectIntf, IDEOptEditorIntf, IDEWindowIntf, BaseIDEIntf; LazIDEIntf, MenuIntf, IDECommands, ProjectIntf, IDEOptEditorIntf, IDEWindowIntf, BaseIDEIntf;
Type Type
TFileSearchOption = (fsoMatchOnlyFileName,fsoAbsolutePaths); TFileSearchOption = (fsoMatchOnlyFileName,fsoAbsolutePaths,fsoUseLetters);
TFileSearchOptions = Set of TFileSearchOption; TFileSearchOptions = Set of TFileSearchOption;
TFilenameMatchOption = (fmoFileNameOnly,fmoLetters);
TFilenameMatchOptions = set of TFilenameMatchOption;
{ TFileBrowserController } { TFileBrowserController }
TFileBrowserController = class(TComponent) TFileBrowserController = class(TComponent)
private private
@ -68,7 +71,7 @@ Type
procedure WriteConfig; virtual; procedure WriteConfig; virtual;
procedure ReadConfig; virtual; procedure ReadConfig; virtual;
procedure IndexRootDir; procedure IndexRootDir;
function FindFiles(aPattern: String; aList: TStrings; aMatchOnlyFileName: boolean; aMask : TMaskList): Integer; function FindFiles(aPattern: String; aOutFileList: TStrings; aMatchOptions : TFilenameMatchOptions; aExtMask : TMaskList): Integer;
procedure Notification(AComponent: TComponent; Operation: TOperation); override; procedure Notification(AComponent: TComponent; Operation: TOperation); override;
Property Root : TFileSystemEntry Read FRoot; Property Root : TFileSystemEntry Read FRoot;
property StartDir: TStartDir read FStartDir write SetStartDir; property StartDir: TStartDir read FStartDir write SetStartDir;
@ -176,6 +179,8 @@ begin
Include(Opts,fsoMatchOnlyFileName); Include(Opts,fsoMatchOnlyFileName);
if GetValue(KeySearchAbsoluteFilenames,False) then if GetValue(KeySearchAbsoluteFilenames,False) then
Include(Opts,fsoAbsolutePaths); Include(Opts,fsoAbsolutePaths);
if GetValue(KeySearchLetters,False) then
Include(Opts,fsoUseLetters);
SearchOptions:=Opts; SearchOptions:=Opts;
finally finally
Free; Free;
@ -272,6 +277,7 @@ begin
SetDeleteValue(KeySyncCurrentEditor,FSyncCurrentEditor, DefaultSyncCurrentEditor); SetDeleteValue(KeySyncCurrentEditor,FSyncCurrentEditor, DefaultSyncCurrentEditor);
SetDeleteValue(KeySearchMatchOnlyFilename,fsoMatchOnlyFileName in SearchOptions,False); SetDeleteValue(KeySearchMatchOnlyFilename,fsoMatchOnlyFileName in SearchOptions,False);
SetDeleteValue(KeySearchAbsoluteFilenames,fsoAbsolutePaths in SearchOptions,False); SetDeleteValue(KeySearchAbsoluteFilenames,fsoAbsolutePaths in SearchOptions,False);
SetDeleteValue(KeySearchLetters,fsoUseLetters in SearchOptions,False);
FNeedSave := False; FNeedSave := False;
finally finally
Free; Free;
@ -297,28 +303,57 @@ begin
AddIDEMessage(mluVerbose,Format(SSearchingFiles,[lDir]),'',0,0,SViewFilebrowser); AddIDEMessage(mluVerbose,Format(SSearchingFiles,[lDir]),'',0,0,SViewFilebrowser);
end; end;
function TFileBrowserController.FindFiles(aPattern: String; aList: TStrings; aMatchOnlyFileName: boolean; aMask: TMaskList function TFileBrowserController.FindFiles(aPattern: String; aOutFileList: TStrings;
): Integer; aMatchOptions : TFilenameMatchOptions; aExtMask: TMaskList): Integer;
function MatchesPattern(const aName: string; aStartPos: Integer; const aPtrn: string): Boolean;
var
lPtrnLen,lNameLen,lPtrnPos, lNamePos: Integer;
begin
lPtrnPos := 1;
lPtrnLen := Length(aPtrn);
lNameLen := Length(aName);
lNamePos := aStartPos;
while (lPtrnPos <= lPtrnLen) and (lNamePos <= lNameLen) do
begin
if aName[lNamePos] = aPtrn[lPtrnPos] then
Inc(lPtrnPos);
Inc(lNamePos);
end;
Result := (lPtrnPos > lPtrnLen);
end;
var var
s,ptrn : String; lPtrn, lFilename : String;
i,ps : integer; lStartPos,lFileIdx: Integer;
isMatch : Boolean;
begin begin
Result:=0; Result:=0;
if (FFileList=Nil) or (Length(aPattern)<2) then exit; if (FFileList=Nil) or (Length(aPattern)<2) then exit;
ptrn:=LowerCase(aPattern);
For I:=0 to FFileList.Count-1 do lPtrn := Lowercase(aPattern);
begin
S:=FFileList[i]; For lFileIdx:=0 to FFileList.Count-1 do
if aMatchOnlyFileName then begin
ps:=rpos(PathDelim,S) lFilename := Lowercase(FFileList[lFileIdx]);
if fmoFileNameOnly in aMatchOptions then
lStartPos:=rpos(PathDelim,lFileName)+1
else else
ps:=1; lStartPos:=1;
if (Pos(ptrn,LowerCase(S),Ps)>0) then
if (aMask=Nil) or (aMask.Matches(ExtractFileName(S))) then if (aExtMask=Nil) or (aExtMask.Matches(lFilename)) then
aList.AddObject(S,FFileList.Objects[i]); begin
if fmoLetters in aMatchOptions then
isMatch:=MatchesPattern(lFilename, lStartPos, lPtrn)
else
IsMatch:=(Pos(lPtrn,lFileName,lStartPos)>0);
if IsMatch then
aOutFileList.AddObject(FFileList[lFileIdx], FFileList.Objects[lFileIdx]);
end; end;
end;
end; end;
procedure TFileBrowserController.ConfigWindow(AForm: TFileBrowserForm); procedure TFileBrowserController.ConfigWindow(AForm: TFileBrowserForm);

1
components/filebrowser/filebrowsertypes.pas
View File

@ -127,6 +127,7 @@ const
KeySyncCurrentEditor = 'SyncCurrentEditor'; KeySyncCurrentEditor = 'SyncCurrentEditor';
KeySearchMatchOnlyFilename = 'MatchOnlyFileNames'; KeySearchMatchOnlyFilename = 'MatchOnlyFileNames';
KeySearchAbsoluteFilenames = 'AbsoluteFileNames'; KeySearchAbsoluteFilenames = 'AbsoluteFileNames';
KeySearchLetters = 'SearchLetters';
SViewFilebrowser = 'File browser'; SViewFilebrowser = 'File browser';

50
components/filebrowser/fraconfigfilebrowser.lfm
View File

@ -1,9 +1,9 @@
object FileBrowserOptionsFrame: TFileBrowserOptionsFrame object FileBrowserOptionsFrame: TFileBrowserOptionsFrame
Left = 0 Left = 0
Height = 582 Height = 618
Top = 0 Top = 0
Width = 803 Width = 803
ClientHeight = 582 ClientHeight = 618
ClientWidth = 803 ClientWidth = 803
TabOrder = 0 TabOrder = 0
DesignLeft = 616 DesignLeft = 616
@ -15,12 +15,12 @@ object FileBrowserOptionsFrame: TFileBrowserOptionsFrame
Width = 803 Width = 803
Align = alTop Align = alTop
Caption = 'Root directory' Caption = 'Root directory'
ClientHeight = 174 ClientHeight = 173
ClientWidth = 801 ClientWidth = 801
TabOrder = 0 TabOrder = 0
object DERootDir: TDirectoryEdit object DERootDir: TDirectoryEdit
Left = 38 Left = 38
Height = 28 Height = 34
Top = 128 Top = 128
Width = 754 Width = 754
ShowHidden = False ShowHidden = False
@ -34,7 +34,7 @@ object FileBrowserOptionsFrame: TFileBrowserOptionsFrame
Left = 16 Left = 16
Height = 23 Height = 23
Top = 96 Top = 96
Width = 175 Width = 191
Caption = 'Always use this directory' Caption = 'Always use this directory'
TabOrder = 1 TabOrder = 1
end end
@ -42,7 +42,7 @@ object FileBrowserOptionsFrame: TFileBrowserOptionsFrame
Left = 14 Left = 14
Height = 23 Height = 23
Top = 36 Top = 36
Width = 118 Width = 131
Caption = 'Filesystem root' Caption = 'Filesystem root'
TabOrder = 2 TabOrder = 2
end end
@ -50,7 +50,7 @@ object FileBrowserOptionsFrame: TFileBrowserOptionsFrame
Left = 14 Left = 14
Height = 23 Height = 23
Top = 9 Top = 9
Width = 197 Width = 220
Caption = 'Use current project directory' Caption = 'Use current project directory'
Checked = True Checked = True
TabOrder = 3 TabOrder = 3
@ -60,7 +60,7 @@ object FileBrowserOptionsFrame: TFileBrowserOptionsFrame
Left = 14 Left = 14
Height = 23 Height = 23
Top = 64 Top = 64
Width = 110 Width = 122
Caption = 'User directory' Caption = 'User directory'
TabOrder = 4 TabOrder = 4
end end
@ -72,12 +72,12 @@ object FileBrowserOptionsFrame: TFileBrowserOptionsFrame
Width = 803 Width = 803
Align = alTop Align = alTop
Caption = 'Initial directory' Caption = 'Initial directory'
ClientHeight = 135 ClientHeight = 134
ClientWidth = 801 ClientWidth = 801
TabOrder = 1 TabOrder = 1
object DEStartDir: TDirectoryEdit object DEStartDir: TDirectoryEdit
Left = 38 Left = 38
Height = 28 Height = 34
Top = 89 Top = 89
Width = 752 Width = 752
ShowHidden = False ShowHidden = False
@ -91,7 +91,7 @@ object FileBrowserOptionsFrame: TFileBrowserOptionsFrame
Left = 14 Left = 14
Height = 23 Height = 23
Top = 65 Top = 65
Width = 175 Width = 191
Caption = 'Always use this directory' Caption = 'Always use this directory'
TabOrder = 1 TabOrder = 1
end end
@ -99,7 +99,7 @@ object FileBrowserOptionsFrame: TFileBrowserOptionsFrame
Left = 14 Left = 14
Height = 23 Height = 23
Top = 36 Top = 36
Width = 179 Width = 198
Caption = 'Use last opened directory' Caption = 'Use last opened directory'
TabOrder = 2 TabOrder = 2
end end
@ -107,7 +107,7 @@ object FileBrowserOptionsFrame: TFileBrowserOptionsFrame
Left = 14 Left = 14
Height = 23 Height = 23
Top = 8 Top = 8
Width = 197 Width = 220
Caption = 'Use current project directory' Caption = 'Use current project directory'
Checked = True Checked = True
TabOrder = 3 TabOrder = 3
@ -116,19 +116,19 @@ object FileBrowserOptionsFrame: TFileBrowserOptionsFrame
end end
object GBSearch: TGroupBox object GBSearch: TGroupBox
Left = 0 Left = 0
Height = 97 Height = 129
Top = 456 Top = 456
Width = 803 Width = 803
Align = alTop Align = alTop
Caption = 'Search' Caption = 'Search'
ClientHeight = 80 ClientHeight = 111
ClientWidth = 801 ClientWidth = 801
TabOrder = 2 TabOrder = 2
object CBMatchOnlyFilename: TCheckBox object CBMatchOnlyFilename: TCheckBox
Left = 8 Left = 8
Height = 23 Height = 23
Top = 16 Top = 16
Width = 205 Width = 223
Caption = 'Search matches only filename' Caption = 'Search matches only filename'
TabOrder = 0 TabOrder = 0
end end
@ -136,10 +136,18 @@ object FileBrowserOptionsFrame: TFileBrowserOptionsFrame
Left = 8 Left = 8
Height = 23 Height = 23
Top = 48 Top = 48
Width = 177 Width = 191
Caption = 'Show absolute filenames' Caption = 'Show absolute filenames'
TabOrder = 1 TabOrder = 1
end end
object CBUseLetters: TCheckBox
Left = 8
Height = 23
Top = 81
Width = 285
Caption = 'Match individual letters of search term'
TabOrder = 2
end
end end
object GBFileTree: TGroupBox object GBFileTree: TGroupBox
Left = 0 Left = 0
@ -148,14 +156,14 @@ object FileBrowserOptionsFrame: TFileBrowserOptionsFrame
Width = 803 Width = 803
Align = alTop Align = alTop
Caption = 'File browser tree' Caption = 'File browser tree'
ClientHeight = 96 ClientHeight = 95
ClientWidth = 801 ClientWidth = 801
TabOrder = 3 TabOrder = 3
object CBShowFilesInline: TCheckBox object CBShowFilesInline: TCheckBox
Left = 24 Left = 24
Height = 23 Height = 23
Top = 8 Top = 8
Width = 191 Width = 207
Caption = 'Show files in main tree view' Caption = 'Show files in main tree view'
TabOrder = 0 TabOrder = 0
OnChange = CBShowFilesInlineChange OnChange = CBShowFilesInlineChange
@ -166,7 +174,7 @@ object FileBrowserOptionsFrame: TFileBrowserOptionsFrame
Left = 52 Left = 52
Height = 23 Height = 23
Top = 39 Top = 39
Width = 197 Width = 218
BorderSpacing.Top = 8 BorderSpacing.Top = 8
Caption = 'Show directories before files' Caption = 'Show directories before files'
TabOrder = 1 TabOrder = 1
@ -178,7 +186,7 @@ object FileBrowserOptionsFrame: TFileBrowserOptionsFrame
Left = 24 Left = 24
Height = 23 Height = 23
Top = 70 Top = 70
Width = 277 Width = 304
BorderSpacing.Top = 8 BorderSpacing.Top = 8
Caption = 'Keep synchronized with current editor file' Caption = 'Keep synchronized with current editor file'
TabOrder = 2 TabOrder = 2

5
components/filebrowser/fraconfigfilebrowser.pas
View File

@ -20,6 +20,7 @@ type
CBSyncCurrentEditor: TCheckBox; CBSyncCurrentEditor: TCheckBox;
CBMatchOnlyFilename: TCheckBox; CBMatchOnlyFilename: TCheckBox;
CBUseAbsoluteFilenames: TCheckBox; CBUseAbsoluteFilenames: TCheckBox;
CBUseLetters: TCheckBox;
DEStartDir: TDirectoryEdit; DEStartDir: TDirectoryEdit;
DERootDir: TDirectoryEdit; DERootDir: TDirectoryEdit;
GBStartDir: TGroupBox; GBStartDir: TGroupBox;
@ -110,6 +111,7 @@ begin
CBSyncCurrentEditor.Checked:=C.SyncCurrentEditor; CBSyncCurrentEditor.Checked:=C.SyncCurrentEditor;
CBUseAbsoluteFilenames.Checked:=fsoAbsolutePaths in C.SearchOptions; CBUseAbsoluteFilenames.Checked:=fsoAbsolutePaths in C.SearchOptions;
CBMatchOnlyFilename.Checked:=fsoMatchOnlyFileName in C.SearchOptions; CBMatchOnlyFilename.Checked:=fsoMatchOnlyFileName in C.SearchOptions;
CBUseLetters.Checked:=fsoUseLetters in C.SearchOptions;
CheckDirsBeforeFiles; CheckDirsBeforeFiles;
end; end;
@ -157,10 +159,13 @@ begin
Include(SO,fsoAbsolutePaths); Include(SO,fsoAbsolutePaths);
if CBMatchOnlyFilename.Checked then if CBMatchOnlyFilename.Checked then
Include(SO,fsoMatchOnlyFileName); Include(SO,fsoMatchOnlyFileName);
if CBUseLetters.Checked then
Include(SO,fsoUseLetters);
C.SearchOptions:=SO; C.SearchOptions:=SO;
// Re-index // Re-index
if lRootDir<>C.GetResolvedRootDir then if lRootDir<>C.GetResolvedRootDir then
C.IndexRootDir; C.IndexRootDir;
C.WriteConfig;
end; end;
class function TFileBrowserOptionsFrame.SupportedOptionsClass: TAbstractIDEOptionsClass; class function TFileBrowserOptionsFrame.SupportedOptionsClass: TAbstractIDEOptionsClass;

11
components/filebrowser/frmfilesearcher.pas
View File

@ -51,13 +51,22 @@ end;
procedure TFileSearcherForm.DoFilter; procedure TFileSearcherForm.DoFilter;
var
lMatchOptions : TFilenameMatchOptions;
begin begin
if Not Assigned(FController) or (Length(edtSearch.Text)<2) then if Not Assigned(FController) or (Length(edtSearch.Text)<2) then
exit; exit;
lMatchOptions:=[];
if (fsoMatchOnlyFileName in FController.SearchOptions) then
Include(lMatchOptions,fmoFileNameOnly);
if (fsoUseLetters in FController.SearchOptions) then
Include(lMatchOptions,fmoLetters);
LBFiles.Items.BeginUpdate; LBFiles.Items.BeginUpdate;
try try
LBFiles.Items.Clear; LBFiles.Items.Clear;
FController.FindFiles(edtSearch.Text,LBFiles.Items,(fsoMatchOnlyFileName in FController.SearchOptions),FMask); FController.FindFiles(edtSearch.Text,LBFiles.Items,lMatchOptions,FMask);
finally finally
LBFiles.Items.EndUpdate; LBFiles.Items.EndUpdate;
end; end;