diff --git a/.idea/inspectionProfiles/idea_default.xml b/.idea/inspectionProfiles/idea_default.xml
index a966e9a196f..3cee5ab2e87 100644
--- a/.idea/inspectionProfiles/idea_default.xml
+++ b/.idea/inspectionProfiles/idea_default.xml
@@ -100,13 +100,8 @@
-
-
-
-
-
diff --git a/idea/formatter/src/org/jetbrains/kotlin/idea/util/FormatterUtil.kt b/idea/formatter/src/org/jetbrains/kotlin/idea/util/FormatterUtil.kt
index 9600b367b92..ef27c908b1c 100644
--- a/idea/formatter/src/org/jetbrains/kotlin/idea/util/FormatterUtil.kt
+++ b/idea/formatter/src/org/jetbrains/kotlin/idea/util/FormatterUtil.kt
@@ -9,7 +9,7 @@ import com.intellij.formatting.ASTBlock
import org.jetbrains.kotlin.idea.core.formatter.KotlinCodeStyleSettings
/*
- * ASTBlock is nullable since 182, this extension was introduced to minimize changes between bunches
+ * ASTBlock.node is nullable, this extension was introduced to minimize changes
*/
fun ASTBlock.requireNode() = node ?: error("ASTBlock.getNode() returned null")
diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDefinitionsManager.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDefinitionsManager.kt
index 06fb97aa6c4..2d0c1bf4075 100644
--- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDefinitionsManager.kt
+++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/script/ScriptDefinitionsManager.kt
@@ -212,15 +212,6 @@ class ScriptDefinitionsManager(private val project: Project) : LazyScriptDefinit
return emptyList()
}
- @Suppress("unused") // used in the 182/as33 bunches
- fun getDefinitionsBy(source: ScriptDefinitionsSource): List = lock.write {
- if (definitions == null) return emptyList() // not loaded yet
-
- if (source !in definitionsBySource) error("Unknown source: ${source::class.java.name}")
-
- return definitionsBySource[source] ?: emptyList()
- }
-
companion object {
fun getInstance(project: Project): ScriptDefinitionsManager =
ServiceManager.getService(project, ScriptDefinitionProvider::class.java) as ScriptDefinitionsManager
diff --git a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/AbstractGradleMultiplatformWizardTest.kt b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/AbstractGradleMultiplatformWizardTest.kt
index aece78e0ca9..dcd13973777 100644
--- a/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/AbstractGradleMultiplatformWizardTest.kt
+++ b/idea/idea-gradle/tests/org/jetbrains/kotlin/gradle/AbstractGradleMultiplatformWizardTest.kt
@@ -45,7 +45,7 @@ import com.intellij.util.containers.ContainerUtil
import com.intellij.util.containers.ContainerUtilRt
import junit.framework.TestCase
import org.jetbrains.kotlin.idea.codeInsight.gradle.GradleImportingTestCase
-import org.jetbrains.kotlin.idea.configuration.*
+import org.jetbrains.kotlin.idea.configuration.KotlinGradleAbstractMultiplatformModuleBuilder
import org.jetbrains.kotlin.utils.PrintingLogger
import org.jetbrains.plugins.gradle.service.execution.GradleExecutionHelper
import org.jetbrains.plugins.gradle.settings.DistributionType
@@ -93,7 +93,7 @@ abstract class AbstractGradleMultiplatformWizardTest : ProjectWizardTestCase {
- return Logger.getFactory().javaClass
-}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractAsyncStackTraceTest.kt b/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractAsyncStackTraceTest.kt
index 39befeccc8c..c90bde6c367 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractAsyncStackTraceTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/debugger/AbstractAsyncStackTraceTest.kt
@@ -16,6 +16,7 @@
package org.jetbrains.kotlin.idea.debugger
+import com.intellij.debugger.engine.AsyncStackTraceProvider
import com.intellij.debugger.engine.JavaValue
import com.intellij.debugger.memory.utils.StackFrameItem
import com.intellij.execution.process.ProcessOutputTypes
@@ -31,9 +32,7 @@ import java.lang.reflect.Modifier
abstract class AbstractAsyncStackTraceTest : KotlinDebuggerTestBase() {
private companion object {
const val MARGIN = " "
-
- // Absent in 182, should be AsyncStackTraceProvider.EP.name
- const val ASYNC_STACKTRACE_EP_NAME = "com.intellij.debugger.asyncStackTraceProvider"
+ val ASYNC_STACKTRACE_EP_NAME = AsyncStackTraceProvider.EP.name
}
protected fun doTest(path: String) {
diff --git a/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/MockUpdateParameterInfoContext.java b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/MockUpdateParameterInfoContext.java
index 660e92d6995..c15e75e5ab2 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/MockUpdateParameterInfoContext.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/MockUpdateParameterInfoContext.java
@@ -117,8 +117,7 @@ public class MockUpdateParameterInfoContext implements UpdateParameterInfoContex
return myFixture.getEditor();
}
- //@Override since 183
- //add `@Override` when BUNCH: 182 is dropped
+ @Override
public boolean isSingleParameterInfo() {
return false;
}