From be5318f275cacf231aa14be555e9e121796c941f Mon Sep 17 00:00:00 2001
From: Leon Richardt <leon.richardt@gmail.com>
Date: Sat, 17 Aug 2019 19:12:58 +0200
Subject: [PATCH] Fix emote completion bug

This commit fixes a bug that would occur when changing the completion
mode from prefix-only to substring while mid-completion.
In that case, the suggestion list was not updated until the next
completion attempt.

This is fixed by forcing a suggestion list refresh whenever the
setting's checkbox is updated.
---
 src/common/CompletionModel.hpp            |  1 +
 src/widgets/helper/ResizingTextEdit.cpp   |  5 +++++
 src/widgets/helper/ResizingTextEdit.hpp   |  2 ++
 src/widgets/settingspages/GeneralPage.cpp | 22 +++++++++++++++++++---
 src/widgets/splits/Split.cpp              | 17 +++++++++++++++++
 src/widgets/splits/Split.hpp              |  3 +--
 6 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/src/common/CompletionModel.hpp b/src/common/CompletionModel.hpp
index f4f216cd..41cc4a5d 100644
--- a/src/common/CompletionModel.hpp
+++ b/src/common/CompletionModel.hpp
@@ -48,6 +48,7 @@ public:
     virtual int rowCount(const QModelIndex &) const override;
 
     void refresh(const QString &prefix);
+    void updateEmoteCompletionMethod();
 
 private:
     TaggedString createUser(const QString &str);
diff --git a/src/widgets/helper/ResizingTextEdit.cpp b/src/widgets/helper/ResizingTextEdit.cpp
index 92b5b8ef..22f66d55 100644
--- a/src/widgets/helper/ResizingTextEdit.cpp
+++ b/src/widgets/helper/ResizingTextEdit.cpp
@@ -260,6 +260,11 @@ void ResizingTextEdit::insertFromMimeData(const QMimeData *source)
     }
 }
 
+void ResizingTextEdit::resetCompletionInProgress()
+{
+    this->completionInProgress_ = false;
+}
+
 QCompleter *ResizingTextEdit::getCompleter() const
 {
     return this->completer_;
diff --git a/src/widgets/helper/ResizingTextEdit.hpp b/src/widgets/helper/ResizingTextEdit.hpp
index ff79cddb..7f4907d0 100644
--- a/src/widgets/helper/ResizingTextEdit.hpp
+++ b/src/widgets/helper/ResizingTextEdit.hpp
@@ -20,6 +20,8 @@ public:
     pajlada::Signals::NoArgSignal focused;
     pajlada::Signals::NoArgSignal focusLost;
 
+    void resetCompletionInProgress();
+
     void setCompleter(QCompleter *c);
     QCompleter *getCompleter() const;
 
diff --git a/src/widgets/settingspages/GeneralPage.cpp b/src/widgets/settingspages/GeneralPage.cpp
index aec81113..10aa2ace 100644
--- a/src/widgets/settingspages/GeneralPage.cpp
+++ b/src/widgets/settingspages/GeneralPage.cpp
@@ -8,10 +8,12 @@
 #include "singletons/Fonts.hpp"
 #include "singletons/Paths.hpp"
 #include "singletons/Theme.hpp"
-#include "singletons/WindowManager.hpp"
 #include "util/FuzzyConvert.hpp"
 #include "util/Helpers.hpp"
+#include "widgets/Notebook.hpp"
+#include "widgets/Window.hpp"
 #include "widgets/helper/Line.hpp"
+#include "widgets/splits/Split.hpp"
 
 #define CHROME_EXTENSION_LINK                                           \
     "https://chrome.google.com/webstore/detail/chatterino-native-host/" \
@@ -283,8 +285,22 @@ void GeneralPage::initLayout(SettingsLayout &layout)
         {"Don't show", "Always show", "Hold shift"}, s.emotesTooltipPreview,
         [](int index) { return index; }, [](auto args) { return args.index; },
         false);
-    layout.addCheckbox("Only search for emote autocompletion at the start of emote names",
-                       s.prefixOnlyEmoteCompletion);
+
+    auto emoteCompletionCheckbox = layout.addCheckbox(
+        "Only search for emote autocompletion at the start of emote names",
+        s.prefixOnlyEmoteCompletion);
+
+    // Get the currently active split
+    // XXX: Is there a better way to do this?
+    auto selectedSplit =
+        static_cast<SplitContainer *>(
+            getApp()->windows->getMainWindow().getNotebook().getSelectedPage())
+            ->getBaseNode()
+            ->getSplit();
+
+    // Update emote completion mode when checkbox state is changed
+    QObject::connect(emoteCompletionCheckbox, &QCheckBox::stateChanged,
+                     selectedSplit, &Split::updateEmoteCompletion);
 
     layout.addSpacing(16);
     layout.addSeperator();
diff --git a/src/widgets/splits/Split.cpp b/src/widgets/splits/Split.cpp
index d610b522..13670b5f 100644
--- a/src/widgets/splits/Split.cpp
+++ b/src/widgets/splits/Split.cpp
@@ -669,6 +669,23 @@ void Split::reloadChannelAndSubscriberEmotes()
         twitchChannel->refreshChannelEmotes();
 }
 
+void Split::updateEmoteCompletion()
+{
+    if (getSettings()->prefixOnlyEmoteCompletion)
+    {
+        this->input_->ui_.textEdit->getCompleter()->setFilterMode(
+            Qt::MatchStartsWith);
+    }
+    else
+    {
+        this->input_->ui_.textEdit->getCompleter()->setFilterMode(
+            Qt::MatchContains);
+    }
+
+    // Reset the completion status so a refresh will be triggered on next "Tab"
+    this->input_->ui_.textEdit->resetCompletionInProgress();
+}
+
 template <typename Iter, typename RandomGenerator>
 static Iter select_randomly(Iter start, Iter end, RandomGenerator &g)
 {
diff --git a/src/widgets/splits/Split.hpp b/src/widgets/splits/Split.hpp
index edfca352..894da1a0 100644
--- a/src/widgets/splits/Split.hpp
+++ b/src/widgets/splits/Split.hpp
@@ -8,8 +8,6 @@
 #include <QFont>
 #include <QShortcut>
 #include <QVBoxLayout>
-#include <QWidget>
-
 namespace chatterino {
 
 class ChannelView;
@@ -131,6 +129,7 @@ public slots:
     void showViewerList();
     void openSubPage();
     void reloadChannelAndSubscriberEmotes();
+    void updateEmoteCompletion();
 };
 
 }  // namespace chatterino