ADD: TFileSystemWatcher.Features function

(cherry picked from commit 24838d18f3)

src/fileviews/ufileviewwithmainctrl.pas

@@ -235,7 +235,8 @@ uses
   LCLIntf, LCLProc, LazUTF8, Forms, Dialogs, Buttons, DCOSUtils, DCStrUtils,
   fMain, uShowMsg, uLng, uFileProperty, uFileSource, uFileSourceOperationTypes,
   uGlobs, uInfoToolTip, uDisplayFile, uFileSystemFileSource, uFileSourceUtil,
-  uArchiveFileSourceUtil, uFormCommands, uKeyboard, uFileSourceSetFilePropertyOperation;
+  uArchiveFileSourceUtil, uFormCommands, uKeyboard, uFileSourceSetFilePropertyOperation,
+  uFileSystemWatcher;
 
 type
   TControlHandlersHack = class(TWinControl)
@@ -353,7 +354,7 @@ begin
         begin
           // FRenameFile is nil when a file list
           // already updated by the real 'rename' event
-          if FlatView and Assigned(FRenameFile) then
+          if FlatView and Assigned(FRenameFile) and (TFileSystemWatcher.Features * [fsfFlatView] = []) then
           begin
             PushRenameEvent(FRenameFile, NewFileName);
           end;

src/platform/ufilesystemwatcher.pas

@@ -46,6 +46,8 @@ type
                          fswUnknownChange);
   TFSWatcherEventTypes = set of TFSWatcherEventType;
 
+  TFSFeatures = set of (fsfFlatView);
+
   TFSWatcherEventData = record
     Path: String;
     EventType: TFSWatcherEventType;
@@ -82,6 +84,7 @@ type
     {$ENDIF}
     class function CanWatch(const WatchPaths: array of String): Boolean;
     class function AvailableWatchFilter: TFSWatchFilter;
+    class function Features: TFSFeatures;
   end;
 
 implementation
@@ -388,6 +391,15 @@ begin
   ];
 end;
 
+class function TFileSystemWatcher.Features: TFSFeatures;
+begin
+  Result := [
+{$IF DEFINED(DARWIN)}
+             fsfFlatView
+{$ENDIF}
+  ];
+end;
+
 // ----------------------------------------------------------------------------
 
 procedure ShowError(const sErrMsg: String);