From 7ad3256a59e56c4a1d0229d80e6e8f5705d4ad61 Mon Sep 17 00:00:00 2001
From: halvarsson <halvarsson@gmail.com>
Date: Tue, 30 Apr 2024 18:10:08 +0200
Subject: [PATCH] Upgrade Terminal.Gui to 1.10.0 and updated Autocomplete
 overrides

---
 Autocomplete/PowershellAutocomplete.cs | 12 ++++++------
 psedit.csproj                          |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Autocomplete/PowershellAutocomplete.cs b/Autocomplete/PowershellAutocomplete.cs
index f5c55c4..dd99c9c 100644
--- a/Autocomplete/PowershellAutocomplete.cs
+++ b/Autocomplete/PowershellAutocomplete.cs
@@ -45,7 +45,7 @@ public void Force()
             }
         }
 
-        private void TryGenerateSuggestions()
+        private void TryGenerateSuggestions(int columnOffset = 0)
         {
             var host = (EditorTextView)HostControl;
             var offset = 0;
@@ -80,7 +80,7 @@ private void TryGenerateSuggestions()
             {
                 if (_suggestions != null)
                 {
-                    var word = GetCurrentWord();
+                    var word = GetCurrentWord(columnOffset);
                     if (!System.String.IsNullOrEmpty(word))
                     {
                         Suggestions = _suggestions.Where(m => m.StartsWith(word, StringComparison.OrdinalIgnoreCase)).ToList().AsReadOnly();
@@ -103,11 +103,11 @@ private void TryGenerateSuggestions()
             }
         }
 
-        public override void GenerateSuggestions()
+        public override void GenerateSuggestions(int columnOffset = 0)
         {
             try
             {
-                TryGenerateSuggestions();
+                TryGenerateSuggestions(columnOffset);
             }
             catch { }
         }
@@ -119,12 +119,12 @@ public override bool IsWordChar(Rune rune)
         }
 
         ///<inheritdoc/>
-        protected override string GetCurrentWord()
+        protected override string GetCurrentWord(int columnOffset = 0)
         {
             var host = (TextView)HostControl;
             var currentLine = host.GetCurrentLine();
             var cursorPosition = Math.Min(host.CurrentColumn, currentLine.Count);
-            return IdxToWord(currentLine, cursorPosition);
+            return IdxToWord(currentLine, cursorPosition, columnOffset);
         }
 
         /// <inheritdoc/>
diff --git a/psedit.csproj b/psedit.csproj
index 88881b5..20f5fa6 100644
--- a/psedit.csproj
+++ b/psedit.csproj
@@ -6,7 +6,7 @@
 
   <ItemGroup>
       <PackageReference Include="PowerShellStandard.Library" Version="5.1.1" />
-      <PackageReference Include="Terminal.Gui" Version="1.9.0" />
+      <PackageReference Include="Terminal.Gui" Version="1.10.0" />
       <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>