github/SharpIDE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
Matt Parker
2025-10-31 19:02:21 +10:00
parent fbe6b80cd9
commit 72e254c1d5
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/SharpIDE.Application/Features/FileWatching/SharpIdeSolutionModificationService.cs
View File

@@ -20,15 +20,7 @@ public class SharpIdeSolutionModificationService(FileChangedService fileChangedS
var allFolders = new ConcurrentBag<SharpIdeFolder>(); var allFolders = new ConcurrentBag<SharpIdeFolder>();
var sharpIdeFolder = new SharpIdeFolder(new DirectoryInfo(addedDirectoryPath), parentNode, allFiles, allFolders); var sharpIdeFolder = new SharpIdeFolder(new DirectoryInfo(addedDirectoryPath), parentNode, allFiles, allFolders);
var correctInsertionPosition = parentNode.Folders.list.BinarySearch(sharpIdeFolder, SharpIdeFolderComparer.Instance); var correctInsertionPosition = GetInsertionPosition(parentNode, sharpIdeFolder);
if (correctInsertionPosition < 0)
{
correctInsertionPosition = ~correctInsertionPosition;
}
else
{
throw new InvalidOperationException("Folder already exists in the containing folder or project");
}
parentNode.Folders.Insert(correctInsertionPosition, sharpIdeFolder); parentNode.Folders.Insert(correctInsertionPosition, sharpIdeFolder);
SolutionModel.AllFolders.AddRange((IEnumerable<SharpIdeFolder>)[sharpIdeFolder, ..allFolders]); SolutionModel.AllFolders.AddRange((IEnumerable<SharpIdeFolder>)[sharpIdeFolder, ..allFolders]);
@@ -145,9 +137,14 @@ public class SharpIdeSolutionModificationService(FileChangedService fileChangedS
return sharpIdeFile; return sharpIdeFile;
} }
private static int GetInsertionPosition(IFolderOrProject parentNode, SharpIdeFile sharpIdeFile) private static int GetInsertionPosition(IFolderOrProject parentNode, IFileOrFolder fileOrFolder)
{ {
var correctInsertionPosition = parentNode.Files.list.BinarySearch(sharpIdeFile, SharpIdeFileComparer.Instance); var correctInsertionPosition = fileOrFolder switch
{
SharpIdeFile f => parentNode.Files.list.BinarySearch(f, SharpIdeFileComparer.Instance),
SharpIdeFolder d => parentNode.Folders.list.BinarySearch(d, SharpIdeFolderComparer.Instance),
_ => throw new InvalidOperationException("Unknown file or folder type")
};
if (correctInsertionPosition < 0) if (correctInsertionPosition < 0)
{ {
correctInsertionPosition = ~correctInsertionPosition; correctInsertionPosition = ~correctInsertionPosition;
@@ -192,7 +189,8 @@ public class SharpIdeSolutionModificationService(FileChangedService fileChangedS
var newFilePath = Path.Combine(destinationParentNode.ChildNodeBasePath, fileToMove.Name); var newFilePath = Path.Combine(destinationParentNode.ChildNodeBasePath, fileToMove.Name);
var parentFolderOrProject = (IFolderOrProject)fileToMove.Parent; var parentFolderOrProject = (IFolderOrProject)fileToMove.Parent;
parentFolderOrProject.Files.Remove(fileToMove); parentFolderOrProject.Files.Remove(fileToMove);
destinationParentNode.Files.Add(fileToMove); var insertionIndex = GetInsertionPosition(destinationParentNode, fileToMove);
destinationParentNode.Files.Insert(insertionIndex, fileToMove);
fileToMove.Parent = destinationParentNode; fileToMove.Parent = destinationParentNode;
fileToMove.Path = newFilePath; fileToMove.Path = newFilePath;
await _fileChangedService.SharpIdeFileMoved(fileToMove, oldPath); await _fileChangedService.SharpIdeFileMoved(fileToMove, oldPath);