qmlls: fix import as resolution

Import as resolution (i.e. finding a type that was imported with an import as)
was broken in two ways: the shortcut looking for types did look only to types
imported without as, and the normal lookup for symbols declared the ImportScope
as visited (to avoid loops) too early in one case and would skip it.
This was visible in qmlls completions of Controls.

Change-Id: Ifc1e777973ddc251bd0685290e8d28bfb025f269
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 8e6dcc04fc1073b043eba6792472c2d7cd3d5993)
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

5 files changed, 38 insertions, 15 deletions

diff --git a/src/qmldom/qqmldomitem.cpp b/src/qmldom/qqmldomitem.cpp
index f7ef17771b..040218cf84 100644
--- a/src/qmldom/qqmldomitem.cpp
+++ b/src/qmldom/qqmldomitem.cpp
@@ -1653,6 +1653,11 @@ bool DomItem::visitLookup1(QString symbolName, function_ref<bool(DomItem &)> vis
         // the prototype chain)
         DomItem importScope = fileObject().field(Fields::importScope);
         if (const ImportScope *importScopePtr = importScope.as<ImportScope>()) {
+            if (importScopePtr->subImports().contains(symbolName)) {
+                DomItem subItem = importScope.field(Fields::qualifiedImports).key(symbolName);
+                if (!visitor(subItem))
+                    return false;
+            }
             QList<DomItem> types = importScopePtr->importedItemsWithName(importScope, symbolName);
             for (DomItem &t : types) {
                 if (!visitor(t))
@@ -1740,18 +1745,18 @@ bool DomItem::visitLookup(QString target, function_ref<bool(DomItem &)> visitor,
                         while (!lookupToDos.isEmpty()) {
                             ResolveToDo tNow = lookupToDos.takeFirst();
                             auto vNow = qMakePair(tNow.item.id(), tNow.pathIndex);
-                            if (vNow.first != 0) {
-                                if (lookupVisited[vNow.second].contains(vNow.first))
-                                    continue;
-                                else
-                                    lookupVisited[vNow.second].insert(vNow.first);
-                            }
                             DomItem subNow = tNow.item;
                             int iSubPath = tNow.pathIndex;
                             Q_ASSERT(iSubPath < subpath.length());
                             QString subPathNow = subpath[iSubPath++];
                             DomItem scope = subNow.proceedToScope();
                             if (iSubPath < subpath.length()) {
+                                if (vNow.first != 0) {
+                                    if (lookupVisited[vNow.second].contains(vNow.first))
+                                        continue;
+                                    else
+                                        lookupVisited[vNow.second].insert(vNow.first);
+                                }
                                 if (scope.internalKind() == DomType::QmlObject)
                                     scope.visitDirectAccessibleScopes(
                                             [&lookupToDos, subPathNow, iSubPath](DomItem &el) {
@@ -2106,7 +2111,7 @@ bool DomItem::visitLocalSymbolsNamed(QString name, function_ref<bool(DomItem &)>
             return false;
         f = field(Fields::qualifiedImports);
         v = f.key(name);
-        if (!v.visitIndexes(visitor))
+        if (v && !visitor(v))
             return false;
         break;
     default:
diff --git a/tests/auto/qmldom/domdata/domitem/test1.qml b/tests/auto/qmldom/domdata/domitem/test1.qml
index 36c1284978..4a28129ee9 100644
--- a/tests/auto/qmldom/domdata/domitem/test1.qml
+++ b/tests/auto/qmldom/domdata/domitem/test1.qml
@@ -1,4 +1,5 @@
-import QtQuick 2.15
+import QtQuick
+import QtQuick as QQ
 
 Window {
     visible: true
diff --git a/tests/auto/qmldom/domitem/tst_qmldomitem.h b/tests/auto/qmldom/domitem/tst_qmldomitem.h
index fab95c4e1e..0286672f54 100644
--- a/tests/auto/qmldom/domitem/tst_qmldomitem.h
+++ b/tests/auto/qmldom/domitem/tst_qmldomitem.h
@@ -517,10 +517,15 @@ private slots:
                     obj1.lookup(u"Rectangle"_s, LookupType::Type, LookupOption::Normal);
             QList<DomItem> rect2 =
                     obj1.lookup(u"Rectangle"_s, LookupType::Symbol, LookupOption::Normal);
+            QList<DomItem> rectAs =
+                    obj1.lookup(u"QQ.Rectangle"_s, LookupType::Symbol, LookupOption::Normal);
+
             QVERIFY(rect.length() == 1);
             QVERIFY(rect2.length() == 1);
+            QVERIFY(rectAs.length() == 1);
             QCOMPARE(rect.first().internalKind(), DomType::Export);
             QCOMPARE(rect.first(), rect2.first());
+            QCOMPARE(rect.first(), rectAs.first());
             DomItem rect3 = rect.first().proceedToScope();
             QCOMPARE(rect3.internalKind(), DomType::QmlObject);
             QList<DomItem> rects;
diff --git a/tests/auto/qmlls/completions/data/completions/Yyy.qml b/tests/auto/qmlls/completions/data/completions/Yyy.qml
index b07fb9822e..dc1125c6ad 100644
--- a/tests/auto/qmlls/completions/data/completions/Yyy.qml
+++ b/tests/auto/qmlls/completions/data/completions/Yyy.qml
@@ -1,4 +1,5 @@
 import QtQuick 2.0
+import QtQuick as QQ
 
 Zzz {
     id: root
@@ -13,4 +14,8 @@ Zzz {
 
     function lala() {}
     property Rectangle foo: Rectangle{ height: 200 }
+
+    QQ.Rectangle {
+        color:"red"
+    }
 }
diff --git a/tests/auto/qmlls/completions/tst_qmllscompletions.cpp b/tests/auto/qmlls/completions/tst_qmllscompletions.cpp
index e10b400887..03746589dc 100644
--- a/tests/auto/qmlls/completions/tst_qmllscompletions.cpp
+++ b/tests/auto/qmlls/completions/tst_qmllscompletions.cpp
@@ -128,7 +128,7 @@ void tst_QmllsCompletions::completions_data()
 
     QByteArray uri = testFileUrl("completions/Yyy.qml").toString().toUtf8();
 
-    QTest::newRow("objEmptyLine") << uri << 7 << 0
+    QTest::newRow("objEmptyLine") << uri << 8 << 0
                                   << ExpectedCompletions({
                                              { u"Rectangle"_s, CompletionItemKind::Class },
                                              { u"property"_s, CompletionItemKind::Keyword },
@@ -137,7 +137,7 @@ void tst_QmllsCompletions::completions_data()
                                      })
                                   << QStringList({ u"QtQuick"_s, u"vector4d"_s });
 
-    QTest::newRow("inBindingLabel") << uri << 4 << 9
+    QTest::newRow("inBindingLabel") << uri << 5 << 9
                                     << ExpectedCompletions({
                                                { u"Rectangle"_s, CompletionItemKind::Class },
                                                { u"property"_s, CompletionItemKind::Keyword },
@@ -145,7 +145,7 @@ void tst_QmllsCompletions::completions_data()
                                        })
                                     << QStringList({ u"QtQuick"_s, u"vector4d"_s });
 
-    QTest::newRow("afterBinding") << uri << 4 << 10
+    QTest::newRow("afterBinding") << uri << 5 << 10
                                   << ExpectedCompletions({
                                              { u"Rectangle"_s, CompletionItemKind::Field },
                                              { u"width"_s, CompletionItemKind::Field },
@@ -154,7 +154,7 @@ void tst_QmllsCompletions::completions_data()
                                   << QStringList({ u"QtQuick"_s, u"property"_s });
 
     // suppress?
-    QTest::newRow("afterId") << uri << 3 << 7
+    QTest::newRow("afterId") << uri << 4 << 7
                              << ExpectedCompletions({
                                         { u"import"_s, CompletionItemKind::Keyword },
                                 })
@@ -197,7 +197,7 @@ void tst_QmllsCompletions::completions_data()
     //            })
     //         << QStringList({ u"as"_s, u"Rectangle"_s, u"import"_s, u"vector4d"_s, u"width"_s });
 
-    QTest::newRow("inScript") << uri << 5 << 14
+    QTest::newRow("inScript") << uri << 6 << 14
                               << ExpectedCompletions({
                                          { u"Rectangle"_s, CompletionItemKind::Field },
                                          { u"vector4d"_s, CompletionItemKind::Field },
@@ -206,19 +206,26 @@ void tst_QmllsCompletions::completions_data()
                                  })
                               << QStringList({ u"import"_s });
 
-    QTest::newRow("expandBase1") << uri << 8 << 23
+    QTest::newRow("expandBase1") << uri << 9 << 23
                                  << ExpectedCompletions({
                                             { u"width"_s, CompletionItemKind::Field },
                                             { u"foo"_s, CompletionItemKind::Field },
                                     })
                                  << QStringList({ u"import"_s, u"Rectangle"_s });
 
-    QTest::newRow("expandBase2") << uri << 9 << 29
+    QTest::newRow("expandBase2") << uri << 10 << 29
                                  << ExpectedCompletions({
                                             { u"width"_s, CompletionItemKind::Field },
                                             { u"color"_s, CompletionItemKind::Field },
                                     })
                                  << QStringList({ u"foo"_s, u"import"_s, u"Rectangle"_s });
+
+    QTest::newRow("asCompletions")
+            << uri << 17 << 8
+            << ExpectedCompletions({
+                       { u"Rectangle"_s, CompletionItemKind::Field },
+               })
+            << QStringList({ u"foo"_s, u"import"_s, u"lala()"_s, u"width"_s });
 }
 
 void tst_QmllsCompletions::checkCompletions(QByteArray uri, int lineNr, int character,