Remove psiFile extension after removing 182
#KT-33536 Fixed
This commit is contained in:
-1
@@ -99,7 +99,6 @@
|
|||||||
<option name="problems">
|
<option name="problems">
|
||||||
<list>
|
<list>
|
||||||
<Problem reference="com.intellij.util.JdomKt#element" reason="Removed in 191" />
|
<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="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="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." />
|
<Problem reference="com.intellij.execution.configurations.RunConfigurationBase" reason="Generalized in 183. Use RunConfigurationBaseAny instead in signatures." />
|
||||||
|
|||||||
@@ -28,7 +28,6 @@ import org.jetbrains.annotations.NonNls
|
|||||||
import org.jetbrains.kotlin.idea.core.packageMatchesDirectoryOrImplicit
|
import org.jetbrains.kotlin.idea.core.packageMatchesDirectoryOrImplicit
|
||||||
import org.jetbrains.kotlin.idea.quickfix.RenameIdentifierFix
|
import org.jetbrains.kotlin.idea.quickfix.RenameIdentifierFix
|
||||||
import org.jetbrains.kotlin.idea.refactoring.isInjectedFragment
|
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.lexer.KtTokens
|
||||||
import org.jetbrains.kotlin.psi.*
|
import org.jetbrains.kotlin.psi.*
|
||||||
import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject
|
import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject
|
||||||
@@ -407,7 +406,7 @@ class PackageNameInspection : BaseGlobalInspection() {
|
|||||||
): Array<CommonProblemDescriptor>? {
|
): Array<CommonProblemDescriptor>? {
|
||||||
when (refEntity) {
|
when (refEntity) {
|
||||||
is RefFile -> {
|
is RefFile -> {
|
||||||
val psiFile = refEntity.psiFile
|
val psiFile = refEntity.psiElement
|
||||||
if (psiFile is KtFile && !psiFile.isInjectedFragment && !psiFile.packageMatchesDirectoryOrImplicit()) {
|
if (psiFile is KtFile && !psiFile.isInjectedFragment && !psiFile.packageMatchesDirectoryOrImplicit()) {
|
||||||
val packageDirective = psiFile.packageDirective
|
val packageDirective = psiFile.packageDirective
|
||||||
if (packageDirective != null) {
|
if (packageDirective != 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
|
|
||||||
Reference in New Issue
Block a user