C++ tooltip: Display macro tooltip only if hover is actually over the macro name.

1 files changed, 7 insertions, 6 deletions

diff --git a/src/plugins/cppeditor/cpphoverhandler.cpp b/src/plugins/cppeditor/cpphoverhandler.cpp
index 6d1eb8fe81..013ffb723b 100644
--- a/src/plugins/cppeditor/cpphoverhandler.cpp
+++ b/src/plugins/cppeditor/cpphoverhandler.cpp
@@ -256,12 +256,13 @@ bool CppHoverHandler::matchMacroInUse(const CPlusPlus::Document::Ptr &document,
 {
     foreach (const Document::MacroUse &use, document->macroUses()) {
         if (use.contains(pos)) {
-            const Macro& macro = use.macro();
-            m_toolTip = macro.toString();
-            m_helpCandidates.append(HelpCandidate(macro.name(),
-                                                  macro.name(),
-                                                  HelpCandidate::Macro));
-            return true;
+            const int begin = use.begin();
+            const QString &name = use.macro().name();
+            if (pos < begin + name.length()) {
+                m_toolTip = use.macro().toString();
+                m_helpCandidates.append(HelpCandidate(name, name, HelpCandidate::Macro));
+                return true;
+            }
         }
     }
     return false;