Adjust Arguments tooltip according to function position

Author: govert

Source/ExcelDna.IntelliSense/IntelliSenseDisplay.cs

@@ -293,6 +293,7 @@ void FormulaEditTextChange(string formulaPrefix, Rect editWindowBounds, IntPtr e
                 FunctionInfo functionInfo;
                 if (_functionInfoMap.TryGetValue(functionName, out functionInfo))
                 {
+                    var lineBeforeFunctionName = FormulaParser.GetLineBeforeFunctionName(formulaPrefix, functionName);
                     // We have a function name and we want to show info
                     if (_argumentsToolTip != null)
                     {
@@ -308,8 +309,8 @@ void FormulaEditTextChange(string formulaPrefix, Rect editWindowBounds, IntPtr e
                         //    }
                         //}
                         int topOffset = GetTopOffset(excelToolTipWindow);
-                        var infoText = GetFunctionIntelliSense(functionInfo, currentArgIndex);
-                        _argumentsToolTip.ShowToolTip(infoText, (int)editWindowBounds.Left, (int)editWindowBounds.Bottom + 5, topOffset);
+                        FormattedText infoText = GetFunctionIntelliSense(functionInfo, currentArgIndex);
+                        _argumentsToolTip.ShowToolTip(infoText, lineBeforeFunctionName, (int)editWindowBounds.Left, (int)editWindowBounds.Bottom + 5, topOffset);
                     }
                     else
                     {
@@ -384,6 +385,7 @@ void FunctionListSelectedItemChange(string selectedItemText, Rect selectedItemBo
                 {
                     _descriptionToolTip.ShowToolTip(
                         text: new FormattedText { GetFunctionDescriptionOrNull(functionInfo) },
+                        linePrefix: null,
                         left: (int)listBounds.Right + DescriptionLeftMargin,
                         top: (int)selectedItemBounds.Bottom - 18,
                         topOffset: 0,

Source/ExcelDna.IntelliSense/ToolTipForm.cs

@@ -14,6 +14,7 @@ namespace ExcelDna.IntelliSense
     class ToolTipForm  : Form
     {
         FormattedText _text;
+        int _linePrefixWidth;
         System.ComponentModel.IContainer components;
         Win32Window _owner;
         // Help Link
@@ -110,10 +111,12 @@ void ShowToolTip()
             }
         }
 
-        public void ShowToolTip(FormattedText text, int left, int top, int topOffset, int? listLeft = null)
+        public void ShowToolTip(FormattedText text, string linePrefix, int left, int top, int topOffset, int? listLeft = null)
         {
             Debug.Print($"@@@ ShowToolTip - Old TopOffset: {_topOffset}, New TopOffset: {topOffset}");
             _text = text;
+            _linePrefixWidth = MeasureFormulaStringWidth(linePrefix);
+            left += _linePrefixWidth;
             if (left != _showLeft || top != _showTop || topOffset != _topOffset || listLeft != _listLeft)
             {
                 // Update the start position and the current position
@@ -126,21 +129,22 @@ public void ShowToolTip(FormattedText text, int left, int top, int topOffset, in
             }
             if (!Visible)
             {
-                Debug.Print($"ShowToolTip - Showing ToolTipForm: {_text.ToString()}");
+                Debug.Print($"ShowToolTip - Showing ToolTipForm: {linePrefix} => {_text.ToString()}");
                 // Make sure we're in the right position before we're first shown
                 SetBounds(_currentLeft, _currentTop + _topOffset, 0, 0);
                 ShowToolTip();
             }
             else
             {
-                Debug.Print($"ShowToolTip - Invalidating ToolTipForm: {_text.ToString()}");
+                Debug.Print($"ShowToolTip - Invalidating ToolTipForm: {linePrefix} => {_text.ToString()}");
                 Invalidate();
             }
         }
 
         public void MoveToolTip(int left, int top, int topOffset, int? listLeft = null)
         {
             Debug.Print($"@@@ MoveToolTip - Old TopOffset: {_topOffset}, New TopOffset: {topOffset}");
+            left += _linePrefixWidth;
             // We might consider checking the new position against earlier mouse movements
             _currentLeft = left;
             _currentTop = top;
@@ -175,6 +179,17 @@ public IntPtr OwnerHandle
             }
         }
 
+        // TODO: Move or clean up or something...
+        Font StandardFont = new Font("Calibri", 11);
+        int MeasureFormulaStringWidth(string formulaString)
+        {
+            if (string.IsNullOrEmpty(formulaString))
+                return 0;
+
+            var size = TextRenderer.MeasureText(formulaString, StandardFont);
+            return size.Width;
+        }
+
         #region Mouse Handling
 
         void MouseButtonDown(Point screenLocation)
@@ -329,6 +344,7 @@ protected override void OnPaint(PaintEventArgs e)
             }
             var width = lineWidths.Max() + widthPadding;
             var height = totalHeight + heightPadding;
+
             UpdateLocation(width, height);
             DrawRoundedRectangle(e.Graphics, new RectangleF(0,0, Width - 1, Height - 1), 2, 2);
         }

Source/ExcelDna.IntelliSense/UIMonitor/FormulaEditWatcher.cs

@@ -45,7 +45,7 @@ public StateChangeEventArgs(StateChangeType? stateChangeType = null)
         // We don't really care whether it is the formula bar or in-cell, 
         // we just need to get the right window handle 
         public Rect EditWindowBounds { get; set; }
-        public Point CaretPosition { get; set; }
+
         public IntPtr FormulaEditWindow
         {
             get
@@ -406,7 +406,7 @@ void UpdateEditState(bool moveOnly = false)
                         IntPtr hwnd = (IntPtr)(int)focusedEdit.GetCurrentPropertyValue(AutomationElement.NativeWindowHandleProperty);
 
                         var pt = Win32Helper.GetClientCursorPos(hwnd);
-                        CaretPosition = new Point(pt.X, pt.Y);
+
                         if (!IsEditingFormula)
                             InstallLocationMonitor(GetTopLevelWindow(focusedEdit));
                         IsEditingFormula = true;
@@ -417,7 +417,7 @@ void UpdateEditState(bool moveOnly = false)
                             CurrentPrefix = newPrefix;
                             prefixChanged = true;
                         }
-                        Logger.WindowWatcher.Verbose($"FormulaEdit UpdateEditState Formula editing: CurrentPrefix {CurrentPrefix}, EditWindowBounds: {EditWindowBounds}, CaretPosition {CaretPosition}");
+                        Logger.WindowWatcher.Verbose($"FormulaEdit UpdateEditState Formula editing: CurrentPrefix {CurrentPrefix}, EditWindowBounds: {EditWindowBounds}");
                     }
 
                     // TODO: Smarter notification...?

Source/ExcelDna.IntelliSense/UIMonitor/FormulaParser.cs

@@ -77,5 +77,16 @@ internal static bool TryGetFormulaInfo(string formulaPrefix, out string function
             currentArgIndex = -1;
             return false;
         }
+
+        internal static string GetLineBeforeFunctionName(string formulaPrefix, string functionName)
+        {
+            // TODO: This should be cleaned up - just added something for testing...
+            int lastFuncStart = formulaPrefix.LastIndexOf(functionName);
+            if (lastFuncStart < 0)
+                return "";
+
+            int lastLineStart = formulaPrefix.LastIndexOf('\n', lastFuncStart) + 1;
+            return formulaPrefix.Substring(lastLineStart, lastFuncStart - lastLineStart);
+        }
     }
 }