From e8a821986fb63454afe191ad59532f34aa5f31bc Mon Sep 17 00:00:00 2001
From: Michael Kuzmin <michael.kuzmin@jetbrains.com>
Date: Fri, 20 Dec 2019 16:51:21 +0300
Subject: [PATCH] Build: drop IntelliJ 2018.3 support (KT-35374)

Delete references in code
---
 .bunch                                        |  1 -
 .idea/inspectionProfiles/idea_default.xml     |  1 -
 .../src/main/kotlin/IdeCompatibilityDsl.kt    |  1 -
 .../KotlinCodeBlockModificationListener.kt    |  2 +-
 idea/idea-android/build.gradle.kts            |  9 ++------
 .../KotlinMPPGradleProjectTaskRunnerUtil.kt   |  2 +-
 ...otlinMPPGradleProjectTaskRunnerUtil.kt.191 |  1 -
 ...aRunConfigurationExtensionManagerUtil.java | 19 -----------------
 .../KotlinJUnitRunConfigurationProducer.kt    |  9 +++-----
 .../idea/run/KotlinRunConfiguration.java      |  6 +++---
 .../KotlinTestNgConfigurationProducer.java    |  2 +-
 .../KotlinStandaloneScriptRunConfiguration.kt |  7 +++----
 .../output/InlayScratchOutputHandler.kt       | 12 ++++++-----
 .../PreviewEditorScratchOutputHandler.kt      |  1 +
 .../idea/scratch/output/commandHelper.kt      |  9 --------
 .../kotlin/idea/scratch/output/inlayHelper.kt | 19 -----------------
 .../KotlinMavenArtifactsDownloadScheduler.kt  | 21 -------------------
 .../kotlin/idea/maven/KotlinMavenImporter.kt  |  4 +++-
 .../scratch/AbstractScratchRunActionTest.kt   |  5 +++--
 .../idea/KotlinQuickDocumentationProvider.kt  | 13 ++----------
 .../kotlin/idea/slicer/KotlinSliceProvider.kt |  7 +------
 .../kotlin/idea/slicer/compat/nullability.kt  | 11 ----------
 .../highlighter/AbstractHighlightingTest.java |  3 ++-
 .../idea/highlighter/duplicateHighlighting.kt | 15 -------------
 .../script/AbstractScriptConfigurationTest.kt |  2 --
 .../android-extensions-idea/build.gradle.kts  |  9 ++------
 .../sam-with-receiver-ide/build.gradle.kts    |  4 ----
 27 files changed, 35 insertions(+), 160 deletions(-)
 delete mode 100644 idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/JavaRunConfigurationExtensionManagerUtil.java
 delete mode 100644 idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/commandHelper.kt
 delete mode 100644 idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/inlayHelper.kt
 delete mode 100644 idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenArtifactsDownloadScheduler.kt
 delete mode 100644 idea/src/org/jetbrains/kotlin/idea/slicer/compat/nullability.kt
 delete mode 100644 idea/tests/org/jetbrains/kotlin/idea/highlighter/duplicateHighlighting.kt

diff --git a/.bunch b/.bunch
index 266c1dc3f95..4215d5fdbc1 100644
--- a/.bunch
+++ b/.bunch
@@ -1,7 +1,6 @@
 192
 193
 191
-183_191
 as35_191
 as36
 as40_193
diff --git a/.idea/inspectionProfiles/idea_default.xml b/.idea/inspectionProfiles/idea_default.xml
index 3cee5ab2e87..d18ab3d82aa 100644
--- a/.idea/inspectionProfiles/idea_default.xml
+++ b/.idea/inspectionProfiles/idea_default.xml
@@ -99,7 +99,6 @@
       <option name="problems">
         <list>
           <Problem reference="com.intellij.util.JdomKt#element" reason="Removed in 191" />
-          <Problem reference="com.intellij.execution.JavaRunConfigurationExtensionManager#getInstance" reason="Can't be used in Kotlin, because method was replaced with property after J2K in 183. Use JavaRunConfigurationExtensionManagerUtil instead." />
           <Problem reference="org.jetbrains.kotlin.idea.reporter.ITNReporterCompat#submit" reason="parentComponent is nullable in AS" />
           <Problem reference="com.intellij.diagnostic.ITNReporter#submit" reason="parentComponent is nullable in AS" />
         </list>
diff --git a/buildSrc/src/main/kotlin/IdeCompatibilityDsl.kt b/buildSrc/src/main/kotlin/IdeCompatibilityDsl.kt
index 105f78d1d8c..412bbb504e8 100644
--- a/buildSrc/src/main/kotlin/IdeCompatibilityDsl.kt
+++ b/buildSrc/src/main/kotlin/IdeCompatibilityDsl.kt
@@ -41,7 +41,6 @@ enum class Platform : CompatibilityPredicate {
 }
 
 enum class Ide(val platform: Platform) : CompatibilityPredicate {
-    IJ183(Platform.P183),
     IJ191(Platform.P191),
     IJ192(Platform.P192),
     IJ193(Platform.P193),
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/trackers/KotlinCodeBlockModificationListener.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/trackers/KotlinCodeBlockModificationListener.kt
index 0e6d7a12062..91cb953a929 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/trackers/KotlinCodeBlockModificationListener.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/trackers/KotlinCodeBlockModificationListener.kt
@@ -48,7 +48,7 @@ class KotlinCodeBlockModificationListener(
     @Suppress("UnstableApiUsage")
     private val isLanguageTrackerEnabled = modificationTrackerImpl.isEnableLanguageTrackerCompat
 
-    // BUNCH: 183
+    // BUNCH: 191
     // When there're we no per-language trackers we had to increment global tracker first and process result afterward
     private val customIncrement = if (isLanguageTrackerEnabled) 0 else 1
 
diff --git a/idea/idea-android/build.gradle.kts b/idea/idea-android/build.gradle.kts
index d062e9c8772..9cecebb0e92 100644
--- a/idea/idea-android/build.gradle.kts
+++ b/idea/idea-android/build.gradle.kts
@@ -80,13 +80,8 @@ dependencies {
 }
 
 sourceSets {
-    if (Ide.IJ183()) {
-        "main" { projectDefault() }
-        "test" { projectDefault() }
-    } else {
-        "main" { }
-        "test" { }
-    }
+    "main" { }
+    "test" { }
 }
 
 projectTest(parallel = true) {
diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/gradle/execution/KotlinMPPGradleProjectTaskRunnerUtil.kt b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/gradle/execution/KotlinMPPGradleProjectTaskRunnerUtil.kt
index 48b36f2ee6f..c2a76ab0329 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/gradle/execution/KotlinMPPGradleProjectTaskRunnerUtil.kt
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/gradle/execution/KotlinMPPGradleProjectTaskRunnerUtil.kt
@@ -8,7 +8,7 @@ package org.jetbrains.kotlin.idea.gradle.execution
 import com.intellij.openapi.module.Module
 import org.jetbrains.plugins.gradle.settings.GradleProjectSettings
 
-//BUNCH: 183
+// BUNCH: 191
 fun isDelegatedBuild(module: Module): Boolean {
     val projectUrl = module.project.presentableUrl
     if (projectUrl == null || !GradleProjectSettings.isDelegatedBuildEnabled(module)) {
diff --git a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/gradle/execution/KotlinMPPGradleProjectTaskRunnerUtil.kt.191 b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/gradle/execution/KotlinMPPGradleProjectTaskRunnerUtil.kt.191
index 862b1c10948..0aad7942189 100644
--- a/idea/idea-gradle/src/org/jetbrains/kotlin/idea/gradle/execution/KotlinMPPGradleProjectTaskRunnerUtil.kt.191
+++ b/idea/idea-gradle/src/org/jetbrains/kotlin/idea/gradle/execution/KotlinMPPGradleProjectTaskRunnerUtil.kt.191
@@ -9,7 +9,6 @@ import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil.toCanonica
 import org.jetbrains.plugins.gradle.service.settings.GradleSettingsService
 import com.intellij.openapi.module.Module
 
-//BUNCH: 183
 fun isDelegatedBuild(module: Module): Boolean {
     val projectUrl = module.project.presentableUrl
     if (projectUrl == null || !GradleSettingsService.getInstance(module.project).isDelegatedBuildEnabled(toCanonicalPath(projectUrl))) {
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/JavaRunConfigurationExtensionManagerUtil.java b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/JavaRunConfigurationExtensionManagerUtil.java
deleted file mode 100644
index c0c29bb42c1..00000000000
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/JavaRunConfigurationExtensionManagerUtil.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright 2010-2018 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.run;
-
-import com.intellij.execution.JavaRunConfigurationExtensionManager;
-
-// Introduced for compatibility reasons only.
-// Method JavaRunConfigurationExtensionManager.getInstance() was rewritten to Kotlin in 191 and
-// can't be called from Kotlin anymore.
-// BUNCH: 183
-public class JavaRunConfigurationExtensionManagerUtil {
-    public static JavaRunConfigurationExtensionManager getInstance() {
-        //noinspection IncompatibleAPI
-        return JavaRunConfigurationExtensionManager.getInstance();
-    }
-}
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinJUnitRunConfigurationProducer.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinJUnitRunConfigurationProducer.kt
index 13ac8881dfd..db0e3bce401 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinJUnitRunConfigurationProducer.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinJUnitRunConfigurationProducer.kt
@@ -5,10 +5,7 @@
 
 package org.jetbrains.kotlin.idea.run
 
-import com.intellij.execution.CommonJavaRunConfigurationParameters
-import com.intellij.execution.PsiLocation
-import com.intellij.execution.RunManager
-import com.intellij.execution.RunnerAndConfigurationSettings
+import com.intellij.execution.*
 import com.intellij.execution.actions.ConfigurationContext
 import com.intellij.execution.actions.ConfigurationFromContext
 import com.intellij.execution.actions.RunConfigurationProducer
@@ -110,7 +107,7 @@ class KotlinJUnitRunConfigurationProducer : RunConfigurationProducer<JUnitConfig
         val method = getTestMethod(leaf)
         if (method != null) {
             configuration.beMethodConfiguration(method.toLocation())
-            JavaRunConfigurationExtensionManagerUtil.getInstance().extendCreatedConfiguration(configuration, location)
+            JavaRunConfigurationExtensionManager.instance.extendCreatedConfiguration(configuration, location)
             configuration.setModule(module)
             return true
         }
@@ -118,7 +115,7 @@ class KotlinJUnitRunConfigurationProducer : RunConfigurationProducer<JUnitConfig
         val testClass = getTestClass(leaf)
         if (testClass != null) {
             configuration.beClassConfiguration(testClass)
-            JavaRunConfigurationExtensionManagerUtil.getInstance().extendCreatedConfiguration(configuration, location)
+            JavaRunConfigurationExtensionManager.instance.extendCreatedConfiguration(configuration, location)
             configuration.setModule(module)
             return true
         }
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinRunConfiguration.java b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinRunConfiguration.java
index 1cc85ca8571..a0eed1c90a2 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinRunConfiguration.java
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinRunConfiguration.java
@@ -97,7 +97,7 @@ public class KotlinRunConfiguration extends JetRunConfiguration {
     public SettingsEditor<? extends RunConfiguration> getConfigurationEditor() {
         SettingsEditorGroup<KotlinRunConfiguration> group = new SettingsEditorGroup<KotlinRunConfiguration>();
         group.addEditor(ExecutionBundle.message("run.configuration.configuration.tab.title"), new KotlinRunConfigurationEditor(getProject()));
-        JavaRunConfigurationExtensionManagerUtil.getInstance().appendEditors(this, group);
+        JavaRunConfigurationExtensionManager.getInstance().appendEditors(this, group);
         group.addEditor(ExecutionBundle.message("logs.tab.title"), new LogConfigurationPanel<KotlinRunConfiguration>());
         return group;
     }
@@ -107,7 +107,7 @@ public class KotlinRunConfiguration extends JetRunConfiguration {
         PathMacroManager.getInstance(getProject()).expandPaths(element);
         super.readExternal(element);
 
-        JavaRunConfigurationExtensionManagerUtil.getInstance().readExternal(this, element);
+        JavaRunConfigurationExtensionManager.getInstance().readExternal(this, element);
         DefaultJDOMExternalizer.readExternal(this, element);
 
         readModule(element);
@@ -117,7 +117,7 @@ public class KotlinRunConfiguration extends JetRunConfiguration {
     @Override
     public void writeExternal(Element element) throws WriteExternalException {
         super.writeExternal(element);
-        JavaRunConfigurationExtensionManagerUtil.getInstance().writeExternal(this, element);
+        JavaRunConfigurationExtensionManager.getInstance().writeExternal(this, element);
         DefaultJDOMExternalizer.writeExternal(this, element);
 
         writeModule(element);
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinTestNgConfigurationProducer.java b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinTestNgConfigurationProducer.java
index 48736ce85bd..b9e5dbebec2 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinTestNgConfigurationProducer.java
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/KotlinTestNgConfigurationProducer.java
@@ -216,7 +216,7 @@ public class KotlinTestNgConfigurationProducer extends TestNGConfigurationProduc
         }
         configuration.restoreOriginalModule(originalModule);
         configuration.setName(configuration.getName());
-        JavaRunConfigurationExtensionManagerUtil.getInstance().extendCreatedConfiguration(configuration, location);
+        JavaRunConfigurationExtensionManager.getInstance().extendCreatedConfiguration(configuration, location);
         return true;
     }
 
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/script/standalone/KotlinStandaloneScriptRunConfiguration.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/script/standalone/KotlinStandaloneScriptRunConfiguration.kt
index 4b03667bd94..75ad3429ae3 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/script/standalone/KotlinStandaloneScriptRunConfiguration.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/run/script/standalone/KotlinStandaloneScriptRunConfiguration.kt
@@ -28,7 +28,6 @@ import com.intellij.refactoring.listeners.RefactoringElementAdapter
 import com.intellij.refactoring.listeners.RefactoringElementListener
 import org.jdom.Element
 import org.jetbrains.kotlin.idea.core.script.ScriptConfigurationManager
-import org.jetbrains.kotlin.idea.run.JavaRunConfigurationExtensionManagerUtil
 import org.jetbrains.kotlin.idea.run.KotlinRunConfiguration
 import org.jetbrains.kotlin.idea.run.script.standalone.KotlinStandaloneScriptRunConfigurationProducer.Companion.pathFromPsiElement
 import org.jetbrains.kotlin.idea.util.ProjectRootsUtil.isProjectSourceFile
@@ -113,13 +112,13 @@ class KotlinStandaloneScriptRunConfiguration(
             ExecutionBundle.message("run.configuration.configuration.tab.title"),
             KotlinStandaloneScriptRunConfigurationEditor(project)
         )
-        JavaRunConfigurationExtensionManagerUtil.getInstance().appendEditors(this, group)
+        JavaRunConfigurationExtensionManager.instance.appendEditors(this, group)
         return group
     }
 
     override fun writeExternal(element: Element) {
         super.writeExternal(element)
-        JavaRunConfigurationExtensionManagerUtil.getInstance().writeExternal(this, element)
+        JavaRunConfigurationExtensionManager.instance.writeExternal(this, element)
         DefaultJDOMExternalizer.writeExternal(this, element)
         EnvironmentVariablesComponent.writeExternal(element, getEnvs())
         PathMacroManager.getInstance(project).collapsePathsRecursively(element)
@@ -128,7 +127,7 @@ class KotlinStandaloneScriptRunConfiguration(
     override fun readExternal(element: Element) {
         PathMacroManager.getInstance(project).expandPaths(element)
         super.readExternal(element)
-        JavaRunConfigurationExtensionManagerUtil.getInstance().readExternal(this, element)
+        JavaRunConfigurationExtensionManager.instance.readExternal(this, element)
         DefaultJDOMExternalizer.readExternal(this, element)
         EnvironmentVariablesComponent.readExternal(element, getEnvs())
     }
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/InlayScratchOutputHandler.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/InlayScratchOutputHandler.kt
index eaa3e2888ae..f9431622508 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/InlayScratchOutputHandler.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/InlayScratchOutputHandler.kt
@@ -77,15 +77,16 @@ class InlayScratchOutputHandler(
                 if (shortText != text) {
                     printToToolWindow(file, expression, output)
                 }
-                editor.inlayModel.addInlay(
+                editor.inlayModel.addAfterLineEndElement(
                     lineEndOffset,
+                    false,
                     InlayScratchFileRenderer(" ".repeat(spaceCount) + shortText, output.type)
                 )
             }
 
             val existing = editor.inlayModel
-                .getInlays(lineEndOffset, lineEndOffset)
-                .singleOrNull()
+                .getAfterLineEndElementsInRange(lineEndOffset, lineEndOffset)
+                .singleOrNull { it.renderer is InlayScratchFileRenderer }
             if (existing != null) {
                 existing.dispose()
                 addInlay(((existing.renderer as InlayScratchFileRenderer).text + "; " + output.text).drop(spaceCount))
@@ -111,8 +112,9 @@ class InlayScratchOutputHandler(
 
     private fun clearInlays(editor: TextEditor) {
         TransactionGuard.submitTransaction(editor, Runnable {
-            editor
-                .editor.inlayModel.getInlays(0, editor.editor.document.textLength)
+            editor.editor.inlayModel
+                .getAfterLineEndElementsInRange(0, editor.editor.document.textLength)
+                .filter { it.renderer is InlayScratchFileRenderer }
                 .forEach { Disposer.dispose(it) }
         })
     }
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/PreviewEditorScratchOutputHandler.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/PreviewEditorScratchOutputHandler.kt
index e338b09d60e..0dfe1b03a27 100644
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/PreviewEditorScratchOutputHandler.kt
+++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/PreviewEditorScratchOutputHandler.kt
@@ -9,6 +9,7 @@ import com.intellij.diff.util.DiffUtil
 import com.intellij.openapi.Disposable
 import com.intellij.openapi.application.TransactionGuard
 import com.intellij.openapi.application.runWriteAction
+import com.intellij.openapi.command.executeCommand
 import com.intellij.openapi.editor.Document
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.editor.FoldRegion
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/commandHelper.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/commandHelper.kt
deleted file mode 100644
index 5c044d3c78f..00000000000
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/commandHelper.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.scratch.output
-
-// BUNCH: 183
-inline fun executeCommand(crossinline command: () -> Unit) = com.intellij.openapi.command.executeCommand(command = command)
diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/inlayHelper.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/inlayHelper.kt
deleted file mode 100644
index ee905db71c3..00000000000
--- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/scratch/output/inlayHelper.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-@file:Suppress("UnstableApiUsage")
-
-package org.jetbrains.kotlin.idea.scratch.output
-
-import com.intellij.openapi.editor.InlayModel
-
-// BUNCH: 183
-fun InlayModel.addInlay(offset: Int, renderer: InlayScratchFileRenderer) {
-    addAfterLineEndElement(offset, false, renderer)
-}
-
-// BUNCH: 183
-fun InlayModel.getInlays(start: Int, end: Int) =
-    getAfterLineEndElementsInRange(start, end).filter { it.renderer is InlayScratchFileRenderer }
\ No newline at end of file
diff --git a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenArtifactsDownloadScheduler.kt b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenArtifactsDownloadScheduler.kt
deleted file mode 100644
index ccc4757f1b9..00000000000
--- a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenArtifactsDownloadScheduler.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.maven
-
-import org.jetbrains.concurrency.AsyncPromise
-import org.jetbrains.idea.maven.model.MavenArtifact
-import org.jetbrains.idea.maven.project.MavenProject
-import org.jetbrains.idea.maven.project.MavenProjectsManager
-
-//BUNCH: 183
-fun scheduleArtifactsDownloading(
-    projectsManager: MavenProjectsManager,
-    projects: List<MavenProject>,
-    toBeDownloaded: List<MavenArtifact>
-) {
-    //true, false, AsyncResult()
-    projectsManager.scheduleArtifactsDownloading(projects, toBeDownloaded, true, false, AsyncPromise())
-}
\ No newline at end of file
diff --git a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenImporter.kt b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenImporter.kt
index da696f792ee..08ccf20c594 100644
--- a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenImporter.kt
+++ b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenImporter.kt
@@ -17,6 +17,7 @@ import com.intellij.openapi.roots.libraries.Library
 import com.intellij.util.PathUtil
 import org.jdom.Element
 import org.jdom.Text
+import org.jetbrains.concurrency.AsyncPromise
 import org.jetbrains.idea.maven.importing.MavenImporter
 import org.jetbrains.idea.maven.importing.MavenRootModelAdapter
 import org.jetbrains.idea.maven.model.MavenPlugin
@@ -129,7 +130,8 @@ class KotlinMavenImporter : MavenImporter(KOTLIN_PLUGIN_GROUP_ID, KOTLIN_PLUGIN_
         val toBeDownloaded = artifacts.filter { it.libraryName in libraryNames }
 
         if (toBeDownloaded.isNotEmpty()) {
-            scheduleArtifactsDownloading(MavenProjectsManager.getInstance(module.project), listOf(mavenProject), toBeDownloaded)
+            MavenProjectsManager.getInstance(module.project)
+                .scheduleArtifactsDownloading(listOf(mavenProject), toBeDownloaded, true, false, AsyncPromise())
         }
     }
 
diff --git a/idea/scripting-support/test/org/jetbrains/kotlin/idea/scratch/AbstractScratchRunActionTest.kt b/idea/scripting-support/test/org/jetbrains/kotlin/idea/scratch/AbstractScratchRunActionTest.kt
index 5d000a0bd78..dd719ee385f 100644
--- a/idea/scripting-support/test/org/jetbrains/kotlin/idea/scratch/AbstractScratchRunActionTest.kt
+++ b/idea/scripting-support/test/org/jetbrains/kotlin/idea/scratch/AbstractScratchRunActionTest.kt
@@ -29,7 +29,6 @@ import org.jetbrains.kotlin.idea.scratch.actions.ClearScratchAction
 import org.jetbrains.kotlin.idea.scratch.actions.RunScratchAction
 import org.jetbrains.kotlin.idea.scratch.actions.ScratchCompilationSupport
 import org.jetbrains.kotlin.idea.scratch.output.InlayScratchFileRenderer
-import org.jetbrains.kotlin.idea.scratch.output.getInlays
 import org.jetbrains.kotlin.idea.scratch.ui.KtScratchFileEditorWithPreview
 import org.jetbrains.kotlin.idea.test.KotlinLightProjectDescriptor
 import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor
@@ -200,7 +199,9 @@ abstract class AbstractScratchRunActionTest : FileEditorManagerTestCase() {
     }
 
     protected fun getInlays(start: Int = 0, end: Int = myFixture.file.textLength): List<InlayScratchFileRenderer> {
-        val inlineElementsInRange = myFixture.editor.inlayModel.getInlays(start, end)
+        val inlineElementsInRange = myFixture.editor.inlayModel
+            .getAfterLineEndElementsInRange(start, end)
+            .filter { it.renderer is InlayScratchFileRenderer }
         return inlineElementsInRange.map { it.renderer as InlayScratchFileRenderer }
     }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt b/idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt
index 59a3cb951f2..3e18bfcefee 100644
--- a/idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt
@@ -238,17 +238,8 @@ class KotlinQuickDocumentationProvider : AbstractDocumentationProvider() {
             return renderKotlinDeclaration(element, quickNavigation)
         }
 
-        private fun getText(element: PsiElement, originalElement: PsiElement?, quickNavigation: Boolean): String? {
-            // INRE is already fixed in 191 in CtrlMouseHandler.updateOnPsiChanges(), so after abandoning 183 branch try-catch can be removed.
-            // BUNCH: 183
-            return try {
-                getTextImpl(element, originalElement, quickNavigation)
-            } catch (_: IndexNotReadyException) {
-                DumbService.getInstance(element.project)
-                    .showDumbModeNotification("Element information is not available during index update")
-                null
-            }
-        }
+        private fun getText(element: PsiElement, originalElement: PsiElement?, quickNavigation: Boolean) =
+            getTextImpl(element, originalElement, quickNavigation)
 
         private fun getTextImpl(element: PsiElement, originalElement: PsiElement?, quickNavigation: Boolean): String? {
             if (element is PsiWhiteSpace) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceProvider.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceProvider.kt
index c56cf35d62d..f3ab75ba8b2 100644
--- a/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceProvider.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/slicer/KotlinSliceProvider.kt
@@ -27,7 +27,6 @@ import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptorIfAny
 import org.jetbrains.kotlin.idea.references.KtReference
 import org.jetbrains.kotlin.idea.references.mainReference
-import org.jetbrains.kotlin.idea.slicer.compat.PsiElement_N183_NN191
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.isPlainWithEscapes
 import org.jetbrains.kotlin.psi.psiUtil.parentsWithSelf
@@ -74,11 +73,7 @@ class KotlinSliceProvider : SliceLanguageSupportProvider, SliceUsageTransformer
         return listOf(KotlinSliceUsage(usage.element, usage.parent, 0, false))
     }
 
-    override fun getExpressionAtCaret(atCaret: PsiElement_N183_NN191, dataFlowToThis: Boolean): KtExpression? {
-        // BUNCH: 183
-        @Suppress("SENSELESS_COMPARISON")
-        if (atCaret == null) return null
-
+    override fun getExpressionAtCaret(atCaret: PsiElement, dataFlowToThis: Boolean): KtExpression? {
         val element =
             atCaret.parentsWithSelf
                 .firstOrNull {
diff --git a/idea/src/org/jetbrains/kotlin/idea/slicer/compat/nullability.kt b/idea/src/org/jetbrains/kotlin/idea/slicer/compat/nullability.kt
deleted file mode 100644
index ed5e2f4304a..00000000000
--- a/idea/src/org/jetbrains/kotlin/idea/slicer/compat/nullability.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.slicer.compat
-
-import com.intellij.psi.PsiElement
-
-// BUNCH: 183
-internal typealias PsiElement_N183_NN191 = PsiElement
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractHighlightingTest.java b/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractHighlightingTest.java
index c984dfac1d2..bad30aa36ce 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractHighlightingTest.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/AbstractHighlightingTest.java
@@ -9,6 +9,7 @@ import com.intellij.codeInsight.daemon.impl.DaemonCodeAnalyzerImpl;
 import com.intellij.codeInsight.daemon.impl.HighlightInfo;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.rt.execution.junit.FileComparisonFailure;
+import com.intellij.testFramework.ExpectedHighlightingData;
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase;
 import org.jetbrains.kotlin.test.InTextDirectivesUtils;
 import org.jetbrains.kotlin.test.TagsTestDataUtil;
@@ -53,6 +54,6 @@ public abstract class AbstractHighlightingTest extends KotlinLightCodeInsightFix
             return;
         }
 
-        DuplicateHighlightingKt.expectedDuplicatedHighlighting(runnable);
+        ExpectedHighlightingData.expectedDuplicatedHighlighting(runnable);
     }
 }
diff --git a/idea/tests/org/jetbrains/kotlin/idea/highlighter/duplicateHighlighting.kt b/idea/tests/org/jetbrains/kotlin/idea/highlighter/duplicateHighlighting.kt
deleted file mode 100644
index a9f61360103..00000000000
--- a/idea/tests/org/jetbrains/kotlin/idea/highlighter/duplicateHighlighting.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright 2010-2019 JetBrains s.r.o. and Kotlin Programming Language contributors.
- * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
- */
-
-package org.jetbrains.kotlin.idea.highlighter
-
-import com.intellij.testFramework.ExpectedHighlightingData
-
-// Idea 191 has an additional check for duplicate highlighting
-// BUNCH: 183
-fun expectedDuplicatedHighlighting(runnable: Runnable) {
-    @Suppress("DEPRECATION")
-    ExpectedHighlightingData.expectedDuplicatedHighlighting(runnable)
-}
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt b/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt
index acf5d67bc72..6ca0cbce751 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt
@@ -183,8 +183,6 @@ abstract class AbstractScriptConfigurationTest : KotlinCompletionTestCase() {
         val newModuleDir = runWriteAction { VfsUtil.createDirectoryIfMissing(project.baseDir, name) }
         val newModule = createModuleAt(name, project, JavaModuleType.getModuleType(), newModuleDir.path)
 
-        // Return type was changed, but it's not used. BUNCH: 183
-        @Suppress("MissingRecentApi")
         PsiTestUtil.addSourceContentToRoots(newModule, newModuleDir)
         return newModule
     }
diff --git a/plugins/android-extensions/android-extensions-idea/build.gradle.kts b/plugins/android-extensions/android-extensions-idea/build.gradle.kts
index 59fec1717c5..9957aa64af8 100644
--- a/plugins/android-extensions/android-extensions-idea/build.gradle.kts
+++ b/plugins/android-extensions/android-extensions-idea/build.gradle.kts
@@ -71,13 +71,8 @@ dependencies {
 }
 
 sourceSets {
-    if (Ide.IJ183()) {
-        "main" { projectDefault() }
-        "test" { projectDefault() }
-    } else {
-        "main" { }
-        "test" { }
-    }
+    "main" { }
+    "test" { }
 }
 
 testsJar {}
diff --git a/plugins/sam-with-receiver/sam-with-receiver-ide/build.gradle.kts b/plugins/sam-with-receiver/sam-with-receiver-ide/build.gradle.kts
index 739de553083..3b508628f44 100644
--- a/plugins/sam-with-receiver/sam-with-receiver-ide/build.gradle.kts
+++ b/plugins/sam-with-receiver/sam-with-receiver-ide/build.gradle.kts
@@ -15,10 +15,6 @@ dependencies {
     compileOnly(project(":compiler:frontend.java"))
     compileOnly(project(":idea:idea-core"))
 
-    Ide.IJ183 {
-        compileOnly(project(":idea:idea-android"))
-    }
-
     compileOnly(project(":idea"))
     compileOnly(project(":idea:idea-jvm"))