IDE: Move some code from TProjectUnitFileSelector to TRemoveFilesSelector.

ide/sourcefilemanager.pas

@@ -194,7 +194,6 @@ type
     constructor Create;
     destructor Destroy; override;
     function SelectAndRun: TModalResult;
-    function RunOneUnit(AnUnitInfo: TUnitInfo): TModalResult;
   end;
 
   { TRemoveFilesSelector }
@@ -204,6 +203,7 @@ type
     function ActionForFiles: TModalResult; override;
   public
     constructor Create;
+    function RunOneUnit(AnUnitInfo: TUnitInfo): TModalResult;
   end;
 
   { TRenameFilesSelector }
@@ -1798,43 +1798,15 @@ end;
 
 function TProjectUnitFileSelector.SelectAndRun: TModalResult;
 begin
-  Result:=Select;
+  Result:=Select;   // Let the user select files in a dialog.
   if Result<>mrOK then Exit;
   if Assigned(fUnitInfos) and (fUnitInfos.Count>0) then begin
     // check ToolStatus
     if (MainIDE.ToolStatus in [itCodeTools,itCodeToolAborting]) then begin
       debugln('RemoveUnitsFromProject wrong ToolStatus ',dbgs(ord(MainIDE.ToolStatus)));
-      exit(mrOK);
+      exit;
     end;
-    // commit changes from source editor to codetools
-    //SaveEditorChangesToCodeCache(nil);
-    //Project1.BeginUpdate(true);
-    try
     Result:=ActionForFiles;
-    finally
-      // all changes were handled automatically by events, just clear the logs
-      //CodeToolBoss.SourceCache.ClearAllSourceLogEntries;
-      //Project1.EndUpdate;
-    end;
-  end
-  else
-    Result:=mrOk;
-end;
-
-function TProjectUnitFileSelector.RunOneUnit(AnUnitInfo: TUnitInfo): TModalResult;
-begin
-  Assert(AnUnitInfo.IsPartOfProject, 'TProjectUnitFileSelector.RunOneUnit: '
-       + AnUnitInfo.Unit_Name + ' is not part of project');
-  fUnitInfos:=TFPList.Create;
-  fUnitInfos.Add(AnUnitInfo);
-  // commit changes from source editor to codetools
-  SaveEditorChangesToCodeCache(nil);
-  Project1.BeginUpdate(true);
-  try
-    Result:=ActionForFiles;
-  finally
-    CodeToolBoss.SourceCache.ClearAllSourceLogEntries;
-    Project1.EndUpdate;
   end;
 end;
 
@@ -1857,6 +1829,10 @@ begin
   ObsoleteUnitPaths:='';
   ObsoleteIncPaths:='';
   Assert(fUnitInfos.Count > 0, 'TRemoveFilesSelector.ActionForFiles: No files');
+  // commit changes from source editor to codetools
+  SaveEditorChangesToCodeCache(nil);
+  Project1.BeginUpdate(true);
+  try
     for i:=0 to fUnitInfos.Count-1 do
     begin
       AnUnitInfo:=TUnitInfo(fUnitInfos[i]);
@@ -1915,6 +1891,28 @@ begin
     // or paths of ObsoleteIncPaths
     if ObsoleteIncPaths<>'' then
       RemovePathFromBuildModes(ObsoleteIncPaths, pcosIncludePath);
+  finally
+    // all changes were handled automatically by events, just clear the logs
+    CodeToolBoss.SourceCache.ClearAllSourceLogEntries;
+    Project1.EndUpdate;
+  end;
+end;
+
+function TRemoveFilesSelector.RunOneUnit(AnUnitInfo: TUnitInfo): TModalResult;
+begin
+  Assert(AnUnitInfo.IsPartOfProject, 'TRemoveFilesSelector.RunOneUnit: '
+       + AnUnitInfo.Unit_Name + ' is not part of project');
+  fUnitInfos:=TFPList.Create;
+  fUnitInfos.Add(AnUnitInfo);
+  // commit changes from source editor to codetools
+  SaveEditorChangesToCodeCache(nil);
+  Project1.BeginUpdate(true);
+  try
+    Result:=ActionForFiles;
+  finally
+    CodeToolBoss.SourceCache.ClearAllSourceLogEntries;
+    Project1.EndUpdate;
+  end;
 end;
 
 { TRenameFilesSelector }