From 9abdddf09aca4e3e557f8d6dfc5c3ed0de9cefd2 Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Tue, 27 Aug 2019 18:59:33 +0300
Subject: [PATCH] Remove psiFile extension after removing 182

 #KT-33536 Fixed
---
 .idea/inspectionProfiles/idea_default.xml          |  1 -
 .../inspections/NamingConventionInspections.kt     |  3 +--
 .../kotlin/idea/util/compat/refElements.kt         | 14 --------------
 3 files changed, 1 insertion(+), 17 deletions(-)
 delete mode 100644 idea/src/org/jetbrains/kotlin/idea/util/compat/refElements.kt

diff --git a/.idea/inspectionProfiles/idea_default.xml b/.idea/inspectionProfiles/idea_default.xml
index 97f0eff3d57..112a2d6649c 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.codeInspection.reference.RefFile#getPsiElement" reason="Absent in 182. Use psiFile extension instead." />
           <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.java.decompiler.main.decompiler.BaseDecompiler#addSpace" reason="Method was replaced with outher methods in 182. Use addSpaceEx instead." />
           <Problem reference="com.intellij.execution.configurations.RunConfigurationBase" reason="Generalized in 183. Use RunConfigurationBaseAny instead in signatures." />
diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/NamingConventionInspections.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/NamingConventionInspections.kt
index 03391449aa4..3bdeebb5d01 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/NamingConventionInspections.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/NamingConventionInspections.kt
@@ -28,7 +28,6 @@ import org.jetbrains.annotations.NonNls
 import org.jetbrains.kotlin.idea.core.packageMatchesDirectoryOrImplicit
 import org.jetbrains.kotlin.idea.quickfix.RenameIdentifierFix
 import org.jetbrains.kotlin.idea.refactoring.isInjectedFragment
-import org.jetbrains.kotlin.idea.util.compat.psiFile
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject
@@ -407,7 +406,7 @@ class PackageNameInspection : BaseGlobalInspection() {
     ): Array<CommonProblemDescriptor>? {
         when (refEntity) {
             is RefFile -> {
-                val psiFile = refEntity.psiFile
+                val psiFile = refEntity.psiElement
                 if (psiFile is KtFile && !psiFile.isInjectedFragment && !psiFile.packageMatchesDirectoryOrImplicit()) {
                     val packageDirective = psiFile.packageDirective
                     if (packageDirective != null) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/util/compat/refElements.kt b/idea/src/org/jetbrains/kotlin/idea/util/compat/refElements.kt
deleted file mode 100644
index 7ed059baa35..00000000000
--- a/idea/src/org/jetbrains/kotlin/idea/util/compat/refElements.kt
+++ /dev/null
@@ -1,14 +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.util.compat
-
-import com.intellij.codeInspection.reference.RefFile
-import com.intellij.psi.PsiFile
-
-// BUNCH: 182
-@Suppress("IncompatibleAPI", "MissingRecentApi")
-val RefFile.psiFile: PsiFile?
-    get() = psiElement
\ No newline at end of file