From 15d0a29bb2e3a6b6d57d6ca144b6554e67827641 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20K=C3=A4ll=C3=A9n?= <johnkal@gmail.com>
Date: Tue, 7 Jun 2022 23:40:24 +0200
Subject: [PATCH] Feature: show current selection in both panes of the
 CombinedCodeView (#1161)

---
 src/Drivers/reko.config                       |  1 +
 src/Gui/Forms/MainFormInteractor.cs           |  3 +
 src/Gui/IServiceFactory.cs                    |  1 +
 src/Gui/SelectedAddressService.cs             | 71 +++++++++++++++++++
 src/Gui/Services/ISelectedAddressService.cs   | 56 +++++++++++++++
 src/UnitTests/Mocks/FakeCallingConvention.cs  |  2 +
 .../Services/AvaloniaServiceFactory.cs        |  5 ++
 .../WindowsForms/CodeViewInteractor.cs        |  2 +-
 .../CombinedCodeViewInteractor.cs             | 34 ++++++++-
 .../Controls/MixedCodeDataControl.cs          |  9 ++-
 .../MixedCodeDataModel.SpanGenerator.cs       | 22 ++++--
 .../Controls/MixedCodeDataModel.cs            |  9 ++-
 .../WindowsForms/Controls/NestedTextModel.cs  |  5 +-
 .../Controls/ProcedureCodeModel.cs            | 13 +++-
 .../WindowsForms/Controls/TextView.cs         |  1 +
 .../WindowsForms/Controls/TextViewLayout.cs   |  6 +-
 .../WindowsForms/Controls/TextViewModel.cs    |  4 +-
 .../WindowsForms/Controls/TextViewPainter.cs  |  2 +
 .../WindowsForms/TextSpanFormatter.cs         |  2 +-
 .../WindowsForms/WindowsServiceFactory.cs     |  5 ++
 src/WindowsItp/TreeViewDialog.cs              |  2 +-
 21 files changed, 232 insertions(+), 23 deletions(-)
 create mode 100644 src/Gui/SelectedAddressService.cs
 create mode 100644 src/Gui/Services/ISelectedAddressService.cs

diff --git a/src/Drivers/reko.config b/src/Drivers/reko.config
index be1687d678..2d33c2f1e8 100644
--- a/src/Drivers/reko.config
+++ b/src/Drivers/reko.config
@@ -787,5 +787,6 @@
       <Style Name="browser" />
       <Style Name="list" />
       <Style Name="lastLine"                      PaddingBottom="10" />
+	  <Style Name="mirrored"                      BackColor="#E0E0FF" />
     </UiPreferences>
   </Reko>
\ No newline at end of file
diff --git a/src/Gui/Forms/MainFormInteractor.cs b/src/Gui/Forms/MainFormInteractor.cs
index 83aff7e2b6..9e95ab3f17 100644
--- a/src/Gui/Forms/MainFormInteractor.cs
+++ b/src/Gui/Forms/MainFormInteractor.cs
@@ -220,6 +220,9 @@ private void CreateServices(IServiceFactory svcFactory, IServiceContainer sc)
             var selSvc = svcFactory.CreateSelectionService();
             sc.AddService<ISelectionService>(selSvc);
 
+            var selAddrSvc = svcFactory.CreateSelectedAddressService();
+            sc.AddService<ISelectedAddressService>(selAddrSvc);
+
             var testGenSvc = svcFactory.CreateTestGenerationService();
             sc.AddService<ITestGenerationService>(testGenSvc);
 
diff --git a/src/Gui/IServiceFactory.cs b/src/Gui/IServiceFactory.cs
index cf6ae9b784..7b376b3303 100644
--- a/src/Gui/IServiceFactory.cs
+++ b/src/Gui/IServiceFactory.cs
@@ -63,6 +63,7 @@ public interface IServiceFactory
         IViewImportsService CreateViewImportService();
         ISymbolLoadingService CreateSymbolLoadingService();
         ISelectionService CreateSelectionService();
+        ISelectedAddressService CreateSelectedAddressService();
         IProcedureListService CreateProcedureListService();
         ICallHierarchyService CreateCallHierarchyService();
         IDecompiledFileService CreateDecompiledFileService();
diff --git a/src/Gui/SelectedAddressService.cs b/src/Gui/SelectedAddressService.cs
new file mode 100644
index 0000000000..126c98a9d9
--- /dev/null
+++ b/src/Gui/SelectedAddressService.cs
@@ -0,0 +1,71 @@
+#region License
+/* 
+ * Copyright (C) 1999-2022 John Källén.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#endregion
+
+#nullable enable
+
+using Reko.Core;
+using Reko.Gui.Services;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Reko.Gui
+{
+    public class SelectedAddressService : ISelectedAddressService
+    {
+        public event EventHandler? SelectedAddressChanged;
+
+
+        private Address? address;
+        private long length;
+
+        public SelectedAddressService()
+        {
+        }
+
+        public Address? SelectedAddress
+        {
+            get => address;
+            set
+            {
+                if (object.Equals(this.address, value))
+                    return;
+                this.address = value;
+                SelectedAddressChanged?.Invoke(this, EventArgs.Empty);
+            }
+        }
+
+        public long Length
+        {
+            get => length;
+            set
+            {
+                if (value < 0)
+                    throw new ArgumentOutOfRangeException();
+                if (this.length == value)
+                    return;
+                this.length = value;
+                SelectedAddressChanged?.Invoke(this, EventArgs.Empty);
+            }
+        }
+    }
+}
diff --git a/src/Gui/Services/ISelectedAddressService.cs b/src/Gui/Services/ISelectedAddressService.cs
new file mode 100644
index 0000000000..8aee7d5f35
--- /dev/null
+++ b/src/Gui/Services/ISelectedAddressService.cs
@@ -0,0 +1,56 @@
+#region License
+/* 
+ * Copyright (C) 1999-2022 John Källén.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+#endregion
+
+using Reko.Core;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+#nullable enable
+
+namespace Reko.Gui.Services
+{
+    /// <summary>
+    /// This service is used by components that are interested
+    /// in the currently selected address.
+    /// </summary>
+    public interface ISelectedAddressService
+    {
+        /// <summary>
+        /// This event is raised when the selected address is changed.
+        /// </summary>
+        event EventHandler? SelectedAddressChanged;
+
+        /// <summary>
+        /// If not null, indicates the address the user has 
+        /// selected.
+        /// </summary>
+        public Address? SelectedAddress { get; set; }
+
+        /// <summary>
+        /// Indicates the length of the selection the user has 
+        /// made. A length of 0 indicates that only the address
+        /// has been selected, not a range of bytes.
+        /// </summary>
+        public long Length { get; }
+    }
+}
diff --git a/src/UnitTests/Mocks/FakeCallingConvention.cs b/src/UnitTests/Mocks/FakeCallingConvention.cs
index b886fbf549..025b47dfbb 100644
--- a/src/UnitTests/Mocks/FakeCallingConvention.cs
+++ b/src/UnitTests/Mocks/FakeCallingConvention.cs
@@ -26,6 +26,8 @@
 using System.Text;
 using System.Threading.Tasks;
 
+#nullable enable
+
 namespace Reko.UnitTests.Mocks
 {
     public class FakeCallingConvention : CallingConvention
diff --git a/src/UserInterfaces/AvaloniaUI/Services/AvaloniaServiceFactory.cs b/src/UserInterfaces/AvaloniaUI/Services/AvaloniaServiceFactory.cs
index d5b12a4cf8..89be6e1f66 100644
--- a/src/UserInterfaces/AvaloniaUI/Services/AvaloniaServiceFactory.cs
+++ b/src/UserInterfaces/AvaloniaUI/Services/AvaloniaServiceFactory.cs
@@ -168,6 +168,11 @@ public ISearchResultService CreateSearchResultService()
             return new AvaloniaSearchResultService(services);
         }
 
+        public ISelectedAddressService CreateSelectedAddressService()
+        {
+            return new SelectedAddressService();
+        }
+
         public ISelectionService CreateSelectionService()
         {
             return new SelectionService();
diff --git a/src/UserInterfaces/WindowsForms/CodeViewInteractor.cs b/src/UserInterfaces/WindowsForms/CodeViewInteractor.cs
index bbfb84d41c..744d2da4e8 100644
--- a/src/UserInterfaces/WindowsForms/CodeViewInteractor.cs
+++ b/src/UserInterfaces/WindowsForms/CodeViewInteractor.cs
@@ -102,7 +102,7 @@ private void CreateNestedTextModel()
             this.nodeByAddress = new SortedList<Address, MixedCodeDataModel.DataItemNode>();
             foreach (var proc in program.Procedures.Values)
             {
-                var model = new ProcedureCodeModel(proc);
+                var model = new ProcedureCodeModel(proc, services.RequireService<ISelectedAddressService>());
                 //$TODO: make spacing between globals / procedures user adjustable
                 model.NumEmptyLinesAfter = 2;
                 nestedTextModel.Nodes.Add(model);
diff --git a/src/UserInterfaces/WindowsForms/CombinedCodeViewInteractor.cs b/src/UserInterfaces/WindowsForms/CombinedCodeViewInteractor.cs
index 9bef833edf..62f5d0bce5 100644
--- a/src/UserInterfaces/WindowsForms/CombinedCodeViewInteractor.cs
+++ b/src/UserInterfaces/WindowsForms/CombinedCodeViewInteractor.cs
@@ -33,6 +33,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.Design;
 using System.Diagnostics;
+using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -41,6 +42,14 @@
 
 namespace Reko.UserInterfaces.WindowsForms
 {
+    /// <summary>
+    /// Handles events on the <see cref="CombinedCodeView"/> control.
+    /// </summary>
+    /// <remarks>
+    /// The left side of the control is the <see cref="MixedCodeDataControl"/>,
+    /// while the right side of the control can be switched between a view of
+    /// IR code or a Graph viewer.
+    /// </remarks>
     public class CombinedCodeViewInteractor : IWindowPane, ICommandTarget
     {
         private IServiceProvider services;
@@ -141,7 +150,7 @@ private void CreateNestedTextModel()
         {
             this.nestedTextModel = new NestedTextModel();
 
-            if (!(combinedCodeView.MixedCodeDataView.Model is MixedCodeDataModel mixedCodeDataModel))
+            if (combinedCodeView.MixedCodeDataView.Model is not MixedCodeDataModel mixedCodeDataModel)
                 return;
 
             var dataItemNodes = mixedCodeDataModel.GetDataItemNodes();
@@ -157,7 +166,8 @@ private void CreateNestedTextModel()
                 {
                     if (proc != null)
                     {
-                        var model = new ProcedureCodeModel(proc);
+                        var selSvc = services.RequireService<ISelectedAddressService>();
+                        var model = new ProcedureCodeModel(proc, selSvc);
                         //$TODO: make spacing between globals / procedures user adjustable
                         model.NumEmptyLinesAfter = 2;
                         nestedTextModel.Nodes.Add(model);
@@ -188,7 +198,6 @@ private void CreateNestedTextModel()
                     this.nodeByAddress[curAddr] = dataItemNode;
                 }
             }
-
             combinedCodeView.CodeView.Model = nestedTextModel;
         }
 
@@ -520,14 +529,33 @@ private async ValueTask Rename()
 
         private void MixedCodeDataView_MouseDown(object sender, MouseEventArgs e)
         {
+            var mixedViewTag = combinedCodeView.MixedCodeDataView.GetLineTagFromPoint(new Point(e.X, e.Y));
+            UpdateSelectedAddress(mixedViewTag);
             combinedCodeView.CodeView.ClearSelection();
+            combinedCodeView.MixedCodeDataView.ClearSelection();
         }
 
         private void CodeView_MouseDown(object sender, MouseEventArgs e)
         {
+            var codeViewTag = combinedCodeView.CodeView.GetLineTagFromPoint(new Point(e.X, e.Y));
+            UpdateSelectedAddress(codeViewTag);
+            combinedCodeView.CodeView.ClearSelection();
             combinedCodeView.MixedCodeDataView.ClearSelection();
         }
 
+        private void UpdateSelectedAddress(object tag)
+        {
+            if (tag is not Address addr)
+            {
+                if (tag is ulong uAddr)
+                    addr = this.program.SegmentMap.MapLinearAddressToAddress(uAddr);
+                else
+                    return;
+            }
+            var selSvc = services.RequireService<ISelectedAddressService>();
+            selSvc.SelectedAddress = addr;
+        }
+
         public void ViewGraph()
         {
             gViewer.Parent = combinedCodeView.Parent;
diff --git a/src/UserInterfaces/WindowsForms/Controls/MixedCodeDataControl.cs b/src/UserInterfaces/WindowsForms/Controls/MixedCodeDataControl.cs
index b29922f84c..76558d61c9 100644
--- a/src/UserInterfaces/WindowsForms/Controls/MixedCodeDataControl.cs
+++ b/src/UserInterfaces/WindowsForms/Controls/MixedCodeDataControl.cs
@@ -19,6 +19,7 @@
 #endregion
 
 using Reko.Core;
+using Reko.Gui;
 using Reko.Gui.Services;
 using System;
 
@@ -73,9 +74,10 @@ private void OnProgramChanged()
         {
             try
             {
-                if (program != null)
+                if (program is not null && Services is not null)
                 {
-                    Model = new MixedCodeDataModel(program, program.ImageMap.Clone());
+                    var selSvc = Services.RequireService<ISelectedAddressService>();
+                    Model = new MixedCodeDataModel(program, program.ImageMap.Clone(), selSvc);
                     var currentPos = Model.CurrentPosition;
                     addrTop = MixedCodeDataModel.PositionAddress(currentPos);
                     return;
@@ -118,7 +120,8 @@ protected override void OnScroll()
         private void RefreshModel()
         {
             var currentPos = Model.CurrentPosition;
-            var model = new MixedCodeDataModel(program, program.ImageMap.Clone());
+            var selSvc = Services.RequireService<ISelectedAddressService>();
+            var model = new MixedCodeDataModel(program, program.ImageMap.Clone(), selSvc);
             model.MoveToLine(currentPos, 0);
             currentPos = Model.CurrentPosition;
             this.addrTop = MixedCodeDataModel.PositionAddress(currentPos);
diff --git a/src/UserInterfaces/WindowsForms/Controls/MixedCodeDataModel.SpanGenerator.cs b/src/UserInterfaces/WindowsForms/Controls/MixedCodeDataModel.SpanGenerator.cs
index 527fa5732a..62cd768336 100644
--- a/src/UserInterfaces/WindowsForms/Controls/MixedCodeDataModel.SpanGenerator.cs
+++ b/src/UserInterfaces/WindowsForms/Controls/MixedCodeDataModel.SpanGenerator.cs
@@ -34,7 +34,7 @@
 namespace Reko.UserInterfaces.WindowsForms.Controls
 {
     public partial class MixedCodeDataModel
-   {
+    {
         private bool TryReadComment(out LineSpan line)
         {
             if (comments.TryGetValue(curPos.Address, out var commentLines) &&
@@ -131,7 +131,12 @@ private SpanGenerator CreateSpanifier(
             SpanGenerator sp;
             if (item is ImageMapBlock b && b.Block.Procedure != null)
             {
-                sp = new AsmSpanifyer(program, b.Block.Procedure.Architecture, instructions[b], pos);
+                sp = new AsmSpanifyer(
+                    program, 
+                    b.Block.Procedure.Architecture,
+                    instructions[b], 
+                    pos,
+                    this.selSvc?.SelectedAddress);
             }
             else
             {
@@ -159,17 +164,19 @@ public void DecorateLastLine(LineSpan line)
 
         private class AsmSpanifyer : SpanGenerator
         {
-            private Program program;
-            private IProcessorArchitecture arch;
-            private MachineInstruction[] instrs;
+            private readonly Program program;
+            private readonly IProcessorArchitecture arch;
+            private readonly MachineInstruction[] instrs;
             private int offset;
             private ModelPosition position;
+            private readonly Address addrSelected;
 
             public AsmSpanifyer(
                 Program program,
                 IProcessorArchitecture arch,
                 MachineInstruction[] instrs,
-                ModelPosition pos)
+                ModelPosition pos,
+                Address addrSelected)
             {
                 this.instrs = instrs;
                 this.arch = arch;
@@ -177,6 +184,7 @@ public AsmSpanifyer(
                 this.offset = FindIndexOfInstructionAddress(instrs, addr);
                 this.position = pos;
                 this.program = program;
+                this.addrSelected = addrSelected;
             }
 
             public override (ModelPosition, LineSpan)? GenerateSpan()
@@ -193,6 +201,8 @@ public override (ModelPosition, LineSpan)? GenerateSpan()
                     arch,
                     instr,
                     options);
+                if (instr.Address == addrSelected)
+                    asmLine.Style = "mirrored";
                 if (offset == instrs.Length)
                 {
                     DecorateLastLine(asmLine);
diff --git a/src/UserInterfaces/WindowsForms/Controls/MixedCodeDataModel.cs b/src/UserInterfaces/WindowsForms/Controls/MixedCodeDataModel.cs
index fb3d99b30c..7064dba8de 100644
--- a/src/UserInterfaces/WindowsForms/Controls/MixedCodeDataModel.cs
+++ b/src/UserInterfaces/WindowsForms/Controls/MixedCodeDataModel.cs
@@ -21,6 +21,8 @@
 using Reko.Core;
 using Reko.Core.Collections;
 using Reko.Core.Machine;
+using Reko.Gui;
+using Reko.Gui.Services;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -38,17 +40,20 @@ public partial class MixedCodeDataModel : TextViewModel
 
         private readonly Program program;
         private readonly ImageMap imageMap;
+        private readonly ISelectedAddressService selSvc;
         private ModelPosition curPos;
         private readonly ModelPosition endPos;
         private readonly Dictionary<ImageMapBlock, MachineInstruction[]> instructions;
         private readonly IDictionary<Address, string[]> comments;
 
-        public MixedCodeDataModel(Program program, ImageMap imageMap)
+        public MixedCodeDataModel(Program program, ImageMap imageMap, ISelectedAddressService selSvc)
         {
             this.program = program;
             this.imageMap = imageMap;
+            this.selSvc = selSvc;
+
             var firstSeg = program.SegmentMap.Segments.Values.FirstOrDefault();
-            if (firstSeg == null)
+            if (firstSeg is null)
             {
                 this.curPos = Pos(imageMap.BaseAddress);
                 this.StartPosition = Pos(imageMap.BaseAddress);
diff --git a/src/UserInterfaces/WindowsForms/Controls/NestedTextModel.cs b/src/UserInterfaces/WindowsForms/Controls/NestedTextModel.cs
index 10b9e21b49..74cf3b5ad0 100644
--- a/src/UserInterfaces/WindowsForms/Controls/NestedTextModel.cs
+++ b/src/UserInterfaces/WindowsForms/Controls/NestedTextModel.cs
@@ -103,7 +103,10 @@ public LineSpan[] GetLineSpans(int count)
                 spans.AddRange(sub.Select(ls => new LineSpan(
                     new Location(i, ls.Position),
                     ls.Tag,
-                    ls.TextSpans)));
+                    ls.TextSpans)
+                    {
+                        Style = ls.Style
+                    }));
                 position = new Location(i, model.CurrentPosition);
             }
             return spans.ToArray();
diff --git a/src/UserInterfaces/WindowsForms/Controls/ProcedureCodeModel.cs b/src/UserInterfaces/WindowsForms/Controls/ProcedureCodeModel.cs
index 5569f5fc55..c20ab9e3c8 100644
--- a/src/UserInterfaces/WindowsForms/Controls/ProcedureCodeModel.cs
+++ b/src/UserInterfaces/WindowsForms/Controls/ProcedureCodeModel.cs
@@ -20,6 +20,7 @@
 
 using Reko.Core;
 using Reko.Core.Output;
+using Reko.Gui.Services;
 using System;
 using System.Diagnostics;
 
@@ -34,11 +35,13 @@ public class ProcedureCodeModel : TextViewModel
         private int position;
         private LineSpan[] lines;      // The procedure, rendered into line spans
         private int numLines;
+        private readonly ISelectedAddressService selSvc;
 
-        public ProcedureCodeModel(Procedure proc)
+        public ProcedureCodeModel(Procedure proc, ISelectedAddressService selSvc)
         {
             this.proc = proc;
             this.numLines = CountLines();
+            this.selSvc = selSvc;
         }
 
         public object CurrentPosition { get { return position; } }
@@ -68,7 +71,15 @@ public LineSpan[] GetLineSpans(int count)
             {
                 LineSpan line;
                 if ((p + i) < lines.Length)
+                {
                     line = lines[p + i];
+                    if (line.Tag is ulong uAddr && 
+                        this.selSvc.SelectedAddress is not null &&
+                        uAddr == this.selSvc.SelectedAddress.ToLinear())
+                    {
+                        line.Style = "mirrored";
+                    }
+                }
                 else
                     line = new LineSpan(p + i, null, new TextSpan[] { new EmptyTextSpan() });
                 Debug.Assert((int) line.Position == p + i);
diff --git a/src/UserInterfaces/WindowsForms/Controls/TextView.cs b/src/UserInterfaces/WindowsForms/Controls/TextView.cs
index 031b553d6d..02232563df 100644
--- a/src/UserInterfaces/WindowsForms/Controls/TextView.cs
+++ b/src/UserInterfaces/WindowsForms/Controls/TextView.cs
@@ -336,6 +336,7 @@ internal bool IsInsideSelection(TextPointer pos)
         public void ClearSelection()
         {
             anchorPos = cursorPos;
+            ChangeLayout();
             Invalidate();
         }
 
diff --git a/src/UserInterfaces/WindowsForms/Controls/TextViewLayout.cs b/src/UserInterfaces/WindowsForms/Controls/TextViewLayout.cs
index bce0eb800a..dcb3d60c15 100644
--- a/src/UserInterfaces/WindowsForms/Controls/TextViewLayout.cs
+++ b/src/UserInterfaces/WindowsForms/Controls/TextViewLayout.cs
@@ -244,7 +244,7 @@ public void AddLayoutLine(LineSpan line, ref RectangleF rcLine /* put in state *
                 float cyLine = MeasureLineHeight(line);
                 rcLine.Height = cyLine;
                 var spans = ComputeSpanLayouts(line.TextSpans, rcLine);
-                var ll = new LayoutLine(line.Position, line.Tag)
+                var ll = new LayoutLine(line.Position, line.Tag, line.Style)
                 {
                     Extent = LineExtent(rcLine, spans),
                     Spans = spans,
@@ -349,13 +349,15 @@ public TextViewLayout Build()
     /// </summary>
     public class LayoutLine
     {
-        public LayoutLine(object Position, object tag) {
+        public LayoutLine(object Position, object tag, string style) {
             this.Position = Position;
             this.Tag = tag;
+            this.Style = style;
         }
 
         public object Position;
         public object Tag;                  // extra object for this line.
+        public string Style;
         public RectangleF Extent;
         public LayoutSpan[] Spans;
     }
diff --git a/src/UserInterfaces/WindowsForms/Controls/TextViewModel.cs b/src/UserInterfaces/WindowsForms/Controls/TextViewModel.cs
index ec7ea38e50..caac172a42 100644
--- a/src/UserInterfaces/WindowsForms/Controls/TextViewModel.cs
+++ b/src/UserInterfaces/WindowsForms/Controls/TextViewModel.cs
@@ -174,14 +174,14 @@ public struct LineSpan
         public readonly object Position;
         public readonly TextSpan[] TextSpans;
         public readonly object Tag;
+        public string Style;
 
         public LineSpan(object position, object tag, params TextSpan[] textSpans)
         {
             this.Position = position;
             this.TextSpans = textSpans;
-            if (textSpans is null || textSpans.Length == 0)
-                _ = textSpans; //$DEBUG
             this.Tag = tag;
+            this.Style = default!;
         }
     }
 }
diff --git a/src/UserInterfaces/WindowsForms/Controls/TextViewPainter.cs b/src/UserInterfaces/WindowsForms/Controls/TextViewPainter.cs
index 0822557058..7525f4fa3d 100644
--- a/src/UserInterfaces/WindowsForms/Controls/TextViewPainter.cs
+++ b/src/UserInterfaces/WindowsForms/Controls/TextViewPainter.cs
@@ -97,6 +97,7 @@ public void PaintGdiPlus()
         private void PaintLine(LayoutLine line)
         {
             this.line = line;
+            this.styleStack.PushStyle(line.Style);
 
             // Paint the last piece of the line
             RectangleF rcTrailer = line.Extent;
@@ -202,6 +203,7 @@ private void PaintLine(LayoutLine line)
 #endif
                 styleStack.PopStyle();
             }
+            styleStack.PopStyle();
         }
 
         private void PaintUnusedBackground()
diff --git a/src/UserInterfaces/WindowsForms/TextSpanFormatter.cs b/src/UserInterfaces/WindowsForms/TextSpanFormatter.cs
index cdebbbe3a4..dfc1ff74f2 100644
--- a/src/UserInterfaces/WindowsForms/TextSpanFormatter.cs
+++ b/src/UserInterfaces/WindowsForms/TextSpanFormatter.cs
@@ -158,7 +158,7 @@ private FixedTextSpan EnsureSpan()
             if (currentLine == null)
             {
                 currentLine = new List<TextSpan>();
-                this.textLines.Add((this.textLines.Count, currentLine));
+                this.textLines.Add((currentLineTag, currentLine));
             }
             if (currentSpan == null)
             {
diff --git a/src/UserInterfaces/WindowsForms/WindowsServiceFactory.cs b/src/UserInterfaces/WindowsForms/WindowsServiceFactory.cs
index 36a012b154..50f6f859de 100644
--- a/src/UserInterfaces/WindowsForms/WindowsServiceFactory.cs
+++ b/src/UserInterfaces/WindowsForms/WindowsServiceFactory.cs
@@ -204,6 +204,11 @@ public ISelectionService CreateSelectionService()
             return new SelectionService();
         }
 
+        public ISelectedAddressService CreateSelectedAddressService()
+        {
+            return new SelectedAddressService();
+        }
+
         public IProcedureListService CreateProcedureListService()
         {
             return new ProcedureListService(services, mainForm.ProcedureListTab, mainForm.ProcedureFilter, mainForm.ProcedureList);
diff --git a/src/WindowsItp/TreeViewDialog.cs b/src/WindowsItp/TreeViewDialog.cs
index 2ba73ebd60..80b8de59b6 100644
--- a/src/WindowsItp/TreeViewDialog.cs
+++ b/src/WindowsItp/TreeViewDialog.cs
@@ -107,7 +107,7 @@ private ITreeNode[] CreateNodesViaDesigner()
                 .Select(o =>
                 {
                     var tyName = ((DesignerAttribute) o.dd.First()).DesignerTypeName;
-                    throw new NotImplementedException("Services need to be introduced into WindowsItp");
+                    //throw new NotImplementedException("Services need to be introduced into WindowsItp");
                     //var des = Type.GetType(tyName, true).CreateInstance<TreeNodeDesigner>();
                     var node = wrappedTree.CreateNode();
                     //des.TreeNode = node;