Revert "[light classes] drop old light classes and backend: iteration #12"

This reverts commit 36d1eef6fe.
This commit is contained in:
Dmitry Gridin
2022-06-28 13:52:06 +02:00
parent 36d1eef6fe
commit 732a08f0df
8 changed files with 170 additions and 97 deletions
@@ -9,6 +9,7 @@ import com.intellij.openapi.project.Project
import com.intellij.openapi.util.Condition
import com.intellij.openapi.util.Conditions
import com.intellij.openapi.util.TextRange
import com.intellij.psi.search.GlobalSearchScope
import com.intellij.psi.util.PsiTreeUtil
import com.intellij.util.containers.ContainerUtil
import org.jetbrains.kotlin.checkers.BaseDiagnosticsTest.TestFile
@@ -329,12 +330,10 @@ abstract class BaseDiagnosticsTest : KotlinMultiFileTestWithJava<TestModule, Tes
return
}
val message = "Unexpected ${diagnostic.description}${
PsiDiagnosticUtils.atLocation(
ktFile,
TextRange(actualStart, actualEnd)
)
}"
val message = "Unexpected ${diagnostic.description}${PsiDiagnosticUtils.atLocation(
ktFile,
TextRange(actualStart, actualEnd)
)}"
System.err.println(message)
ok[0] = false
}
@@ -376,8 +375,8 @@ abstract class BaseDiagnosticsTest : KotlinMultiFileTestWithJava<TestModule, Tes
val diagnostics = getJvmSignatureDiagnostics(
declaration,
bindingContext.diagnostics,
GlobalSearchScope.allScope(project)
) ?: continue
jvmSignatureDiagnostics.addAll(diagnostics.forElement(declaration).map { ActualDiagnostic(it, null, newInferenceEnabled) })
}
return jvmSignatureDiagnostics
@@ -491,7 +490,6 @@ abstract class BaseDiagnosticsTest : KotlinMultiFileTestWithJava<TestModule, Tes
}
condition = newCondition
}
"+" -> condition = Conditions.or(condition, newCondition)
"-" -> condition = Conditions.and(condition, Conditions.not(newCondition))
}