C++ editor: Highlight member variable

Highlight member variable when there is also
enum value with the same name

Task-number: QTCREATORBUG-7525
Change-Id: I0990844a20fdf9e87a807fde10708344b9c3497b
Reviewed-by: Orgad Shaneh <[email protected]>
Reviewed-by: Nikolai Kosjar <[email protected]>

1 files changed, 5 insertions, 1 deletions

diff --git a/src/plugins/cpptools/cppchecksymbols.cpp b/src/plugins/cpptools/cppchecksymbols.cpp
index 5f7b6f04d78..bc807c7f6ca 100644
--- a/src/plugins/cpptools/cppchecksymbols.cpp
+++ b/src/plugins/cpptools/cppchecksymbols.cpp
@@ -787,7 +787,11 @@ void CheckSymbols::checkName(NameAST *ast, Scope *scope)
                 }
             }
         } else if (maybeType(ast->name) || maybeStatic(ast->name)) {
-            maybeAddTypeOrStatic(_context.lookup(ast->name, scope), ast);
+            if (! maybeAddTypeOrStatic(_context.lookup(ast->name, scope), ast)) {
+                // it can be a local variable
+                if (maybeField(ast->name))
+                    maybeAddField(_context.lookup(ast->name, scope), ast);
+            }
         } else if (maybeField(ast->name)) {
             maybeAddField(_context.lookup(ast->name, scope), ast);
         }