diff --git a/src/plugins/qmljseditor/qmljseditor.cpp b/src/plugins/qmljseditor/qmljseditor.cpp index 403591f9650f57ebba1089775873606294983456..c97818933293cbf8638ae13ef60749e1016b8954 100644 --- a/src/plugins/qmljseditor/qmljseditor.cpp +++ b/src/plugins/qmljseditor/qmljseditor.cpp @@ -511,6 +511,33 @@ AST::Node *SemanticInfo::declaringMember(int cursorPosition) const return declaringMember; } +QmlJS::AST::Node *SemanticInfo::declaringMemberNoProperties(int cursorPosition) const +{ + AST::Node *node = declaringMember(cursorPosition); + + if (UiObjectDefinition *objectDefinition = cast<UiObjectDefinition*>(node)) { + QString name = objectDefinition->qualifiedTypeNameId->name->asString(); + if (!name.isNull() && name.at(0).isLower()) { + QList<AST::Node *> path = astPath(cursorPosition); + if (path.size() > 1) + return path.at(path.size() - 2); + } else if (name.contains("GradientStop")) { + QList<AST::Node *> path = astPath(cursorPosition); + if (path.size() > 2) + return path.at(path.size() - 3); + } + } else if (UiObjectBinding *objectBinding = cast<UiObjectBinding*>(node)) { + QString name = objectBinding->qualifiedTypeNameId->name->asString(); + if (name.contains("Gradient")) { + QList<AST::Node *> path = astPath(cursorPosition); + if (path.size() > 1) + return path.at(path.size() - 2); + } + } + + return node; +} + QList<AST::Node *> SemanticInfo::astPath(int cursorPosition) const { QList<AST::Node *> path; diff --git a/src/plugins/qmljseditor/qmljseditor.h b/src/plugins/qmljseditor/qmljseditor.h index 17b7da2a74fc990f77d49bf17aa626ff14aba15d..1517269bb771f4adb173fbc898baa7752d87dcc3 100644 --- a/src/plugins/qmljseditor/qmljseditor.h +++ b/src/plugins/qmljseditor/qmljseditor.h @@ -118,6 +118,7 @@ public: // Returns the declaring member QmlJS::AST::Node *declaringMember(int cursorPosition) const; + QmlJS::AST::Node *declaringMemberNoProperties(int cursorPosition) const; // Returns the AST node under cursor QmlJS::AST::Node *nodeUnderCursor(int cursorPosition) const;