MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-15 02:59:33 +07:00
Code Issues Packages Projects Releases Wiki Activity

IJPL-150165 Fix Groovy tests

Browse Source 
GitOrigin-RevId: db9944a726ea58851636f53361f83218eb831668
This commit is contained in:
Mikhail Filippov
2024-09-02 18:44:06 +04:00
committed by intellij-monorepo-bot
parent 938e70232f
commit 9d12c5dcbb
5 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/InferenceContext.java
View File

@@ -47,5 +47,5 @@ public interface InferenceContext {
}
<T extends GroovyPsiElement>
@Nullable PsiType getExpressionType(@NotNull T element, @NotNull Function<? super T, ? extends PsiType> calculator);
@Nullable PsiType getExpressionType(@NotNull T element, @NotNull Function<? super T, ? extends @Nullable PsiType> calculator);
}

2
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/PartialContext.kt
View File

@@ -56,7 +56,7 @@ internal class PartialContext(private val types: Map<VariableDescriptor, DFAType
}
}
override fun <T : GroovyPsiElement> getExpressionType(element: T, calculator: Function<in T, out PsiType>): PsiType {
override fun <T : GroovyPsiElement> getExpressionType(element: T, calculator: Function<in T, out PsiType?>): PsiType? {
return doGetCachedValue(Pair(element, "type")) {
calculator.apply(element)
}

2
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/TopInferenceContext.kt
View File

@@ -23,7 +23,7 @@ class TopInferenceContext : InferenceContext {
return ResolveCache.getInstance(ref.element.project).resolveWithCaching(ref, resolver, true, incomplete)
}
override fun <T : GroovyPsiElement> getExpressionType(element: T, calculator: Function<in T, out PsiType>): PsiType? {
override fun <T : GroovyPsiElement> getExpressionType(element: T, calculator: Function<in T, out PsiType?>): PsiType? {
return CachedValuesManager.getProjectPsiDependentCache(element, calculator)
}
}

2
plugins/groovy/test/org/jetbrains/plugins/groovy/lang/MissingReturnTest.java
View File

@@ -1,7 +1,6 @@
// Copyright 2000-2024 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.plugins.groovy.lang;
import com.intellij.idea.IJIgnore;
import org.jetbrains.plugins.groovy.LightGroovyTestCase;
import org.jetbrains.plugins.groovy.codeInspection.noReturnMethod.MissingReturnInspection;
import org.jetbrains.plugins.groovy.util.TestUtils;
@@ -24,7 +23,6 @@ public class MissingReturnTest extends LightGroovyTestCase {
public void testMissingReturnTryCatch() { doTest(); }
@IJIgnore(issue = "IJPL-150165")
public void testMissingReturnLastNull() { doTest(); }
public void testMissingReturnImplicitReturns() { doTest(); }

8
plugins/groovy/test/org/jetbrains/plugins/groovy/lang/resolve/TypeInferenceTest.groovy
View File

@@ -1,19 +1,14 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.plugins.groovy.lang.resolve
import com.intellij.idea.IJIgnore
import com.intellij.openapi.util.RecursionManager
import com.intellij.psi.PsiClassType
import com.intellij.psi.PsiElement
import com.intellij.psi.PsiIntersectionType
import com.intellij.psi.PsiReference
import com.intellij.psi.PsiType
import com.intellij.psi.impl.source.PsiImmediateClassType
import groovy.transform.CompileStatic
import org.jetbrains.plugins.groovy.codeInsight.template.postfix.templates.GrArgPostfixTemplate
import org.jetbrains.plugins.groovy.codeStyle.GrReferenceAdjuster
import org.jetbrains.plugins.groovy.lang.psi.GroovyFile
import org.jetbrains.plugins.groovy.lang.psi.api.statements.arguments.GrArgumentLabel
import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrAssignmentExpression
import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrExpression
import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrReferenceExpression
@@ -24,7 +19,6 @@ import org.jetbrains.plugins.groovy.lang.psi.util.PsiUtil
import static com.intellij.psi.CommonClassNames.*
import static org.jetbrains.plugins.groovy.lang.psi.dataFlow.types.NestedContextKt.allowNestedContext
import static org.jetbrains.plugins.groovy.lang.psi.dataFlow.types.NestedContextKt.allowNestedContextOnce
import static org.jetbrains.plugins.groovy.lang.psi.dataFlow.types.NestedContextKt.forbidNestedContext
@CompileStatic
class TypeInferenceTest extends TypeInferenceTestBase {
@@ -1214,7 +1208,6 @@ while (u) {
''', null
}
@IJIgnore(issue = "IJPL-150165")
void 'test no soe cyclic multi-assignment'() {
allowNestedContext(4, testRootDisposable)
doTest '''\
@@ -1978,7 +1971,6 @@ protected void onLoadConfig (Map configSection) {
}""", null
}
@IJIgnore(issue = "IJPL-150165")
void 'test soe with large flow'() {
RecursionManager.disableAssertOnRecursionPrevention(testRootDisposable)
RecursionManager.disableMissedCacheAssertions(testRootDisposable)