From 35fa8efbf3b7d802a18f9e90066b5f44fca17554 Mon Sep 17 00:00:00 2001 From: Vyacheslav Gerasimov Date: Mon, 14 Aug 2017 15:37:26 +0300 Subject: [PATCH] Fix compilation after moving to idea 173 --- .../test/testFramework/mock/MockFileManager.java | 5 +++-- .../KtLightClassForDecompiledDeclaration.kt | 2 +- .../codeInsight/gradle/GradleInspectionTest.kt | 1 - .../debugger/NoStrataPositionManagerHelper.kt | 3 ++- .../maven/AbstractKotlinMavenInspectionTest.kt | 11 ++++++----- .../jetbrains/kotlin/console/ReplOutputHandler.kt | 3 ++- .../parameterInfo/MockParameterInfoUIContext.java | 5 +++++ .../MockUpdateParameterInfoContext.java | 15 +++++++++++++++ 8 files changed, 34 insertions(+), 11 deletions(-) diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/mock/MockFileManager.java b/compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/mock/MockFileManager.java index 3156769b134..2ad7ee66aa8 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/mock/MockFileManager.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/testFramework/mock/MockFileManager.java @@ -30,14 +30,15 @@ import org.jetbrains.annotations.Nullable; import java.util.List; import java.util.Map; +import java.util.concurrent.ConcurrentMap; public class MockFileManager implements FileManager { private final PsiManagerEx myManager; // in mock tests it's LightVirtualFile, they're only alive when they're referenced, // and there can not be several instances representing the same file - private final FactoryMap myViewProviders = new ConcurrentWeakFactoryMap() { + private final ConcurrentMap myViewProviders = new ConcurrentWeakFactoryMap() { @Override - protected Map createMap() { + protected ConcurrentMap createMap() { return ContainerUtil.createConcurrentWeakKeyWeakValueMap(); } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/lightClasses/KtLightClassForDecompiledDeclaration.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/lightClasses/KtLightClassForDecompiledDeclaration.kt index 97bb814c325..f42d0cd0b1e 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/lightClasses/KtLightClassForDecompiledDeclaration.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/lightClasses/KtLightClassForDecompiledDeclaration.kt @@ -33,7 +33,7 @@ class KtLightClassForDecompiledDeclaration( override val kotlinOrigin: KtClassOrObject?, private val file: KtClsFile ) : KtLightClassBase(clsDelegate.manager) { - val fqName = kotlinOrigin?.fqName ?: FqName(clsDelegate.qualifiedName) + val fqName = kotlinOrigin?.fqName ?: FqName(clsDelegate.qualifiedName.orEmpty()) override fun copy() = this diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleInspectionTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleInspectionTest.kt index 92dcaf01b48..f908e7a929d 100644 --- a/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleInspectionTest.kt +++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/idea/codeInsight/gradle/GradleInspectionTest.kt @@ -259,7 +259,6 @@ class GradleInspectionTest : GradleImportingTestCase() { val foundProblems = presentation.problemElements .values - .flatMap { it.toList() } .mapNotNull { it as? ProblemDescriptorBase } .map { it.descriptionTemplate } diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/NoStrataPositionManagerHelper.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/NoStrataPositionManagerHelper.kt index b82231ec367..1b0e8dc5a6e 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/NoStrataPositionManagerHelper.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/NoStrataPositionManagerHelper.kt @@ -54,6 +54,7 @@ import org.jetbrains.kotlin.utils.getOrPutNullable import org.jetbrains.org.objectweb.asm.* import java.io.File import java.util.* +import java.util.concurrent.ConcurrentMap fun isInlineFunctionLineNumber(file: VirtualFile, lineNumber: Int, project: Project): Boolean { if (ProjectRootsUtil.isProjectSourceFile(project, file)) { @@ -118,7 +119,7 @@ class WeakBytecodeDebugInfoStorage : ConcurrentWeakFactoryMap { + override fun createMap(): ConcurrentMap { return ContainerUtil.createConcurrentWeakKeyWeakValueMap() } } diff --git a/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/AbstractKotlinMavenInspectionTest.kt b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/AbstractKotlinMavenInspectionTest.kt index c5fded56e3b..a54e0993932 100644 --- a/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/AbstractKotlinMavenInspectionTest.kt +++ b/idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/AbstractKotlinMavenInspectionTest.kt @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.idea.maven import com.intellij.codeInspection.CommonProblemDescriptor import com.intellij.codeInspection.ProblemDescriptorBase import com.intellij.codeInspection.QuickFix +import com.intellij.codeInspection.reference.RefEntity import com.intellij.ide.highlighter.JavaFileType import com.intellij.openapi.application.ApplicationManager import com.intellij.openapi.application.Result @@ -64,11 +65,11 @@ abstract class AbstractKotlinMavenInspectionTest : MavenImportingTestCase() { val matcher = "".toRegex() val expected = pomText.lines().mapNotNull { matcher.find(it) }.map { SimplifiedProblemDescription(it.groups[2]!!.value.trim(), it.groups[1]!!.value.trim()) } - val actualProblems = - runInspection(inspectionClass, myProject) - .problemElements - .filter { it.key.name == "pom.xml" } - .values + val problemElements = runInspection(inspectionClass, myProject).problemElements + val actualProblems = problemElements + .keys() + .filter { it.name == "pom.xml" } + .map { problemElements.get(it) } .flatMap { it.toList() } .mapNotNull { it as? ProblemDescriptorBase } diff --git a/idea/idea-repl/src/org/jetbrains/kotlin/console/ReplOutputHandler.kt b/idea/idea-repl/src/org/jetbrains/kotlin/console/ReplOutputHandler.kt index 8f5963bf4f6..386e4dffb27 100644 --- a/idea/idea-repl/src/org/jetbrains/kotlin/console/ReplOutputHandler.kt +++ b/idea/idea-repl/src/org/jetbrains/kotlin/console/ReplOutputHandler.kt @@ -21,6 +21,7 @@ import com.intellij.execution.process.ProcessOutputTypes import com.intellij.openapi.util.Key import com.intellij.openapi.util.TextRange import com.intellij.openapi.util.text.StringUtil +import org.jetbrains.annotations.NotNull import org.jetbrains.kotlin.console.actions.logError import org.jetbrains.kotlin.diagnostics.Severity import org.w3c.dom.Element @@ -47,7 +48,7 @@ class ReplOutputHandler( override fun isSilentlyDestroyOnClose() = true - override fun notifyTextAvailable(text: String, key: Key<*>?) { + override fun notifyTextAvailable(text: String, key: Key<*>) { // hide warning about adding test folder to classpath if (text.startsWith("warning: classpath entry points to a non-existent location")) return diff --git a/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/MockParameterInfoUIContext.java b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/MockParameterInfoUIContext.java index 0fe69d29d45..ea8503d6535 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/MockParameterInfoUIContext.java +++ b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/MockParameterInfoUIContext.java @@ -68,6 +68,11 @@ public class MockParameterInfoUIContext implements ParameterInfoUIContext { return myParameterOwner; } + @Override + public boolean isSingleParameterInfo() { + return false; + } + @Override public Color getDefaultParameterColor() { return null; diff --git a/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/MockUpdateParameterInfoContext.java b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/MockUpdateParameterInfoContext.java index fdee5439b1c..dd4ca74b3f8 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/MockUpdateParameterInfoContext.java +++ b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/MockUpdateParameterInfoContext.java @@ -86,6 +86,21 @@ public class MockUpdateParameterInfoContext implements UpdateParameterInfoContex return ArrayUtil.EMPTY_OBJECT_ARRAY; } + @Override + public boolean isPreservedOnHintHidden() { + return false; + } + + @Override + public void setPreservedOnHintHidden(boolean value) { + + } + + @Override + public boolean isInnermostContext() { + return false; + } + @Override public Project getProject() { return null;