MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

JUnit5MalformedParameterizedInspection: use StreamApiUtil#getStreamElementType

Browse Source
This commit is contained in:
Tagir Valeev
2018-03-05 16:35:33 +07:00
parent a8c7b83388
commit 874011da51
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/junit/src/com/intellij/execution/junit/codeInsight/JUnit5MalformedParameterizedInspection.kt
+3 -6
View File
@@ -27,6 +27,7 @@ import com.intellij.psi.util.PsiUtil
import com.intellij.psi.util.TypeConversionUtil
import com.siyeh.InspectionGadgetsBundle
import com.siyeh.ig.junit.JUnitCommonClassNames
import com.siyeh.ig.psiutils.StreamApiUtil
import com.siyeh.ig.psiutils.TestUtils
import org.jetbrains.annotations.Nls
import java.util.*
@@ -185,7 +186,7 @@ class JUnit5MalformedParameterizedInspection : AbstractBaseJavaLocalInspectionTo
sourceProviderName: String) {
var createFix: CreateMethodQuickFix? = null
if (holder.isOnTheFly) {
val staticModifier = if (!TestUtils.testInstancePerClass(containingClass)) " static" else "";
val staticModifier = if (!TestUtils.testInstancePerClass(containingClass)) " static" else ""
createFix = CreateMethodQuickFix.createFix(containingClass,
"private$staticModifier Object[][] $sourceProviderName()",
"return new Object[][] {};")
@@ -272,11 +273,7 @@ class JUnit5MalformedParameterizedInspection : AbstractBaseJavaLocalInspectionTo
return collectionItemType
}
if (InheritanceUtil.isInheritor(returnType, CommonClassNames.JAVA_UTIL_STREAM_INT_STREAM)) return PsiType.INT
if (InheritanceUtil.isInheritor(returnType, CommonClassNames.JAVA_UTIL_STREAM_LONG_STREAM)) return PsiType.LONG
if (InheritanceUtil.isInheritor(returnType, CommonClassNames.JAVA_UTIL_STREAM_DOUBLE_STREAM)) return PsiType.DOUBLE
val streamItemType = PsiUtil.substituteTypeParameter(returnType, CommonClassNames.JAVA_UTIL_STREAM_STREAM, 0, true)
val streamItemType = StreamApiUtil.getStreamElementType(returnType)
if (streamItemType != null) {
return streamItemType
}