qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qmllint: Consider methods from the current scope as valid IDs 

Change-Id: I71e9e2d5b4623938605d7afbfc79ae5c7d4251fc
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Ulf Hermann 2019-08-16 16:44:06 +02:00
parent 8f5f363ce8
commit c3fa4a2d39
5 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/auto/qml/qmllint/data/MethodInItem.qml Normal file
View File

@ -0,0 +1,5 @@
import QtQml 2.0
QtObject {
function doThings() { console.log("things") }
}

5
tests/auto/qml/qmllint/data/MethodInScope.qml Normal file
View File

@ -0,0 +1,5 @@
import QtQml 2.0
MethodInItem {
Component.onCompleted: doThings()
}

7
tests/auto/qml/qmllint/tst_qmllint.cpp
View File

@ -46,6 +46,7 @@ private Q_SLOTS:
void catchIdentifierNoFalsePositive();
void testUnmatchedSignalHandler();
void uiQml();
void methodInScope();
private:
QString runQmllint(const QString &fileToLint, bool shouldSucceed);
@ -143,6 +144,12 @@ void TestQmllint::uiQml()
QVERIFY(output.isEmpty());
}
void TestQmllint::methodInScope()
{
const QString output = runQmllint("MethodInScope.qml", true);
QVERIFY(output.isEmpty());
}
void TestQmllint::test()
{
QFETCH(QString, filename);

1
tools/qmllint/findunqualified.cpp
View File

@ -274,6 +274,7 @@ FindUnqualifiedIDVisitor::localQmlFile2FakeMetaObject(QString filePath)
auto sourceElement = static_cast<UiSourceElement *>(initMembers->member);
if (FunctionExpression *fexpr = sourceElement->sourceElement->asFunctionDefinition()) {
LanguageUtils::FakeMetaMethod method;
method.setMethodName(fexpr->name.toString());
method.setMethodType(LanguageUtils::FakeMetaMethod::Method);
FormalParameterList *parameters = fexpr->formals;
while (parameters) {

2
tools/qmllint/scopetree.cpp
View File

@ -226,7 +226,7 @@ QMap<QString, LanguageUtils::FakeMetaMethod>const &ScopeTree::methods() const
bool ScopeTree::isIdInCurrentQMlScopes(QString id) const
{
auto qmlScope = getCurrentQMLScope();
return qmlScope->m_currentScopeQMLIdentifiers.contains(id);
return qmlScope->m_currentScopeQMLIdentifiers.contains(id) || qmlScope->m_methods.contains(id);
}
bool ScopeTree::isIdInCurrentJSScopes(QString id) const