File tree Expand file tree Collapse file tree 2 files changed +21
-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 +21
-14
lines changed Original file line number Diff line number Diff line change @@ -18,30 +18,33 @@ 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 (
24+ final PsiElement element ,
25+ final Collection <? extends PsiElement > targets
26+ ) {
2427 super (element );
2528 this .targets = targets ;
2629 }
2730
2831 public PolyVariantReferenceBase (
29- PsiElement element ,
30- TextRange range ,
31- Collection <? extends PsiElement > targets
32+ final PsiElement element ,
33+ final TextRange range ,
34+ final Collection <? extends PsiElement > targets
3235 ) {
3336 super (element , range );
3437 this .targets = targets ;
3538 }
3639
3740 @ NotNull
3841 @ Override
39- public ResolveResult [] multiResolve (boolean incompleteCode ) {
42+ public ResolveResult [] multiResolve (final boolean incompleteCode ) {
4043 ResolveResult [] resolveResults = new ResolveResult [targets .size ()];
4144
42- int i = 0 ;
43- for (PsiElement target : targets ) {
44- resolveResults [i ++] = new PsiElementResolveResult (target );
45+ int index = 0 ;
46+ for (final PsiElement target : targets ) {
47+ resolveResults [index ++] = new PsiElementResolveResult (target );//NOPMD
4548 }
4649 return resolveResults ;
4750 }
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