From 68a8b6a663310333c4a2d7ea175fcfbb513c45b8 Mon Sep 17 00:00:00 2001
From: Roberto Raggi <roberto.raggi@nokia.com>
Date: Fri, 22 Jan 2010 09:37:44 +0100
Subject: [PATCH] Show in the completion box only the visible IDs.
---
src/plugins/qmljseditor/qmlcodecompletion.cpp | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/plugins/qmljseditor/qmlcodecompletion.cpp b/src/plugins/qmljseditor/qmlcodecompletion.cpp
index 3eecc54431d..4123ab0f042 100644
--- a/src/plugins/qmljseditor/qmlcodecompletion.cpp
+++ b/src/plugins/qmljseditor/qmlcodecompletion.cpp
@@ -243,12 +243,18 @@ int QmlCodeCompletion::startCompletion(TextEditor::ITextEditable *editor)
return -1;
}
+ const QFileInfo currentFileInfo(qmlDocument->fileName());
+ const QString currentFilePath = currentFileInfo.absolutePath();
+
const QIcon typeIcon = iconForColor(Qt::yellow);
foreach (QmlJS::Document::Ptr doc, snapshot) {
const QFileInfo fileInfo(doc->fileName());
+
if (fileInfo.suffix() != QLatin1String("qml"))
continue;
+ else if (fileInfo.absolutePath() != currentFilePath) // ### FIXME includ `imported' components
+ continue;
const QString typeName = fileInfo.baseName();
if (typeName.isEmpty())
--
GitLab