IDE: clean directory: fixed checking reguar expression, bug #20382

git-svn-id: trunk@32574 -

ide/cleandirdlg.lfm

@@ -155,12 +155,9 @@ object CleanDirectoryDialog: TCleanDirectoryDialog
     OKButton.Name = 'OKButton'
     OKButton.Caption = '&ОК'
     HelpButton.Name = 'HelpButton'
-    HelpButton.Caption = '&Справка'
     CloseButton.Name = 'CloseButton'
-    CloseButton.Caption = '&Закрыть'
     CloseButton.Enabled = False
     CancelButton.Name = 'CancelButton'
-    CancelButton.Caption = 'Отмена'
     TabOrder = 3
     ShowButtons = [pbOK, pbCancel, pbHelp]
     ShowBevel = False

ide/cleandirdlg.pas

@@ -100,6 +100,7 @@ procedure TCleanDirectoryDialog.OkButtonClick(Sender: TObject);
 var
   List: TStrings;
 begin
+  ModalResult:=mrNone;
   SaveSettings;
   if not SearchFilesToDelete(List) then exit;
   try
@@ -325,6 +326,7 @@ var
     const FilterAsText: string): boolean;
   var
     Expr: String;
+    s: String;
   begin
     Result:=false;
     if FilterAsText='' then begin
@@ -339,12 +341,16 @@ var
       Expr:=FilterAsText;
     try
       Filter.Expression:=Expr;
+      // do a simple test
+      Filter.Exec('test.file');
       Result:=true;
     except
       on E: Exception do begin
-        MessageDlg('Invalid Mask',
+        if SimpleSyntax then
-          'The mask "'+FilterAsText+'" is not a valid expression.',
+          s:=Format(lisTheFileMaskIsInvalid, [FilterAsText])
-          mtError,[mbCancel],0);
+        else
+          s:=Format(lisTheFileMaskIsNotAValidRegularExpression, [FilterAsText]);
+        MessageDlg(lisInvalidMask, s, mtError, [mbCancel], 0);
       end;
     end;
   end;
@@ -364,10 +370,10 @@ begin
     Directory:=AppendPathDelim(Directory);
 
     // setup filters
-    SetupFilter(RemoveFilterRegExpr,SimpleSyntaxRemoveCheckbox.Checked,
+    if not SetupFilter(RemoveFilterRegExpr,SimpleSyntaxRemoveCheckbox.Checked,
-      RemoveCombobox.Text);
+      RemoveCombobox.Text) then exit;
-    SetupFilter(KeepFilterRegExpr,SimpleSyntaxKeepCheckbox.Checked,
+    if not SetupFilter(KeepFilterRegExpr,SimpleSyntaxKeepCheckbox.Checked,
-      KeepCombobox.Text);
+      KeepCombobox.Text) then exit;
 
     // search files
     List:=TStringList.Create;

ide/ideprocs.pp

@@ -2515,12 +2515,12 @@ end;
 {------------------------------------------------------------------------------
   function SimpleSyntaxToRegExpr(const Src: string): string;
 
-  . -> \.
   * -> .*
   ? -> .
   , -> |
   ; -> |
-  
+  Backslash characters .+
+
   Finally enclose by ^( )$
 ------------------------------------------------------------------------------}
 function SimpleSyntaxToRegExpr(const Src: string): string;
@@ -2538,7 +2538,7 @@ begin
     c:=Src[SrcPos];
     case c of
     '\': inc(SrcPos);
-    '*','.':
+    '*','.','+':
       inc(DestLen);
     end;
     inc(SrcPos);
@@ -2559,11 +2559,11 @@ begin
         Result[DestPos]:=Src[SrcPos];
         inc(DestPos);
       end;
-    '.':
+    '.','+':
       begin
         Result[DestPos]:='\';
         inc(DestPos);
-        Result[DestPos]:='.';
+        Result[DestPos]:=c;
         inc(DestPos);
       end;
     '*':

ide/lazarusidestrconsts.pas

@@ -3316,6 +3316,10 @@ resourcestring
   lisUnableToReadFile = 'Unable to read file';
   lisUnableToReadFilename = 'Unable to read file %s%s%s.';
   lisErrorDeletingFile = 'Error deleting file';
+  lisInvalidMask = 'Invalid Mask';
+  lisTheFileMaskIsNotAValidRegularExpression = 'The file mask "%s" is not a '
+    +'valid regular expression.';
+  lisTheFileMaskIsInvalid = 'The file mask "%s" is invalid.';
   lisUnableToDeleteAmbiguousFile = 'Unable to delete ambiguous file %s%s%s';
   lisErrorRenamingFile = 'Error renaming file';
   lisUnableToRenameAmbiguousFileTo = 'Unable to rename ambiguous file %s%s%s%'