chore: Merge branch dev to main (#29)

AutoUpdater.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <item>
-  <version>1.6.2</version>
-  <url>https://github.com/PocketMiner82/pseudocode-ide/releases/download/1.6.2/pseudocode-ide.zip</url>
-  <changelog>https://github.com/PocketMiner82/pseudocode-ide/blob/1.6.2/CHANGELOG.md</changelog>
+  <version>1.6.3.1</version>
+  <url>https://github.com/PocketMiner82/pseudocode-ide/releases/download/1.6.3-dev.1/pseudocode-ide.zip</url>
+  <changelog>https://github.com/PocketMiner82/pseudocode-ide/blob/1.6.3-dev.1/CHANGELOG.md</changelog>
   <mandatory>false</mandatory>
 </item>

CHANGELOG.md

@@ -1,3 +1,11 @@
+## [1.6.3-dev.1](https://github.com/PocketMiner82/pseudocode-ide/compare/1.6.2...1.6.3-dev.1) (2024-04-20)
+
+
+### Bug Fixes
+
+* autocomplete menu selection hack removed ([556733c](https://github.com/PocketMiner82/pseudocode-ide/commit/556733c9ee11add41531ba082e43174423d824b4))
+* Autocomplete ToolTip didn't have line breaks ([6193a4f](https://github.com/PocketMiner82/pseudocode-ide/commit/6193a4fbdda492ac36cf93cdc5ffca03722e5ebb))
+
 ## [1.6.2](https://github.com/PocketMiner82/pseudocode-ide/compare/1.6.1...1.6.2) (2024-04-20)
 
 

pseudocodeIde/PseudocodeIDEForm.cs

@@ -53,6 +53,11 @@ public partial class PseudocodeIDEForm : Form
         /// </summary>
         private readonly Regex _noUpdateAfter = new Regex(@"^[a-zA-Z0-9_äöüÄÖÜß]$", RegexOptions.Multiline);
 
+        /// <summary>
+        /// The autocomplete tooltip
+        /// </summary>
+        private readonly ToolTip _toolTip = new ToolTip();
+
         /// <summary>
         /// the code currently in the textbox
         /// </summary>
@@ -133,6 +138,9 @@ public PseudocodeIDEForm()
             CodeTextBox_TextChanged(null, null);
             // on first start, the code is always saved
             SetFileSaved();
+
+            _toolTip.OwnerDraw = false;
+            _toolTip.ShowAlways = true;
         }
 
         /// <summary>
@@ -238,12 +246,54 @@ private void PseudocodeIDE_FormClosing(object sender, FormClosingEventArgs e)
                     SaveMenuItem_Click(null, null);
                 }
             }
+
+            _toolTip.Dispose();
         }
 
         // ---------------------------------------------
         // CODE TEXTBOX (Scintilla)
         // ---------------------------------------------
 
+        private void AutoCompleteMenu_Hovered(object sender, HoveredEventArgs e)
+        {
+            _toolTip.Hide(this);
+
+            if (e.Item == null)
+            {
+                return;
+            }
+
+            AutocompleteItem autocompleteItem = e.Item;
+
+            string title = "Code Snippet:";
+            string text = autocompleteItem.ToolTipText.Replace("\t", "    ");
+            Color? backColor = autocompleteItem.ToolTipBackColor;
+            Color? foreColor = autocompleteItem.ToolTipForeColor;
+
+            if (backColor != null)
+            {
+                _toolTip.BackColor = (Color)backColor;
+            }
+
+            if (foreColor != null)
+            {
+                _toolTip.ForeColor = (Color)foreColor;
+            }
+
+            Point locationOnForm = PointToClient(
+            ((AutocompleteListView)autoCompleteMenu.ListView).Parent.PointToScreen(((AutocompleteListView)autoCompleteMenu.ListView).Location));
+
+            _toolTip.ToolTipTitle = title;
+            _toolTip.Show(string.IsNullOrEmpty(text) ? title : text, this,
+                locationOnForm.X + ((AutocompleteListView)autoCompleteMenu.ListView).Width + 10,
+                locationOnForm.Y + 30);
+        }
+
+        private void AutoCompleteMenu_Selected(object sender, SelectedEventArgs e)
+        {
+            _toolTip.Hide(this);
+        }
+
         /// <summary>
         /// Updates the undo stack, when user updated the code
         /// </summary>
@@ -333,12 +383,6 @@ private void CodeTextBox_KeyDown(object sender, KeyEventArgs e)
                 e.SuppressKeyPress = TrySelectNextTabIndicator();
             }
 
-            // hack to allow enter to autocomplete even if down wasnt pressed before
-            if ((e.KeyCode == Keys.Enter || e.KeyCode == Keys.Tab) && e.Modifiers == Keys.None && autoCompleteMenu.SelectedItemIndex < 0)
-            {
-                autoCompleteMenu.ProcessKey((char)Keys.Down, e.Modifiers);
-            }
-
             // ignore CTRL[+SHIFT]+(Z/Y/L/R/E/S)
             if ((e.KeyCode == Keys.Z || e.KeyCode == Keys.Y || e.KeyCode == Keys.L || e.KeyCode == Keys.R || e.KeyCode == Keys.E || e.KeyCode == Keys.S)
                 && (Control.ModifierKeys == Keys.Control || Control.ModifierKeys == (Keys.Control | Keys.Shift)))