Skip to content

Commit df97f61

Browse files
committed
Fixed test
1 parent bb501c7 commit df97f61

File tree

2 files changed

+23
-7
lines changed

2 files changed

+23
-7
lines changed

testData/reference/xml/ObserverReferenceRegistrar/observerNameMustHaveReference/events.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
1010
<event name="test_event_in_test_class">
11-
<observer name="test_obs<caret>erver" disabled="true"/>
11+
<observer name="test_observer<caret>" disabled="true"/>
1212
</event>
1313
</config>

tests/com/magento/idea/magento2plugin/reference/BaseReferenceTestCase.java

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,29 @@ protected void setUp() throws Exception {
3939
protected void assertHasReferenceToXmlAttributeValue(final String reference) {
4040
final PsiElement element = getElementFromCaret();
4141
for (final PsiReference psiReference: element.getReferences()) {
42-
final PsiElement resolved = psiReference.resolve();
43-
if (!(resolved instanceof XmlAttributeValue)) {
44-
continue;
45-
}
42+
if (psiReference instanceof PolyVariantReferenceBase) {
43+
final ResolveResult[] resolveResults
44+
= ((PolyVariantReferenceBase) psiReference).multiResolve(true);
4645

47-
if (((XmlAttributeValue) resolved).getValue().equals(reference)) {
48-
return;
46+
for (final ResolveResult resolveResult : resolveResults) {
47+
final PsiElement resolved = resolveResult.getElement();
48+
if (!(resolved instanceof XmlAttributeValue)) {
49+
continue;
50+
}
51+
52+
if (((XmlAttributeValue) resolved).getValue().equals(reference)) {
53+
return;
54+
}
55+
}
56+
} else {
57+
final PsiElement resolved = psiReference.resolve();
58+
if (!(resolved instanceof XmlAttributeValue)) {
59+
continue;
60+
}
61+
62+
if (((XmlAttributeValue) resolved).getValue().equals(reference)) {
63+
return;
64+
}
4965
}
5066
}
5167
final String referenceNotFound =

0 commit comments

Comments
 (0)