Merge branch '4.4.0-develop' of github.com:magento/magento2-phpstorm-plugin into pre-release-4.4.0

bohdan-harniuk · bohdan-harniuk · commit 8b1dd8a44704 · 2022-09-08T14:44:01.000+03:00
diff --git a/src/com/magento/idea/magento2plugin/reference/xml/PolyVariantReferenceBase.java b/src/com/magento/idea/magento2plugin/reference/xml/PolyVariantReferenceBase.java
@@ -10,6 +10,7 @@
 import com.intellij.psi.PsiElementResolveResult;
 import com.intellij.psi.PsiPolyVariantReferenceBase;
 import com.intellij.psi.ResolveResult;
+import com.intellij.util.IncorrectOperationException;
 import java.util.Collection;
 import org.jetbrains.annotations.NotNull;
 
@@ -48,4 +49,12 @@ public ResolveResult[] multiResolve(final boolean incompleteCode) {
         }
         return resolveResults;
     }
+
+    @SuppressWarnings("PMD.AvoidUncheckedExceptionsInSignatures")
+    @Override
+    public PsiElement bindToElement(
+            final @NotNull PsiElement element
+    ) throws IncorrectOperationException {
+        return null;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`import com.intellij.psi.PsiElementResolveResult;`
`11`	`11`	`import com.intellij.psi.PsiPolyVariantReferenceBase;`
`12`	`12`	`import com.intellij.psi.ResolveResult;`
	`13`	`+import com.intellij.util.IncorrectOperationException;`
`13`	`14`	`import java.util.Collection;`
`14`	`15`	`import org.jetbrains.annotations.NotNull;`
`15`	`16`
`@@ -48,4 +49,12 @@ public ResolveResult[] multiResolve(final boolean incompleteCode) {`
`48`	`49`	`}`
`49`	`50`	`return resolveResults;`
`50`	`51`	`}`
	`52`	`+`
	`53`	`+ @SuppressWarnings("PMD.AvoidUncheckedExceptionsInSignatures")`
	`54`	`+ @Override`
	`55`	`+ public PsiElement bindToElement(`
	`56`	`+ final @NotNull PsiElement element`
	`57`	`+ ) throws IncorrectOperationException {`
	`58`	`+ return null;`
	`59`	`+ }`
`51`	`60`	`}`