diff --git a/.idea/inspectionProfiles/idea_default.xml b/.idea/inspectionProfiles/idea_default.xml
index 35cb410b445..d0b4339f4d1 100644
--- a/.idea/inspectionProfiles/idea_default.xml
+++ b/.idea/inspectionProfiles/idea_default.xml
@@ -98,31 +98,27 @@
@@ -275,6 +271,10 @@
+
+
+
+
@@ -306,16 +306,6 @@
-
-
-
diff --git a/compiler/psi/src/org/jetbrains/kotlin/util/AstLoadingUtil.kt b/compiler/psi/src/org/jetbrains/kotlin/util/AstLoadingUtil.kt
index 6f002f8432f..242c86ca87a 100644
--- a/compiler/psi/src/org/jetbrains/kotlin/util/AstLoadingUtil.kt
+++ b/compiler/psi/src/org/jetbrains/kotlin/util/AstLoadingUtil.kt
@@ -14,7 +14,7 @@ import com.intellij.util.AstLoadingFilter
*
* BUNCH: 182
*/
-@Suppress("IncompatibleAPI")
+@Suppress("IncompatibleAPI", "MissingRecentApi")
object AstLoadingFilter {
@JvmStatic
fun forceAllowTreeLoading(psiFile: PsiFile, computable: ThrowableComputable): T {
diff --git a/compiler/psi/src/org/jetbrains/kotlin/util/AstLoadingUtil.kt.181 b/compiler/psi/src/org/jetbrains/kotlin/util/AstLoadingUtil.kt.181
index c0823d19a01..43c569894bd 100644
--- a/compiler/psi/src/org/jetbrains/kotlin/util/AstLoadingUtil.kt.181
+++ b/compiler/psi/src/org/jetbrains/kotlin/util/AstLoadingUtil.kt.181
@@ -13,7 +13,7 @@ import com.intellij.psi.PsiFile
*
* BUNCH: 182
*/
-@Suppress("IncompatibleAPI")
+@Suppress("IncompatibleAPI", "MissingRecentApi")
object AstLoadingFilter {
@JvmStatic
fun forceAllowTreeLoading(psiFile: PsiFile, computable: ThrowableComputable): T {
diff --git a/compiler/psi/src/org/jetbrains/kotlin/util/AstLoadingUtil.kt.182 b/compiler/psi/src/org/jetbrains/kotlin/util/AstLoadingUtil.kt.182
index bdb4d21676b..f9c8ebcff4c 100644
--- a/compiler/psi/src/org/jetbrains/kotlin/util/AstLoadingUtil.kt.182
+++ b/compiler/psi/src/org/jetbrains/kotlin/util/AstLoadingUtil.kt.182
@@ -14,7 +14,7 @@ import com.intellij.util.AstLoadingFilter
*
* BUNCH: 182
*/
-@Suppress("IncompatibleAPI")
+@Suppress("IncompatibleAPI", "MissingRecentApi")
object AstLoadingFilter {
@JvmStatic
fun forceAllowTreeLoading(psiFile: PsiFile, computable: ThrowableComputable): T {
diff --git a/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinCommonCodeStyleSettings.java b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinCommonCodeStyleSettings.java
index 4735b73400c..2e2b994fd04 100644
--- a/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinCommonCodeStyleSettings.java
+++ b/idea/formatter/src/org/jetbrains/kotlin/idea/formatter/KotlinCommonCodeStyleSettings.java
@@ -207,7 +207,6 @@ public class KotlinCommonCodeStyleSettings extends CommonCodeStyleSettings {
// SoftMargins.serializeInfo
private void serializeInto(@NotNull List softMargins, @NotNull Element element) {
if (softMargins.size() > 0) {
- //noinspection IncompatibleAPI
XmlSerializer.serializeInto(this, element);
}
}
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/compat/psiSearchHelper.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/compat/psiSearchHelper.kt
index eda04aff026..73fb8b360aa 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/compat/psiSearchHelper.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/compat/psiSearchHelper.kt
@@ -9,7 +9,7 @@ import com.intellij.openapi.project.Project
import com.intellij.psi.search.PsiSearchHelper
// BUNCH: 181
-@Suppress("IncompatibleAPI")
+@Suppress("IncompatibleAPI", "MissingRecentApi")
fun psiSearchHelperInstance(project: Project): PsiSearchHelper {
return PsiSearchHelper.getInstance(project)
}
\ No newline at end of file
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/compat/psiSearchHelper.kt.181 b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/compat/psiSearchHelper.kt.181
index 5fc20dc7019..ca937c9d59a 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/compat/psiSearchHelper.kt.181
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/compat/psiSearchHelper.kt.181
@@ -9,7 +9,7 @@ import com.intellij.openapi.project.Project
import com.intellij.psi.search.PsiSearchHelper
// BUNCH: 181
-@Suppress("IncompatibleAPI")
+@Suppress("IncompatibleAPI", "MissingRecentApi")
fun psiSearchHelperInstance(project: Project): PsiSearchHelper {
return PsiSearchHelper.SERVICE.getInstance(project)
}
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/kotlin/idea/formatter/CodeStyleSettingsProviderCompat.java b/idea/src/org/jetbrains/kotlin/idea/formatter/CodeStyleSettingsProviderCompat.java
index ff80f7b9d3f..f3ca2895f09 100644
--- a/idea/src/org/jetbrains/kotlin/idea/formatter/CodeStyleSettingsProviderCompat.java
+++ b/idea/src/org/jetbrains/kotlin/idea/formatter/CodeStyleSettingsProviderCompat.java
@@ -13,7 +13,7 @@ import org.jetbrains.annotations.NotNull;
// Additional method is introduced in 183 instead of deprecated one
// BUNCH: 182
-@SuppressWarnings("IncompatibleAPI")
+@SuppressWarnings({"IncompatibleAPI", "MissingRecentApi"})
public abstract class CodeStyleSettingsProviderCompat extends CodeStyleSettingsProvider {
// Can't use @Override because it's going to be an error in 182
@SuppressWarnings("override")
diff --git a/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinCodeStyleSettingsProvider.java b/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinCodeStyleSettingsProvider.java
index aa7d72b1c45..99d3032b8eb 100644
--- a/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinCodeStyleSettingsProvider.java
+++ b/idea/src/org/jetbrains/kotlin/idea/formatter/KotlinCodeStyleSettingsProvider.java
@@ -61,6 +61,7 @@ public class KotlinCodeStyleSettingsProvider extends CodeStyleSettingsProviderCo
addBlankLinesTab(settings);
addTab(new ImportSettingsPanelWrapper(settings));
+ // BUNCH: 182
//noinspection IncompatibleAPI
for (CodeStyleSettingsProvider provider : CodeStyleSettingsProvider.EXTENSION_POINT_NAME.getExtensions()) {
if (provider.getLanguage() == KotlinLanguage.INSTANCE && !provider.hasSettingsPage()) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/util/compat/refElements.kt b/idea/src/org/jetbrains/kotlin/idea/util/compat/refElements.kt
index 0b379a4ef06..4e02dc00053 100644
--- a/idea/src/org/jetbrains/kotlin/idea/util/compat/refElements.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/util/compat/refElements.kt
@@ -9,6 +9,6 @@ import com.intellij.codeInspection.reference.RefFile
import com.intellij.psi.PsiFile
// BUNCH: 182
-@Suppress("IncompatibleAPI")
+@Suppress("IncompatibleAPI", "MissingRecentApi")
val RefFile.psiFile: PsiFile?
get() = psiElement
\ No newline at end of file
diff --git a/idea/src/org/jetbrains/kotlin/idea/util/compat/refElements.kt.182 b/idea/src/org/jetbrains/kotlin/idea/util/compat/refElements.kt.182
index dacd12701a3..ed1a9bae7f4 100644
--- a/idea/src/org/jetbrains/kotlin/idea/util/compat/refElements.kt.182
+++ b/idea/src/org/jetbrains/kotlin/idea/util/compat/refElements.kt.182
@@ -9,6 +9,6 @@ import com.intellij.codeInspection.reference.RefFile
import com.intellij.psi.PsiFile
// BUNCH: 182
-@Suppress("IncompatibleAPI")
+@Suppress("IncompatibleAPI", "MissingRecentApi")
val RefFile.psiFile: PsiFile?
get() = element
\ 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 404babc043c..608b3d7275f 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/script/AbstractScriptConfigurationTest.kt
@@ -221,7 +221,12 @@ abstract class AbstractScriptConfigurationTest : KotlinCompletionTestCase() {
private fun createTestModuleByName(name: String): Module {
val newModuleDir = runWriteAction { VfsUtil.createDirectoryIfMissing(project.baseDir, name) }
- val newModule = createModuleAt(name, project, JavaModuleType.getModuleType(), newModuleDir.path)
+
+ // BUNCH: 181
+ @Suppress("IncompatibleAPI") 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/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt
index 6fc1259903f..06e7669c08d 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt
@@ -314,6 +314,7 @@ class JavaToKotlinConverter(
}
constructor() {
+ // BUNCH: 181
@Suppress("IncompatibleAPI")
val indicator: ProgressIndicator? = ProgressManager.getInstance().progressIndicator
delegate = indicator ?: EmptyProgressIndicator()