refactor git colours

This commit is contained in:
Matt Parker
2025-12-03 18:44:16 +10:00
parent 91cb6d7991
commit e8f4303b07
5 changed files with 44 additions and 19 deletions

View File

@@ -18,7 +18,7 @@ public class SharpIdeFile : ISharpIdeNode, IChildSharpIdeNode, IFileOrFolder
public bool IsCshtmlFile => Path.EndsWith(".cshtml", StringComparison.OrdinalIgnoreCase);
public bool IsCsharpFile => Path.EndsWith(".cs", StringComparison.OrdinalIgnoreCase);
public bool IsRoslynWorkspaceFile => IsCsharpFile || IsRazorFile || IsCshtmlFile;
public GitStatus GitStatus { get; set; } = GitStatus.Unaltered;
public GitFileStatus GitStatus { get; set; } = GitFileStatus.Unaltered;
public required ReactiveProperty<bool> IsDirty { get; init; }
public required bool SuppressDiskChangeEvents { get; set; } // probably has concurrency issues
public required DateTimeOffset? LastIdeWriteTime { get; set; }

View File

@@ -27,10 +27,10 @@ public static class VsPersistenceMapper
var mappedGitStatus = entry.State switch
{
FileStatus.NewInIndex | FileStatus.ModifiedInWorkdir => GitStatus.Added, // I've seen these appear together
FileStatus.NewInIndex or FileStatus.NewInWorkdir => GitStatus.Added,
FileStatus.ModifiedInIndex or FileStatus.ModifiedInWorkdir => GitStatus.Modified,
_ => GitStatus.Unaltered // TODO: handle other kinds?
FileStatus.NewInIndex | FileStatus.ModifiedInWorkdir => GitFileStatus.Added, // I've seen these appear together
FileStatus.NewInIndex or FileStatus.NewInWorkdir => GitFileStatus.Added,
FileStatus.ModifiedInIndex or FileStatus.ModifiedInWorkdir => GitFileStatus.Modified,
_ => GitFileStatus.Unaltered // TODO: handle other kinds?
};
fileInSolution.GitStatus = mappedGitStatus;
@@ -40,7 +40,7 @@ public static class VsPersistenceMapper
}
}
public enum GitStatus
public enum GitFileStatus
{
Unaltered,
Modified,