From fa6c205e5dc3f6047bf6d5556886e83c360706dd Mon Sep 17 00:00:00 2001
From: Capostrophic <21265616+Capostrophic@users.noreply.github.com>
Date: Thu, 2 Aug 2018 03:16:33 +0300
Subject: [PATCH 1/2] Make tab autocompletion work with explicit reference
 calls

---
 CHANGELOG.md                  | 1 +
 apps/openmw/mwgui/console.cpp | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1923e5237..847404bf7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
     Bug #2835: Player able to slowly move when overencumbered
     Bug #2852: No murder bounty when a player follower commits murder
     Bug #2862: [macOS] Can't quit launcher using Command-Q or OpenMW->Quit
+    Bug #2872: Tab completion in console doesn't work with explicit reference
     Bug #2971: Compiler did not reject lines with naked expressions beginning with x.y
     Bug #3249: Fixed revert function not updating views properly
     Bug #3374: Touch spells not hitting kwama foragers
diff --git a/apps/openmw/mwgui/console.cpp b/apps/openmw/mwgui/console.cpp
index e8ac33f6d..dee2d4a31 100644
--- a/apps/openmw/mwgui/console.cpp
+++ b/apps/openmw/mwgui/console.cpp
@@ -339,6 +339,14 @@ namespace MWGui
                 }
             }
         }
+
+        // Erase a possible call to an explicit reference
+        size_t explicitPos = tmp.find("->");
+        if (explicitPos != std::string::npos)
+        {
+            tmp.erase(0, explicitPos+2);
+        }
+
         /* Erase the input from the output string so we can easily append the completed form later. */
         output.erase(output.end()-tmp.length(), output.end());
 

From 3ac030d75acfbe6a6bbbf628648205b390086561 Mon Sep 17 00:00:00 2001
From: Capostrophic <21265616+Capostrophic@users.noreply.github.com>
Date: Thu, 2 Aug 2018 09:49:53 +0300
Subject: [PATCH 2/2] Handle explicit calls before handling quotes

---
 apps/openmw/mwgui/console.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/mwgui/console.cpp b/apps/openmw/mwgui/console.cpp
index dee2d4a31..b367c6f49 100644
--- a/apps/openmw/mwgui/console.cpp
+++ b/apps/openmw/mwgui/console.cpp
@@ -303,6 +303,14 @@ namespace MWGui
         bool has_front_quote = false;
 
         /* Does the input string contain things that don't have to be completed? If yes erase them. */
+
+        /* Erase a possible call to an explicit reference. */
+        size_t explicitPos = tmp.find("->");
+        if (explicitPos != std::string::npos)
+        {
+            tmp.erase(0, explicitPos+2);
+        }
+
         /* Are there quotation marks? */
         if( tmp.find('"') != std::string::npos ) {
             int numquotes=0;
@@ -340,13 +348,6 @@ namespace MWGui
             }
         }
 
-        // Erase a possible call to an explicit reference
-        size_t explicitPos = tmp.find("->");
-        if (explicitPos != std::string::npos)
-        {
-            tmp.erase(0, explicitPos+2);
-        }
-
         /* Erase the input from the output string so we can easily append the completed form later. */
         output.erase(output.end()-tmp.length(), output.end());