fix - Update the cursor position from event (microsoft#49)

* fix - Update the cursor position from event and rename variable

Author: jdneo

com.microsoft.copilot.eclipse.core/src/com/microsoft/copilot/eclipse/core/completion/CompletionProvider.java

@@ -9,9 +9,7 @@
 import org.eclipse.core.runtime.jobs.IJobChangeListener;
 import org.eclipse.lsp4j.Position;
 
-import com.microsoft.copilot.eclipse.core.CopilotCore;
 import com.microsoft.copilot.eclipse.core.CopilotStatusManager;
-import com.microsoft.copilot.eclipse.core.logger.LogLevel;
 import com.microsoft.copilot.eclipse.core.lsp.CopilotLanguageServerConnection;
 import com.microsoft.copilot.eclipse.core.lsp.protocol.CompletionDocument;
 import com.microsoft.copilot.eclipse.core.lsp.protocol.CompletionParams;

com.microsoft.copilot.eclipse.ui/src/com/microsoft/copilot/eclipse/ui/completion/CompletionHandler.java

@@ -139,8 +139,8 @@ public CompletionCollection getCompletions() {
 
   @Override
   public void caretMoved(CaretEvent event) {
-    int caretOffset = UiUtils.getCaretOffset(this.textViewer);
-    this.triggerPosition = new org.eclipse.jface.text.Position(caretOffset);
+    int modelOffset = UiUtils.widgetOffset2ModelOffset(textViewer, event.caretOffset);
+    this.triggerPosition = new org.eclipse.jface.text.Position(modelOffset);
 
     // it's guaranteed that the document change event comes earlier than caret
     // change event. See org.eclipse.swt.custom.StyledText#modifyContent()

com.microsoft.copilot.eclipse.ui/src/com/microsoft/copilot/eclipse/ui/utils/UiUtils.java

@@ -77,21 +77,19 @@ public static ImageDescriptor resizeIcon(String path, int width, int height) {
   }
 
   /**
-   * Gets the caret offset of the given text viewer.
+   * Returns the widget offset that corresponds to the given offset in the viewer's input document or <code>-1</code> if
+   * there is no such offset.
    */
-  public static int getCaretOffset(ITextViewer textViewer) {
-    if (textViewer == null) {
-      return 0;
-    }
-    return textViewer.getSelectedRange().x;
+  public static int modelOffset2WidgetOffset(ITextViewer textViewer, int offset) {
+    return textViewer instanceof ITextViewerExtension5 extension ? extension.modelOffset2WidgetOffset(offset) : offset;
   }
 
   /**
-   * Returns the widget offset that corresponds to the given offset in the viewer's input document or <code>-1</code> if
+   * Returns the offset of the viewer's input document that corresponds to the given widget offset or <code>-1</code> if
    * there is no such offset.
    */
-  public static int modelOffset2WidgetOffset(ITextViewer textViewer, int offset) {
-    return textViewer instanceof ITextViewerExtension5 extension ? extension.modelOffset2WidgetOffset(offset) : offset;
+  public static int widgetOffset2ModelOffset(ITextViewer textViewer, int offset) {
+    return textViewer instanceof ITextViewerExtension5 extension ? extension.widgetOffset2ModelOffset(offset) : offset;
   }
 
   /**