File tree Expand file tree Collapse file tree 2 files changed +18
-14
lines changed
src/com/magento/idea/magento2plugin/reference/xml
tests/com/magento/idea/magento2plugin/reference Expand file tree Collapse file tree 2 files changed +18
-14
lines changed Original file line number Diff line number Diff line change @@ -18,30 +18,30 @@ public class PolyVariantReferenceBase extends PsiPolyVariantReferenceBase<PsiEle
1818 /**
1919 * Target elements.
2020 */
21- private Collection <? extends PsiElement > targets ;
21+ private final Collection <? extends PsiElement > targets ;
2222
23- public PolyVariantReferenceBase (PsiElement element , Collection <? extends PsiElement > targets ) {
23+ public PolyVariantReferenceBase (final PsiElement element , final Collection <? extends PsiElement > targets ) {
2424 super (element );
2525 this .targets = targets ;
2626 }
2727
2828 public PolyVariantReferenceBase (
29- PsiElement element ,
30- TextRange range ,
31- Collection <? extends PsiElement > targets
29+ final PsiElement element ,
30+ final TextRange range ,
31+ final Collection <? extends PsiElement > targets
3232 ) {
3333 super (element , range );
3434 this .targets = targets ;
3535 }
3636
3737 @ NotNull
3838 @ Override
39- public ResolveResult [] multiResolve (boolean incompleteCode ) {
39+ public ResolveResult [] multiResolve (final boolean incompleteCode ) {
4040 ResolveResult [] resolveResults = new ResolveResult [targets .size ()];
4141
42- int i = 0 ;
43- for (PsiElement target : targets ) {
44- resolveResults [i ++] = new PsiElementResolveResult (target );
42+ int index = 0 ;
43+ for (final PsiElement target : targets ) {
44+ resolveResults [index ++] = new PsiElementResolveResult (target );
4545 }
4646 return resolveResults ;
4747 }
Original file line number Diff line number Diff line change @@ -168,12 +168,16 @@ protected void assertHasReferencetoConstructorParameter(
168168 fail (referenceNotFound );
169169 }
170170
171- String parameterClassFqn = ((Parameter ) reference .resolve ())
171+ final String parameterClassFqn = ((Parameter ) reference .resolve ())
172172 .getLocalType ().toStringResolved ();
173- String parameterName = ((Parameter ) reference .resolve ()).getName ();
174-
175- assertEquals (parameterClassFqn , argumentClassFqn );
176- assertEquals (parameterName , argumentName );
173+ final String parameterName = ((Parameter ) reference .resolve ()).getName ();
174+
175+ assertEquals ("Class name in argument equals class name in parameter" ,
176+ parameterClassFqn ,
177+ argumentClassFqn );
178+ assertEquals ("Variable name in argument equals variable name in parameter" ,
179+ parameterName ,
180+ argumentName );
177181 }
178182
179183 protected void assertEmptyReference () {
You can’t perform that action at this time.
0 commit comments