Merge pull request #125 from Rekkonnect/dev/final-touches-1.2.2

Minor improvements

Author: Rekkonnect

Syndiesis/Controls/AnalysisVisualization/AnalysisTreeListNode.axaml.cs

@@ -331,7 +331,6 @@ internal void EvaluateHoveringRecursivelyBinary(PointerEventArgs e)
         if (index < 0)
             return;
 
-        var children = LazyChildren;
         var child = LazyChildren[index];
         child.EvaluateHoveringRecursivelyBinary(e);
     }
@@ -346,7 +345,7 @@ private int BinarySearchControlByTop(double height)
         while (low <= high)
         {
             int mid = (low + high) / 2;
-            var child = LazyChildren[mid];
+            var child = children[mid];
             var childBounds = child.Bounds;
             if (childBounds.Top <= height && height <= childBounds.Bottom)
                 return mid;

Syndiesis/Controls/CommonAvaloniaExtensions.cs

@@ -230,6 +230,12 @@ public static void AddIfNotContained(this ControlList controls, Control control)
             controls.Add(control);
         }
     }
+
+    public static bool ContainsPointer(this Control control, PointerEventArgs pointer)
+    {
+        var position = pointer.GetPosition(control);
+        return control.Bounds.Contains(position);
+    }
 }
 
 // Dispatcher

Syndiesis/Controls/Editor/CodeEditor.axaml.cs

@@ -119,6 +119,8 @@ public bool DiagnosticsUnavailable
         }
     }
 
+    public BackgroundLineNumberPanel LineNumberPanel { get; private set; }
+
     public event EventHandler? TextChanged
     {
         add => textEditor.Document.TextChanged += value;
@@ -146,6 +148,7 @@ public CodeEditor()
 
     [MemberNotNull(nameof(_nodeSpanHoverLayer))]
     [MemberNotNull(nameof(_diagnosticsLayer))]
+    [MemberNotNull(nameof(LineNumberPanel))]
     private void InitializeTextEditor()
     {
         var textArea = textEditor.TextArea;
@@ -179,7 +182,8 @@ private void InitializeTextEditor()
             KnownLayer.Text,
             LayerInsertionPosition.Above);
 
-        textArea.LeftMargins[0] = new BackgroundLineNumberPanel(textArea.TextView);
+        LineNumberPanel = new BackgroundLineNumberPanel(textArea.TextView);
+        textArea.LeftMargins[0] = LineNumberPanel;
     }
 
     private void InitializeEvents()

Syndiesis/Core/DisplayAnalysis/BaseAnalysisNodeCreator.cs

@@ -856,7 +856,8 @@ protected static DisplayValueSource MethodSource(string name)
         return new(DisplayValueSource.SymbolKind.Method, name);
     }
 
-    protected static GroupedRunInline? CountDisplayRunGroup(object value)
+    protected static GroupedRunInline? CountDisplayRunGroup<T>(T value)
+        where T : notnull
     {
         switch (value)
         {
@@ -871,7 +872,8 @@ protected static DisplayValueSource MethodSource(string name)
             ?? CountDisplayRunGroup(value, nameof(Array.Length));
     }
 
-    protected static GroupedRunInline? CountDisplayRunGroup(object value, string propertyName)
+    protected static GroupedRunInline? CountDisplayRunGroup<T>(T value, string propertyName)
+        where T : notnull
     {
         var type = value.GetType();
         var property = type.GetProperty(propertyName);

Syndiesis/Core/DisplayAnalysis/CSharpSyntaxAnalysisNodeCreator.cs

@@ -1051,7 +1051,10 @@ public sealed class SyntaxTriviaListRootViewNodeCreator(CSharpSyntaxAnalysisNode
         public override AnalysisTreeListNodeLine CreateNodeLine(
             SyntaxTriviaList list, GroupedRunInlineCollection inlines)
         {
-            Creator.AppendSyntaxDetails(list, inlines);
+            Creator.AppendSyntaxTypeDetails(typeof(SyntaxTriviaList), inlines);
+            inlines.Add(CreateLargeSplitterRun());
+            var countDisplayRun = CountDisplayRunGroup(list)!;
+            inlines.Add(countDisplayRun);
 
             return AnalysisTreeListNodeLine(
                 inlines,

Syndiesis/Views/MainView.axaml.cs

@@ -85,8 +85,10 @@ private void PrepareQuickInfoShowing(QuickInfoHandler.PrepareShowingEventArgs e)
 
         var editor = codeEditor.textEditor;
         var area = editor.TextArea;
-        var areaPosition = pointerArgs.GetPosition(area);
-        if (!area.Bounds.Contains(areaPosition))
+        if (!area.ContainsPointer(pointerArgs))
+            return;
+
+        if (codeEditor.LineNumberPanel.ContainsPointer(pointerArgs))
             return;
 
         var editorPosition = pointerArgs.GetPosition(editor);