Fixed shat code completion position takes LineNumber list into account

Author: AndersMalmgren

FreePIE.GUI.CodeCompletion/AvalonEdit/AvalonAdapter.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Input;
 using ICSharpCode.AvalonEdit.Editing;
 using ICSharpCode.AvalonEdit.Search;
@@ -10,11 +11,13 @@ namespace FreePIE.GUI.CodeCompletion.AvalonEdit
     public class AvalonEditorAdapter : EditorAdapterBase
     {
         private readonly TextArea textArea;
+        private ScrollViewer scroll;
         private SearchPanel searchPanel;
 
         public AvalonEditorAdapter(TextArea textArea)
         {
             this.textArea = textArea;
+
             textArea.Caret.PositionChanged += OnCaretPositionChanged;
             textArea.PreviewKeyDown += OnTextAreaPreviewKeyDown;
             textArea.KeyDown += OnKeyDown;
@@ -81,6 +84,13 @@ protected virtual void OnSelectionChanged(object sender, EventArgs e)
         public override event KeyEventHandler KeyDown;
         public override event KeyEventHandler KeyUp;
         public override event TextCompositionEventHandler PreviewTextInput;
+        public override Point GetOffset()
+        {
+            var s = scroll ?? (scroll = FindScrollAncestor(textArea));
+
+            var trans = textArea.TextView.TransformToAncestor(textArea);
+            return trans.Transform(new Point(-s.HorizontalOffset, -s.VerticalOffset));
+        }
 
         public override Rect GetVisualPosition()
         {
@@ -118,5 +128,17 @@ public override void Focus()
         {
             textArea.Focus();
         }
+
+        private ScrollViewer FindScrollAncestor(UIElement element)
+        {
+            DependencyObject obj = element;
+            while ((obj = LogicalTreeHelper.GetParent(obj)) != null)
+            {
+                if (obj is ScrollViewer)
+                    return obj as ScrollViewer;
+            }
+
+            return null;
+        }
     }
 }

FreePIE.GUI.CodeCompletion/EditorAdapterBase.cs

@@ -17,5 +17,6 @@ public abstract class EditorAdapterBase : DependencyObject
         public abstract event KeyEventHandler KeyDown;
         public abstract event KeyEventHandler KeyUp;
         public abstract event TextCompositionEventHandler PreviewTextInput;
+        public abstract Point GetOffset();
     }
 }

FreePIE.GUI.CodeCompletion/Event/Actions/PositionAction.cs

@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
+using Caliburn.Micro;
 
 namespace FreePIE.GUI.CodeCompletion.Event.Actions
 {
@@ -24,30 +25,13 @@ public void Handle(IEnumerable<IPopupEvent> events, CompletionPopupView view)
                 return;
 
             Rect rect = view.Target.GetVisualPosition();
-
-            view.PlacementRectangle = rect.IsEmpty ? default(Rect) : new Rect(CalculatePoint(rect, view.Target.UIElement), new Size(rect.Width, rect.Height));
+            view.PlacementRectangle = rect.IsEmpty ? default(Rect) : new Rect(CalculatePoint(rect, view), new Size(rect.Width, rect.Height));
         }
 
-        private ScrollViewer FindScrollAncestor(UIElement element)
+        Point CalculatePoint(Rect rect, CompletionPopupView view)
         {
-            DependencyObject obj = element;
-            while((obj = LogicalTreeHelper.GetParent(obj)) != null)
-            {
-                if (obj is ScrollViewer)
-                    return obj as ScrollViewer;
-            }
-
-            return null;
-        }
-
-        Point CalculatePoint(Rect rect, UIElement textArea)
-        {
-            var scroll = FindScrollAncestor(textArea);
-
-            if(scroll == null)
-                return new Point(rect.X, rect.Y + 1);
-
-            return new Point(rect.X - scroll.HorizontalOffset, rect.Y - scroll.VerticalOffset + 1);
+            var offset = view.Target.GetOffset();
+            return new Point(rect.X + offset.X, rect.Y + offset.Y + 1);
         }
     }
 }