Fixes: Completing switch statements with enums in namespaces or classes.

We need to add the fully qualified name to the case statements.

Reviewed-by: Roberto Raggi

4 files changed, 43 insertions, 14 deletions

diff --git a/src/libs/cplusplus/Overview.cpp b/src/libs/cplusplus/Overview.cpp
index 48cdb009b7..78d5373b74 100644
--- a/src/libs/cplusplus/Overview.cpp
+++ b/src/libs/cplusplus/Overview.cpp
@@ -137,6 +137,18 @@ QString Overview::prettyName(const Name *name) const
     return pp(name);
 }
 
+QString Overview::prettyName(const QList<const Name *> &fullyQualifiedName) const
+{
+    QString result;
+    const int size = fullyQualifiedName.size();
+    for (int i = 0; i < size; ++i) {
+        result.append(prettyName(fullyQualifiedName.at(i)));
+        if (i < size - 1)
+            result.append(QLatin1String("::"));
+    }
+    return result;
+}
+
 QString Overview::prettyType(const FullySpecifiedType &ty, const Name *name) const
 {
     return prettyType(ty, prettyName(name));
diff --git a/src/libs/cplusplus/Overview.h b/src/libs/cplusplus/Overview.h
index 7471f306a1..3982aca7da 100644
--- a/src/libs/cplusplus/Overview.h
+++ b/src/libs/cplusplus/Overview.h
@@ -72,10 +72,14 @@ public:
     QString operator()(const Name *name) const
     { return prettyName(name); }
 
+    QString operator()(const QList<const Name *> &fullyQualifiedName) const
+    { return prettyName(fullyQualifiedName); }
+
     QString operator()(const FullySpecifiedType &type, const Name *name = 0) const
     { return prettyType(type, name); }
 
     QString prettyName(const Name *name) const;
+    QString prettyName(const QList<const Name *> &fullyQualifiedName) const;
     QString prettyType(const FullySpecifiedType &type, const Name *name = 0) const;
     QString prettyType(const FullySpecifiedType &type, const QString &name) const;
 
diff --git a/src/plugins/cppeditor/cpphoverhandler.cpp b/src/plugins/cppeditor/cpphoverhandler.cpp
index 5c84e86841..5e46c19c9e 100644
--- a/src/plugins/cppeditor/cpphoverhandler.cpp
+++ b/src/plugins/cppeditor/cpphoverhandler.cpp
@@ -289,14 +289,8 @@ void CppHoverHandler::handleLookupItemMatch(const LookupItem &lookupItem, const
         if (matchingDeclaration->enclosingSymbol()->isClass() ||
             matchingDeclaration->enclosingSymbol()->isNamespace() ||
             matchingDeclaration->enclosingSymbol()->isEnum()) {
-            const QList<const Name *> &names =
-                LookupContext::fullyQualifiedName(matchingDeclaration);
-            const int size = names.size();
-            for (int i = 0; i < size; ++i) {
-                qualifiedName.append(overview.prettyName(names.at(i)));
-                if (i < size - 1)
-                    qualifiedName.append(QLatin1String("::"));
-            }
+            qualifiedName.append(overview.prettyName(
+                    LookupContext::fullyQualifiedName(matchingDeclaration)));
         } else {
             qualifiedName.append(overview.prettyName(matchingDeclaration->name()));
         }
diff --git a/src/plugins/cppeditor/cppquickfix.cpp b/src/plugins/cppeditor/cppquickfix.cpp
index 15c827bc89..4f17fe1e6a 100644
--- a/src/plugins/cppeditor/cppquickfix.cpp
+++ b/src/plugins/cppeditor/cppquickfix.cpp
@@ -1257,11 +1257,13 @@ public:
                     Overview prettyPrint;
                     for (unsigned i = 0; i < e->memberCount(); ++i) {
                         if (Declaration *decl = e->memberAt(i)->asDeclaration()) {
-                            values << prettyPrint(decl->name());
+                            values << prettyPrint(LookupContext::fullyQualifiedName(decl));
                         }
                     }
                     // Get the used values
-                    CaseStatementCollector caseValues(document()->translationUnit());
+                    Block *block = switchStatement->symbol;
+                    CaseStatementCollector caseValues(document(), snapshot(),
+                        document()->scopeAt(block->line(), block->column()));
                     QStringList usedValues = caseValues(switchStatement);
                     // save the values that would be added
                     foreach (const QString &usedValue, usedValues)
@@ -1318,7 +1320,15 @@ protected:
     class CaseStatementCollector : public ASTVisitor
     {
     public:
-        CaseStatementCollector(TranslationUnit *unit) : ASTVisitor(unit) {}
+        CaseStatementCollector(Document::Ptr document, const Snapshot &snapshot,
+                               Scope *scope)
+            : ASTVisitor(document->translationUnit()),
+            document(document),
+            scope(scope)
+        {
+            typeOfExpression.init(document, snapshot);
+        }
+
         QStringList operator ()(AST *ast)
         {
             values.clear();
@@ -1330,9 +1340,14 @@ protected:
         bool preVisit(AST *ast) {
             if (CaseStatementAST *cs = ast->asCaseStatement()) {
                 foundCaseStatementLevel = true;
-                if (SimpleNameAST *sm = cs->expression->asSimpleName()) {
-                    Overview prettyPrint;
-                    values << prettyPrint(sm->name);
+                ExpressionAST *expression = cs->expression->asSimpleName();
+                if (!expression)
+                    expression = cs->expression->asQualifiedName();
+                if (expression) {
+                    LookupItem item = typeOfExpression(expression,
+                                                       document,
+                                                       scope).first();
+                    values << prettyPrint(LookupContext::fullyQualifiedName(item.declaration()));
                 }
                 return true;
             } else if (foundCaseStatementLevel) {
@@ -1341,8 +1356,12 @@ protected:
             return true;
         }
 
+        Overview prettyPrint;
         bool foundCaseStatementLevel;
         QStringList values;
+        TypeOfExpression typeOfExpression;
+        Document::Ptr document;
+        Scope *scope;
     };
 
 protected: