feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Resolve the `import' directives.

Browse Source 
Yet another quick and dirty hack while waiting for the real binding pass.
This commit is contained in:
Roberto Raggi
2010-01-25 17:13:04 +01:00
parent 45cc9df8a2
commit 0969f3b85f
2 changed files with 46 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/plugins/qmljseditor/qmlcodecompletion.cpp
View File

@@ -44,6 +44,7 @@
#include <QtCore/QFile> #include <QtCore/QFile>
#include <QtCore/QFileInfo> #include <QtCore/QFileInfo>
#include <QtCore/QDir>
#include <QtCore/QXmlStreamReader> #include <QtCore/QXmlStreamReader>
#include <QtCore/QDebug> #include <QtCore/QDebug>
@@ -130,8 +131,18 @@ static Interpreter::ObjectValue *newComponent(Interpreter::Engine *engine, const
for (AST::UiObjectMemberList *it = def->initializer->members; it; it = it->next) { for (AST::UiObjectMemberList *it = def->initializer->members; it; it = it->next) {
if (AST::UiPublicMember *prop = AST::cast<AST::UiPublicMember *>(it->member)) { if (AST::UiPublicMember *prop = AST::cast<AST::UiPublicMember *>(it->member)) {
if (prop->name && prop->memberType) { if (prop->name && prop->memberType) {
//qDebug() << "add property:" << prop->name->asString(); const QString propName = prop->name->asString();
object->setProperty(prop->name->asString(), engine->undefinedValue()); const QString propType = prop->memberType->asString();
// ### generalize
if (propType == QLatin1String("string") || propType == QLatin1String("url"))
object->setProperty(propName, engine->stringValue());
else if (propType == QLatin1String("bool"))
object->setProperty(propName, engine->booleanValue());
else if (propType == QLatin1String("int") || propType == QLatin1String("real"))
object->setProperty(propName, engine->numberValue());
else
object->setProperty(propName, engine->undefinedValue());
} }
} }
} }
@@ -684,6 +695,29 @@ bool QmlCodeCompletion::triggersCompletion(TextEditor::ITextEditable *editor)
return false; return false;
} }
bool QmlCodeCompletion::isImported(Document::Ptr doc, const QString &currentFilePath) const
{
if (! (doc && doc->qmlProgram()))
return false;
QFileInfo fileInfo(doc->fileName());
const QString absolutePath = fileInfo.absolutePath();
for (AST::UiImportList *it = doc->qmlProgram()->imports; it; it = it->next) {
if (! (it->import && it->import->fileName))
continue;
QString path = absolutePath;
path += QLatin1Char('/');
path += it->import->fileName->asString();
path = QDir::cleanPath(path);
if (path == currentFilePath)
return true;
}
return false;
}
int QmlCodeCompletion::startCompletion(TextEditor::ITextEditable *editor) int QmlCodeCompletion::startCompletion(TextEditor::ITextEditable *editor)
{ {
m_editor = editor; m_editor = editor;
@@ -718,14 +752,16 @@ int QmlCodeCompletion::startCompletion(TextEditor::ITextEditable *editor)
foreach (Document::Ptr doc, snapshot) { foreach (Document::Ptr doc, snapshot) {
const QFileInfo fileInfo(doc->fileName()); const QFileInfo fileInfo(doc->fileName());
const QString absolutePath = fileInfo.absolutePath();
// ### generalize
if (fileInfo.suffix() != QLatin1String("qml")) if (fileInfo.suffix() != QLatin1String("qml"))
continue; continue;
else if (fileInfo.absolutePath() != currentFilePath) // ### FIXME include `imported' components else if (absolutePath != currentFilePath && ! isImported(qmlDocument, absolutePath))
continue; continue;
const QString typeName = fileInfo.baseName(); const QString typeName = fileInfo.baseName();
if (typeName.isEmpty()) if (typeName.isEmpty() || ! typeName.at(0).isUpper())
continue; continue;
userComponents.insert(typeName, doc); userComponents.insert(typeName, doc);
@@ -733,10 +769,12 @@ int QmlCodeCompletion::startCompletion(TextEditor::ITextEditable *editor)
foreach (Document::Ptr doc, snapshot) { foreach (Document::Ptr doc, snapshot) {
const QFileInfo fileInfo(doc->fileName()); const QFileInfo fileInfo(doc->fileName());
const QString absolutePath = fileInfo.absolutePath();
// ### generalize
if (fileInfo.suffix() != QLatin1String("qml")) if (fileInfo.suffix() != QLatin1String("qml"))
continue; continue;
else if (fileInfo.absolutePath() != currentFilePath) // ### FIXME include `imported' components else if (absolutePath != currentFilePath && ! isImported(qmlDocument, absolutePath))
continue; continue;
QMapIterator<QString, IdSymbol *> it(doc->ids()); QMapIterator<QString, IdSymbol *> it(doc->ids());
@@ -784,7 +822,7 @@ int QmlCodeCompletion::startCompletion(TextEditor::ITextEditable *editor)
const QString propType = prop->memberType->asString(); const QString propType = prop->memberType->asString();
// ### TODO: generalize // ### TODO: generalize
if (propType == QLatin1String("string")) if (propType == QLatin1String("string") || propType == QLatin1String("url"))
interp.globalObject()->setProperty(propName, interp.stringValue()); interp.globalObject()->setProperty(propName, interp.stringValue());
else if (propType == QLatin1String("bool")) else if (propType == QLatin1String("bool"))
interp.globalObject()->setProperty(propName, interp.booleanValue()); interp.globalObject()->setProperty(propName, interp.booleanValue());

2
src/plugins/qmljseditor/qmlcodecompletion.h
View File

@@ -31,6 +31,7 @@
#define QMLCODECOMPLETION_H #define QMLCODECOMPLETION_H
#include <qmljs/qmljstypesystem.h> #include <qmljs/qmljstypesystem.h>
#include <qmljs/qmljsdocument.h>
#include <texteditor/icompletioncollector.h> #include <texteditor/icompletioncollector.h>
#include <QtCore/QDateTime> #include <QtCore/QDateTime>
#include <QtCore/QPointer> #include <QtCore/QPointer>
@@ -70,6 +71,7 @@ public:
private: private:
void updateSnippets(); void updateSnippets();
bool isImported(QmlJS::Document::Ptr doc, const QString &currentFilePath) const;
QmlModelManagerInterface *m_modelManager; QmlModelManagerInterface *m_modelManager;
TextEditor::ITextEditable *m_editor; TextEditor::ITextEditable *m_editor;