Improved highlighting in C++ Macro Usages.

Only highlight the Macro name, not the whole definition line
or the parameter list in function-like Macros.

Change-Id: I5732dd5dd18cee150755ea35a5fbb67fdaed51c4
Reviewed-by: Francois Ferrand <thetypz@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/src/plugins/cpptools/cppfindreferences.cpp b/src/plugins/cpptools/cppfindreferences.cpp
index b6305a359e..30e5690b7e 100644
--- a/src/plugins/cpptools/cppfindreferences.cpp
+++ b/src/plugins/cpptools/cppfindreferences.cpp
@@ -560,7 +560,7 @@ public:
                 unsigned lineStart;
                 const QString &lineSource = matchingLine(use.begin(), source, &lineStart);
                 usages.append(Usage(fileName, lineSource, use.beginLine(),
-                                    use.begin() - lineStart, use.length()));
+                                    use.begin() - lineStart, useMacro.name().length()));
             }
         }
 
@@ -644,8 +644,9 @@ void CppFindReferences::findMacroUses(const Macro &macro)
     {
         // ### FIXME: Encoding?
         const QByteArray &source = getSource(macro.fileName(), workingCopy).toLatin1();
-        search->addResult(macro.fileName(), macro.line(),
-                          source.mid(macro.offset(), macro.length()), 0, macro.length());
+        const QByteArray line = source.mid(macro.offset(), macro.length());
+        search->addResult(macro.fileName(), macro.line(), line,
+                          line.indexOf(macro.name()), macro.name().length());
     }
 
     QFuture<Usage> result;