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

QmlJS: Add highlighting for enum usage

Browse Source 
Highlights the enum and its values if valid.

Task-number: QTCREATORBUG-19226
Change-Id: Icca90b0a5d83a4ecdccfe220bcd0a3547b2e6104
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Christian Stenger
2024-04-15 13:10:07 +02:00
parent 1b4f1e5bd7
commit 564fed275e
1 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/plugins/qmljseditor/qmljssemantichighlighter.cpp
View File

@@ -368,6 +368,45 @@ protected:
return false;
}
bool visit(FieldMemberExpression *ast) override
{
// we only support IdentifierExpression.FieldMemberExpression (enum)
const FieldMemberExpression *right = ast;
if (const IdentifierExpression *idExp = cast<IdentifierExpression *>(ast->base)) {
const ObjectValue *scope = nullptr;
const Value *value = m_scopeChain.lookup(idExp->name.toString(), &scope);
if (auto aov = value->asAstObjectValue()) {
const ObjectValue *inObject = nullptr;
const Value *enumValue = aov->lookupMember(right->name.toString(),
m_scopeChain.context(), &inObject);
if (enumValue && enumValue->asNumberValue()) // can we do better?
addUse(right->identifierToken, SemanticHighlighter::FieldType);
}
return true;
}
// or IdentifierExpression.FieldMemberExpression.FieldMemberExpression (enum)
const FieldMemberExpression *it = cast<FieldMemberExpression *>(ast->base);
if (!it)
return true;
const IdentifierExpression *idExp = cast<IdentifierExpression *>(it->base);
if (!idExp)
return true;
const ObjectValue *scope = nullptr;
const Value *value = m_scopeChain.lookup(idExp->name.toString(), &scope);
const ASTObjectValue *aoValue= value->asAstObjectValue();
if (!aoValue)
return true;
if (auto maybeEnum = aoValue->lookupMember(it->name.toString(), m_scopeChain.context())) {
if (const UiEnumValue *enumObject = maybeEnum->asUiEnumValue()) {
addUse(it->identifierToken, SemanticHighlighter::QmlTypeType);
if (enumObject->keys().contains(right->name))
addUse(right->identifierToken, SemanticHighlighter::FieldType);
}
}
return true;
}
bool visit(StringLiteral *ast) override
{
if (ast->value.isEmpty())