fix(diff): label split panes, unify the mode switch, sync split scrolling
Three things were wrong with the fresh side-by-side viewer: - The panes scrolled independently. The sync hunted the editors' templated ScrollViewers at load time, but the viewer starts collapsed (no file selected), so nothing was ever measured, no template existed, and the hook silently no-opped for the lifetime of the window. Reading now goes through TextView.ScrollOffsetChanged, which exists from construction; writing goes through a lazily resolved ScrollViewer.Offset. TextEditor.ScrollToVerticalOffset is NOT usable here - it is a silent no-op in AvaloniaEdit 12.0.0 even with the editor templated (verified headlessly). - Neither pane said what it showed. Added a BASE | WORKTREE header row inside DiffTextView, sharing the pane grid's columns so each label sits over its editor. - The layout picker was two lookalike ToggleButtons. It is now a segmented switch (Border.segmented + Button.segment.active), with wrap demoted to an icon toggle since it is orthogonal to the layout mode. The scroll sync, TextMate setup, grammar switching, brush fallback and segment struct were duplicated between this control and the 3-pane conflict resolver, which the design doc had used as a copy-paste template. They now live in DiffEditorSetup; both surfaces migrated. They stay separate controls on purpose - a read-only two-way renderer over aligned rows with filler lines is not a variant of a three-way editor over a writable document. The resolver thereby also picks up the fixed scroll sync and the TryFindResource brush lookup (its TryGetResource never resolved anything). All four merge tokens happen to equal their hardcoded fallbacks, so nothing changes on screen.
This commit is contained in:
mika kuns
@@ -1,7 +1,6 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Text;
|
||||
using Avalonia;
|
||||
@@ -9,22 +8,21 @@ using Avalonia.Controls;
|
||||
using Avalonia.Controls.Shapes;
|
||||
using Avalonia.Media;
|
||||
using Avalonia.Threading;
|
||||
using Avalonia.VisualTree;
|
||||
using AvaloniaEdit;
|
||||
using AvaloniaEdit.Document;
|
||||
using AvaloniaEdit.Editing;
|
||||
using AvaloniaEdit.Rendering;
|
||||
using AvaloniaEdit.TextMate;
|
||||
using ClaudeDo.Ui.ViewModels.Conflicts;
|
||||
using TextMateSharp.Grammars;
|
||||
using ClaudeDo.Ui.Views.Controls;
|
||||
using Seg = ClaudeDo.Ui.Views.Controls.DiffEditorSetup.Seg;
|
||||
|
||||
namespace ClaudeDo.Ui.Views.Conflicts;
|
||||
|
||||
public partial class ConflictResolverView : Window
|
||||
{
|
||||
private ConflictResolverViewModel? _vm;
|
||||
private RegistryOptions? _registry;
|
||||
private TextMate.Installation? _oursTm, _resultTm, _theirsTm;
|
||||
private bool _editorsReady;
|
||||
|
||||
// Fixed conflict spans for the read-only side panes (recomputed each rebuild).
|
||||
private List<(int Offset, int Length, MergeConflictBlock Block)> _oursSpans = new();
|
||||
@@ -34,11 +32,8 @@ public partial class ConflictResolverView : Window
|
||||
private readonly List<ResultRegion> _resultRegions = new();
|
||||
private readonly List<MergeConflictBlock> _hookedBlocks = new();
|
||||
|
||||
private ScrollViewer?[] _scrollViewers = Array.Empty<ScrollViewer?>();
|
||||
private bool _wired;
|
||||
private bool _rebuilding;
|
||||
private bool _applyingAccept;
|
||||
private bool _syncing;
|
||||
private bool _gutterPending;
|
||||
private int _gutterRetries;
|
||||
|
||||
@@ -56,12 +51,6 @@ public partial class ConflictResolverView : Window
|
||||
_vm.ActiveFileChanged -= Rebuild;
|
||||
_vm.CurrentChanged -= ScrollToCurrent;
|
||||
}
|
||||
// The editors persist across a DataContext swap, so drop stale scroll-sync hooks first.
|
||||
foreach (var sv in _scrollViewers)
|
||||
if (sv is not null) sv.ScrollChanged -= OnPaneScroll;
|
||||
_scrollViewers = Array.Empty<ScrollViewer?>();
|
||||
_wired = false;
|
||||
|
||||
_vm = DataContext as ConflictResolverViewModel;
|
||||
if (_vm is null) return;
|
||||
|
||||
@@ -76,19 +65,24 @@ public partial class ConflictResolverView : Window
|
||||
|
||||
private void EnsureEditors()
|
||||
{
|
||||
if (_registry is not null) return;
|
||||
_registry = new RegistryOptions(ThemeName.DarkPlus);
|
||||
_oursTm = OursEditor.InstallTextMate(_registry);
|
||||
_resultTm = ResultEditor.InstallTextMate(_registry);
|
||||
_theirsTm = TheirsEditor.InstallTextMate(_registry);
|
||||
if (_editorsReady) return;
|
||||
_editorsReady = true;
|
||||
_oursTm = DiffEditorSetup.InstallHighlighting(OursEditor);
|
||||
_resultTm = DiffEditorSetup.InstallHighlighting(ResultEditor);
|
||||
_theirsTm = DiffEditorSetup.InstallHighlighting(TheirsEditor);
|
||||
|
||||
ResultEditor.Document ??= new TextDocument();
|
||||
ResultEditor.Document.Changed += OnResultDocumentChanged;
|
||||
ResultEditor.TextArea.ReadOnlySectionProvider =
|
||||
new ConflictReadOnlyProvider(() => _resultRegions.Select(r => (r.Start.Offset, r.End.Offset)));
|
||||
|
||||
var conflict = BrushRes("MergeConflictTintBrush", Color.Parse("#28C87060"));
|
||||
var resolved = BrushRes("MergeResolvedTintBrush", Color.Parse("#206FA86B"));
|
||||
// Panes are whole files here, not aligned rows, so raw pixel offsets line up and the
|
||||
// gutter buttons only have to be repositioned once per scroll.
|
||||
new VerticalScrollSync(new[] { OursEditor, ResultEditor, TheirsEditor },
|
||||
afterSync: PositionGutters);
|
||||
|
||||
var conflict = DiffEditorSetup.Brush(this, "MergeConflictTintBrush", Color.Parse("#28C87060"));
|
||||
var resolved = DiffEditorSetup.Brush(this, "MergeResolvedTintBrush", Color.Parse("#206FA86B"));
|
||||
OursEditor.TextArea.TextView.BackgroundRenderers.Add(new MergeBlockRenderer(
|
||||
() => _oursSpans.Select(s => (s.Offset, s.Length, s.Block.IsResolved)), conflict, resolved));
|
||||
ResultEditor.TextArea.TextView.BackgroundRenderers.Add(new MergeBlockRenderer(
|
||||
@@ -97,13 +91,6 @@ public partial class ConflictResolverView : Window
|
||||
() => _theirsSpans.Select(s => (s.Offset, s.Length, s.Block.IsResolved)), conflict, resolved));
|
||||
}
|
||||
|
||||
private IBrush BrushRes(string key, Color fallback)
|
||||
{
|
||||
if (this.TryGetResource(key, null, out var v) && v is IBrush b)
|
||||
return b;
|
||||
return new SolidColorBrush(fallback);
|
||||
}
|
||||
|
||||
// ── Rebuild the three documents for the active file ───────────────────────
|
||||
|
||||
private void Rebuild()
|
||||
@@ -151,16 +138,11 @@ public partial class ConflictResolverView : Window
|
||||
_hookedBlocks.Add(block);
|
||||
}
|
||||
|
||||
ApplyGrammar(file.Path);
|
||||
DiffEditorSetup.ApplyGrammar(file.Path, _oursTm, _resultTm, _theirsTm);
|
||||
InvalidateRenderers();
|
||||
}
|
||||
finally { _rebuilding = false; }
|
||||
|
||||
if (!_wired)
|
||||
{
|
||||
_wired = true;
|
||||
Dispatcher.UIThread.Post(HookScrollSync, DispatcherPriority.Loaded);
|
||||
}
|
||||
QueueGutters();
|
||||
}
|
||||
|
||||
@@ -317,8 +299,8 @@ public partial class ConflictResolverView : Window
|
||||
if (h <= 1) return;
|
||||
var doc = ResultEditor.Document;
|
||||
var totalLines = Math.Max(1, doc.LineCount);
|
||||
var unresolved = BrushRes("MergeConflictEdgeBrush", Color.Parse("#80C87060"));
|
||||
var resolved = BrushRes("MergeResolvedEdgeBrush", Color.Parse("#806FA86B"));
|
||||
var unresolved = DiffEditorSetup.Brush(this, "MergeConflictEdgeBrush", Color.Parse("#80C87060"));
|
||||
var resolved = DiffEditorSetup.Brush(this, "MergeResolvedEdgeBrush", Color.Parse("#806FA86B"));
|
||||
|
||||
foreach (var region in _resultRegions)
|
||||
{
|
||||
@@ -348,31 +330,6 @@ public partial class ConflictResolverView : Window
|
||||
|
||||
private static string Tr(string key) => ClaudeDo.Ui.Localization.Loc.T(key);
|
||||
|
||||
// ── Synced vertical scroll across the three panes ─────────────────────────
|
||||
|
||||
private void HookScrollSync()
|
||||
{
|
||||
_scrollViewers = new[] { OursEditor, ResultEditor, TheirsEditor }
|
||||
.Select(ed => ed.FindDescendantOfType<ScrollViewer>())
|
||||
.ToArray();
|
||||
foreach (var sv in _scrollViewers)
|
||||
if (sv is not null) sv.ScrollChanged += OnPaneScroll;
|
||||
}
|
||||
|
||||
private void OnPaneScroll(object? sender, ScrollChangedEventArgs e)
|
||||
{
|
||||
if (_syncing || sender is not ScrollViewer src) return;
|
||||
_syncing = true;
|
||||
try
|
||||
{
|
||||
foreach (var sv in _scrollViewers)
|
||||
if (sv is not null && !ReferenceEquals(sv, src) && Math.Abs(sv.Offset.Y - src.Offset.Y) > 0.5)
|
||||
sv.Offset = new Vector(sv.Offset.X, src.Offset.Y);
|
||||
}
|
||||
finally { _syncing = false; }
|
||||
PositionGutters();
|
||||
}
|
||||
|
||||
private void ScrollToCurrent()
|
||||
{
|
||||
if (_vm?.Current is not { } block) return;
|
||||
@@ -390,30 +347,8 @@ public partial class ConflictResolverView : Window
|
||||
TheirsEditor.TextArea.TextView.InvalidateVisual();
|
||||
}
|
||||
|
||||
private void ApplyGrammar(string? path)
|
||||
{
|
||||
if (_registry is null || string.IsNullOrEmpty(path)) return;
|
||||
var ext = System.IO.Path.GetExtension(path);
|
||||
if (string.IsNullOrEmpty(ext)) return;
|
||||
var language = _registry.GetLanguageByExtension(ext);
|
||||
if (language is null) return;
|
||||
var scope = _registry.GetScopeByLanguageId(language.Id);
|
||||
_oursTm?.SetGrammar(scope);
|
||||
_resultTm?.SetGrammar(scope);
|
||||
_theirsTm?.SetGrammar(scope);
|
||||
}
|
||||
|
||||
// ── Helper types (single-consumer; live with their consumer per repo style) ─
|
||||
|
||||
/// <summary>A minimal <see cref="ISegment"/> for geometry/read-only queries.</summary>
|
||||
private readonly struct Seg : ISegment
|
||||
{
|
||||
public Seg(int offset, int length) { Offset = offset; Length = length; }
|
||||
public int Offset { get; }
|
||||
public int Length { get; }
|
||||
public int EndOffset => Offset + Length;
|
||||
}
|
||||
|
||||
/// <summary>An editable conflict region in the result document, tracking which sides are
|
||||
/// currently included (in click order — <c>'o'</c> = ours/main, <c>'t'</c> = theirs/incoming).</summary>
|
||||
private sealed class ResultRegion
|
||||
|
||||
Reference in New Issue
Block a user