diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java index 94cdad977f5..64a3cd7d6d8 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java @@ -43,6 +43,7 @@ import org.jetbrains.kotlin.load.java.descriptors.JavaCallableMemberDescriptor; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils; import org.jetbrains.kotlin.resolve.DescriptorUtils; @@ -321,7 +322,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen { if (specifier instanceof JetDelegatorToSuperClass || specifier instanceof JetDelegatorToSuperCall) { JetType superType = bindingContext.get(BindingContext.TYPE, specifier.getTypeReference()); assert superType != null : - String.format("No type recorded for \n---\n%s\n---\n", JetPsiUtil.getElementTextWithContext(specifier)); + String.format("No type recorded for \n---\n%s\n---\n", PsiUtilPackage.getElementTextWithContext(specifier)); ClassifierDescriptor classifierDescriptor = superType.getConstructor().getDeclarationDescriptor(); if (!(classifierDescriptor instanceof ClassDescriptor)) continue; diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java index dec44435b88..b664ad0694e 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/PropertyCodegen.java @@ -28,6 +28,7 @@ import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.load.java.JvmAbi; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.DescriptorFactory; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; @@ -373,7 +374,7 @@ public class PropertyCodegen { } } - throw new IllegalStateException("Delegated property not found in its parent: " + JetPsiUtil.getElementTextWithContext(property)); + throw new IllegalStateException("Delegated property not found in its parent: " + PsiUtilPackage.getElementTextWithContext(property)); } diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java index 9faa4f7012f..3094376df33 100644 --- a/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java +++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/binding/CodegenBinding.java @@ -25,14 +25,13 @@ import org.jetbrains.kotlin.codegen.SamType; import org.jetbrains.kotlin.codegen.state.GenerationState; import org.jetbrains.kotlin.codegen.when.WhenByEnumsMapping; import org.jetbrains.kotlin.descriptors.*; -import org.jetbrains.kotlin.descriptors.impl.AnonymousFunctionDescriptor; import org.jetbrains.kotlin.descriptors.impl.ClassDescriptorImpl; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingTrace; -import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; import org.jetbrains.kotlin.resolve.scopes.JetScope; import org.jetbrains.kotlin.util.slicedMap.BasicWritableSlice; import org.jetbrains.kotlin.util.slicedMap.Slices; @@ -197,7 +196,7 @@ public class CodegenBinding { public static void registerClassNameForScript(@NotNull BindingTrace trace, @NotNull JetScript script, @NotNull Type asmType) { ScriptDescriptor descriptor = trace.getBindingContext().get(SCRIPT, script); if (descriptor == null) { - throw new IllegalStateException("Script descriptor is not found for PSI: " + JetPsiUtil.getElementTextWithContext(script)); + throw new IllegalStateException("Script descriptor is not found for PSI: " + PsiUtilPackage.getElementTextWithContext(script)); } String simpleName = asmType.getInternalName().substring(asmType.getInternalName().lastIndexOf('/') + 1); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedFunction.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedFunction.java index 11e4de3d800..76220f1da6e 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedFunction.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetNamedFunction.java @@ -26,6 +26,7 @@ import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.lexer.JetTokens; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; import org.jetbrains.kotlin.psi.stubs.KotlinFunctionStub; import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes; import org.jetbrains.kotlin.psi.typeRefHelpers.TypeRefHelpersPackage; @@ -80,7 +81,7 @@ public class JetNamedFunction extends JetTypeParameterListOwnerStub() { - @Override - public boolean value(PsiElement parentCandidate) { - return parentCandidate != null && parentCandidate.getParent() instanceof PsiFile; - } - }); - - assert inFileParent != null : "For non-file element we should always be able to find parent in file children"; - - int startContextOffset = inFileParent.getTextRange().getStartOffset(); - int elementContextOffset = element.getTextRange().getStartOffset(); - - int inFileParentOffset = elementContextOffset - startContextOffset; - - return new StringBuilder(inFileParent.getText()) - .insert(inFileParentOffset, "") - .insert(0, String.format("File name: %s\n", element.getContainingFile().getName())) - .toString(); - } - @Nullable public static JetModifierList replaceModifierList(@NotNull JetModifierListOwner owner, @Nullable JetModifierList modifierList) { JetModifierList oldModifierList = owner.getModifierList(); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetQualifiedExpressionImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetQualifiedExpressionImpl.kt index 4d3a277e203..e10d716a07f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetQualifiedExpressionImpl.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetQualifiedExpressionImpl.kt @@ -37,7 +37,7 @@ object JetQualifiedExpressionImpl { } public fun JetQualifiedExpression.getReceiverExpression(): JetExpression { - return getExpression(false) ?: throw AssertionError("No receiver found: ${JetPsiUtil.getElementTextWithContext(this)}") + return getExpression(false) ?: throw AssertionError("No receiver found: ${getElementTextWithContext()}") } public fun JetQualifiedExpression.getSelectorExpression(): JetExpression? { diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/jetPsiUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/jetPsiUtil.kt index 80568f2ba18..64e87c1774f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/jetPsiUtil.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/jetPsiUtil.kt @@ -36,6 +36,7 @@ import org.jetbrains.kotlin.psi.stubs.KotlinClassOrObjectStub import org.jetbrains.kotlin.types.expressions.OperatorConventions import org.jetbrains.kotlin.diagnostics.DiagnosticUtils import com.intellij.lang.ASTNode +import com.intellij.openapi.util.Condition import com.intellij.psi.PsiWhiteSpace import com.intellij.psi.PsiComment import org.jetbrains.kotlin.resolve.calls.CallTransformer.CallForImplicitInvoke @@ -491,3 +492,23 @@ fun JetNamedDeclaration.getValueParameterList(): JetParameterList? { else -> null } } + +public fun PsiElement.getElementTextWithContext(): String { + if (this is PsiFile) { + return getContainingFile().getText() + } + + // Find parent for element among file children + val topLevelElement = PsiTreeUtil.findFirstParent(this, { it.getParent() is PsiFile }) ?: + throw AssertionError("For non-file element we should always be able to find parent in file children") + + val startContextOffset = topLevelElement.getTextRange().getStartOffset() + val elementContextOffset = getTextRange().getStartOffset() + + val inFileParentOffset = elementContextOffset - startContextOffset + + return StringBuilder(topLevelElement.getText()) + .insert(inFileParentOffset, "") + .insert(0, "File name: ${getContainingFile().getName()}\n") + .toString() +} diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java index ba8bb02c4e3..80cb218b4b6 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java @@ -35,6 +35,7 @@ import org.jetbrains.kotlin.lexer.JetTokens; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.kotlin.resolve.constants.CompileTimeConstant; import org.jetbrains.kotlin.resolve.constants.IntegerValueTypeConstant; @@ -1109,7 +1110,7 @@ public class DescriptorResolver { if (TypesPackage.isFlexible(type) && !TypesPackage.isDynamic(type)) { assert jetTypeArguments.size() == 2 : "Flexible type cannot be denoted in Kotlin otherwise than as ft, but was: " - + JetPsiUtil.getElementTextWithContext(typeReference); + + PsiUtilPackage.getElementTextWithContext(typeReference); // it's really ft Flexibility flexibility = TypesPackage.flexibility(type); checkBounds(jetTypeArguments.get(0), flexibility.getLowerBound(), trace); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/DeclarationScopeProviderImpl.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/DeclarationScopeProviderImpl.java index ae18ed7ded8..3880b6acc6b 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/DeclarationScopeProviderImpl.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/DeclarationScopeProviderImpl.java @@ -19,6 +19,7 @@ package org.jetbrains.kotlin.resolve.lazy; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo; import org.jetbrains.kotlin.resolve.lazy.descriptors.LazyClassDescriptor; import org.jetbrains.kotlin.resolve.scopes.JetScope; @@ -69,7 +70,7 @@ public class DeclarationScopeProviderImpl implements DeclarationScopeProvider { } throw new IllegalStateException("Don't call this method for local declarations: " + jetDeclaration + "\n" + - JetPsiUtil.getElementTextWithContext(jetDeclaration)); + PsiUtilPackage.getElementTextWithContext(jetDeclaration)); } @NotNull diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyDeclarationResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyDeclarationResolver.java index 9e441db6205..e0d59521f60 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyDeclarationResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyDeclarationResolver.java @@ -24,6 +24,7 @@ import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; import org.jetbrains.kotlin.renderer.DescriptorRenderer; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingTrace; @@ -77,7 +78,7 @@ public class LazyDeclarationResolver { throw new IllegalArgumentException( String.format("Could not find a classifier for %s.\n" + "Found descriptor: %s (%s).\n", - JetPsiUtil.getElementTextWithContext(classOrObject), + PsiUtilPackage.getElementTextWithContext(classOrObject), scopeDescriptor != null ? DescriptorRenderer.DEBUG_TEXT.render(scopeDescriptor) : "null", scopeDescriptor != null ? (scopeDescriptor.getContainingDeclaration().getClass()) : null)); } @@ -202,12 +203,12 @@ public class LazyDeclarationResolver { @Override public DeclarationDescriptor visitJetElement(@NotNull JetElement element, Void data) { throw new IllegalArgumentException("Unsupported declaration type: " + element + " " + - JetPsiUtil.getElementTextWithContext(element)); + PsiUtilPackage.getElementTextWithContext(element)); } }, null); if (result == null) { throw new IllegalStateException("No descriptor resolved for " + declaration + ":\n" + - JetPsiUtil.getElementTextWithContext(declaration)); + PsiUtilPackage.getElementTextWithContext(declaration)); } return result; } diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java index 602cdb57443..e159be61633 100644 --- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java +++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/KotlinWrappingLightClass.java @@ -35,6 +35,7 @@ import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.idea.JetLanguage; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; import java.util.List; @@ -123,7 +124,7 @@ public abstract class KotlinWrappingLightClass extends AbstractLightClass implem JetDeclaration declaration = ClsWrapperStubPsiFactory.getOriginalDeclaration(field); if (declaration instanceof JetEnumEntry) { assert field instanceof PsiEnumConstant : "Field delegate should be an enum constant (" + field.getName() + "):\n" + - JetPsiUtil.getElementTextWithContext(declaration); + PsiUtilPackage.getElementTextWithContext(declaration); JetEnumEntry enumEntry = (JetEnumEntry) declaration; PsiEnumConstant enumConstant = (PsiEnumConstant) field; FqName enumConstantFqName = new FqName(getFqName().asString() + "." + enumEntry.getName()); diff --git a/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/ElementResolver.kt b/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/ElementResolver.kt index 9a9fdcd4073..a4d63af93c0 100644 --- a/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/ElementResolver.kt +++ b/idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/ElementResolver.kt @@ -29,6 +29,7 @@ import org.jetbrains.kotlin.di.InjectorForBodyResolve import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.Name import org.jetbrains.kotlin.psi.* +import org.jetbrains.kotlin.psi.psiUtil.getElementTextWithContext import org.jetbrains.kotlin.psi.psiUtil.getParentOfType import org.jetbrains.kotlin.resolve.* import org.jetbrains.kotlin.resolve.calls.smartcasts.DataFlowInfo @@ -159,7 +160,7 @@ public abstract class ElementResolver protected( packageRefAdditionalResolve(resolveSession, trace, resolveElement) } else { - error("Invalid type of the topmost parent: $resolveElement\n${JetPsiUtil.getElementTextWithContext(resolveElement)}") + error("Invalid type of the topmost parent: $resolveElement\n${resolveElement.getElementTextWithContext()}") } } } @@ -360,7 +361,7 @@ public abstract class ElementResolver protected( val classDescriptor = resolveSession.resolveToDescriptor(klass) as ClassDescriptor val constructorDescriptor = classDescriptor.getUnsubstitutedPrimaryConstructor() - ?: error("Can't get primary constructor for descriptor '$classDescriptor' in from class '${JetPsiUtil.getElementTextWithContext(klass)}'") + ?: error("Can't get primary constructor for descriptor '$classDescriptor' in from class '${klass.getElementTextWithContext()}'") val bodyResolver = createBodyResolver(resolveSession, trace, file, statementFilter) bodyResolver.resolveConstructorParameterDefaultValuesAndAnnotations(createEmptyContext(resolveSession), trace, klass, constructorDescriptor, scope) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.java index 7d67c4f15dd..89ab465a0f7 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/IDELightClassGenerationSupport.java @@ -49,11 +49,11 @@ import org.jetbrains.kotlin.idea.stubindex.JetFullClassNameIndex; import org.jetbrains.kotlin.idea.stubindex.JetTopLevelClassByPackageIndex; import org.jetbrains.kotlin.idea.stubindex.PackageIndexUtil; import org.jetbrains.kotlin.idea.util.ProjectRootsUtil; -import org.jetbrains.kotlin.load.java.JvmAbi; import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode; import org.jetbrains.kotlin.resolve.lazy.ForceResolveUtil; @@ -105,7 +105,7 @@ public class IDELightClassGenerationSupport extends LightClassGenerationSupport ClassDescriptor descriptor = bindingContext.get(BindingContext.CLASS, classOrObject); if (descriptor == null) { - LOG.warn("No class descriptor in context for class: " + JetPsiUtil.getElementTextWithContext(classOrObject)); + LOG.warn("No class descriptor in context for class: " + PsiUtilPackage.getElementTextWithContext(classOrObject)); return new LightClassConstructionContext(bindingContext, session.getModuleDescriptor()); } diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveSessionForBodies.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveSessionForBodies.java index 71d152c8044..daa98605ef1 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveSessionForBodies.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveSessionForBodies.java @@ -23,6 +23,7 @@ import org.jetbrains.annotations.ReadOnly; import org.jetbrains.kotlin.descriptors.*; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.BindingContextUtils; import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode; @@ -83,7 +84,7 @@ public class ResolveSessionForBodies implements KotlinCodeAnalyzer { BindingContext context = resolveElementCache.resolveToElement(declaration, BodyResolveMode.FULL); return BindingContextUtils.getNotNull(context, BindingContext.DECLARATION_TO_DESCRIPTOR, declaration, "Descriptor wasn't found for declaration " + declaration.toString() + "\n" + - JetPsiUtil.getElementTextWithContext(declaration)); + PsiUtilPackage.getElementTextWithContext(declaration)); } @Override diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt index 8ac6ac4bee7..89fb237cea1 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/util/ShortenReferences.kt @@ -40,6 +40,7 @@ import org.jetbrains.kotlin.idea.util.ShortenReferences.Options import org.jetbrains.kotlin.idea.imports.* import org.jetbrains.kotlin.resolve.* import com.intellij.psi.* +import org.jetbrains.kotlin.psi.psiUtil.getElementTextWithContext public class ShortenReferences(val options: (JetElement) -> Options = { Options.DEFAULT }) { public data class Options( @@ -402,7 +403,7 @@ public class ShortenReferences(val options: (JetElement) -> Options = { Options. } override fun qualifier(element: JetThisExpression): JetElement = - throw AssertionError("Qualifier requested: ${JetPsiUtil.getElementTextWithContext(element)}") + throw AssertionError("Qualifier requested: ${element.getElementTextWithContext()}") override fun shortenElement(element: JetThisExpression): JetElement { return element.replace(simpleThis) as JetElement diff --git a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/refactoring/jetRefactoringUtil.kt b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/refactoring/jetRefactoringUtil.kt index d5d9b46275b..9b2a2f833ad 100644 --- a/idea/idea-core/src/org/jetbrains/kotlin/idea/core/refactoring/jetRefactoringUtil.kt +++ b/idea/idea-core/src/org/jetbrains/kotlin/idea/core/refactoring/jetRefactoringUtil.kt @@ -22,7 +22,6 @@ import com.intellij.psi.PsiDirectory import com.intellij.openapi.roots.JavaProjectRootsUtil import com.intellij.psi.util.PsiTreeUtil import com.intellij.refactoring.util.ConflictsUtil -import org.jetbrains.kotlin.psi.psiUtil.getPackage import com.intellij.psi.PsiFileFactory import org.jetbrains.kotlin.idea.JetFileType import com.intellij.openapi.project.Project @@ -56,7 +55,6 @@ import com.intellij.openapi.ui.popup.JBPopupAdapter import com.intellij.openapi.ui.popup.LightweightWindowEvent import com.intellij.psi.PsiDocumentManager import org.jetbrains.kotlin.resolve.BindingContext -import org.jetbrains.kotlin.psi.psiUtil.isAncestor import com.intellij.psi.PsiNamedElement import org.jetbrains.kotlin.descriptors.FunctionDescriptor import org.jetbrains.kotlin.renderer.DescriptorRenderer @@ -68,10 +66,8 @@ import com.intellij.psi.PsiMethod import org.jetbrains.kotlin.idea.caches.resolve.analyze import org.jetbrains.kotlin.descriptors.DeclarationDescriptor import org.jetbrains.kotlin.descriptors.CallableDescriptor -import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType import com.intellij.psi.PsiPackage import org.jetbrains.kotlin.idea.util.ProjectRootsUtil -import org.jetbrains.kotlin.psi.psiUtil.parents import com.intellij.refactoring.util.RefactoringUIUtil import com.intellij.psi.PsiMember import org.jetbrains.kotlin.idea.caches.resolve.getJavaMemberDescriptor @@ -98,6 +94,7 @@ import com.intellij.lang.java.JavaLanguage import com.intellij.psi.PsiClass import com.intellij.codeInsight.daemon.impl.quickfix.CreateFromUsageUtils import org.jetbrains.kotlin.idea.codeInsight.DescriptorToSourceUtilsIde +import org.jetbrains.kotlin.psi.psiUtil.* fun PsiElement.getAndRemoveCopyableUserData(key: Key): T? { val data = getCopyableUserData(key) @@ -483,7 +480,7 @@ private fun copyTypeParameters( public fun createJavaMethod(function: JetFunction, targetClass: PsiClass): PsiMethod { val template = LightClassUtil.getLightClassMethod(function) - ?: throw AssertionError("Can't generate light method: ${JetPsiUtil.getElementTextWithContext(function)}") + ?: throw AssertionError("Can't generate light method: ${function.getElementTextWithContext()}") return createJavaMethod(template, targetClass) } @@ -528,7 +525,7 @@ public fun createJavaMethod(template: PsiMethod, targetClass: PsiClass): PsiMeth fun createJavaField(property: JetProperty, targetClass: PsiClass): PsiField { val template = LightClassUtil.getLightClassPropertyMethods(property).getGetter() - ?: throw AssertionError("Can't generate light method: ${JetPsiUtil.getElementTextWithContext(property)}") + ?: throw AssertionError("Can't generate light method: ${property.getElementTextWithContext()}") val factory = PsiElementFactory.SERVICE.getInstance(template.getProject()) val field = targetClass.add(factory.createField(property.getName(), template.getReturnType())) as PsiField @@ -554,12 +551,12 @@ fun createJavaClass(klass: JetClass, targetClass: PsiClass): PsiMember { ClassKind.TRAIT -> factory.createInterface(klass.getName()) ClassKind.ANNOTATION_CLASS -> factory.createAnnotationType(klass.getName()) ClassKind.ENUM_CLASS -> factory.createEnum(klass.getName()) - else -> throw AssertionError("Unexpected class kind: ${JetPsiUtil.getElementTextWithContext(klass)}") + else -> throw AssertionError("Unexpected class kind: ${klass.getElementTextWithContext()}") } val javaClass = targetClass.add(javaClassToAdd) as PsiClass val template = LightClassUtil.getPsiClass(klass) - ?: throw AssertionError("Can't generate light class: ${JetPsiUtil.getElementTextWithContext(klass)}") + ?: throw AssertionError("Can't generate light class: ${klass.getElementTextWithContext()}") copyModifierListItems(template.getModifierList(), javaClass.getModifierList()) if (template.isInterface()) { diff --git a/idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt b/idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt index 895b1e450a5..d026f0f118f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt +++ b/idea/src/org/jetbrains/kotlin/idea/KotlinQuickDocumentationProvider.kt @@ -35,6 +35,7 @@ import org.jetbrains.kotlin.psi.JetDeclaration import org.jetbrains.kotlin.psi.JetElement import org.jetbrains.kotlin.psi.JetPsiUtil import org.jetbrains.kotlin.psi.JetReferenceExpression +import org.jetbrains.kotlin.psi.psiUtil.getElementTextWithContext import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType import org.jetbrains.kotlin.renderer.DescriptorRenderer import org.jetbrains.kotlin.renderer.DescriptorRendererBuilder @@ -122,7 +123,7 @@ public class KotlinQuickDocumentationProvider : AbstractDocumentationProvider() val declarationDescriptor = context[BindingContext.DECLARATION_TO_DESCRIPTOR, declaration] if (declarationDescriptor == null) { - LOG.info("Failed to find descriptor for declaration " + JetPsiUtil.getElementTextWithContext(declaration)) + LOG.info("Failed to find descriptor for declaration " + declaration.getElementTextWithContext()) return "No documentation available" } diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt index 81c6b894038..aadb2fc84db 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/JetPositionManager.kt @@ -51,6 +51,7 @@ import org.jetbrains.kotlin.idea.util.application.runReadAction import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.* +import org.jetbrains.kotlin.psi.psiUtil.getElementTextWithContext import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.calls.callUtil.getResolvedCall import org.jetbrains.kotlin.resolve.inline.InlineAnalyzerExtension @@ -335,7 +336,7 @@ public class JetPositionManager(private val myDebugProcess: DebugProcess) : Mult val elementAtForLibraryFile = getElementToCreateTypeMapperForLibraryFile(notPositionedElement) assert(elementAtForLibraryFile != null) { "Couldn't find element at breakpoint for library file " + file.getName() + - (if (notPositionedElement == null) "" else ", notPositionedElement = " + JetPsiUtil.getElementTextWithContext(notPositionedElement)) + (if (notPositionedElement == null) "" else ", notPositionedElement = " + notPositionedElement.getElementTextWithContext()) } return PositionedElement(findPackagePartInternalNameForLibraryFile(elementAtForLibraryFile!!), elementAtForLibraryFile) } diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/PositionManagerLibraryClassFileSearcher.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/PositionManagerLibraryClassFileSearcher.kt index 64cfdcbb6b1..a2f5fca99e5 100644 --- a/idea/src/org/jetbrains/kotlin/idea/debugger/PositionManagerLibraryClassFileSearcher.kt +++ b/idea/src/org/jetbrains/kotlin/idea/debugger/PositionManagerLibraryClassFileSearcher.kt @@ -39,6 +39,7 @@ import org.jetbrains.kotlin.resolve.jvm.JvmClassName import org.jetbrains.kotlin.resolve.descriptorUtil.module import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptor import com.intellij.util.indexing.FileBasedIndex +import org.jetbrains.kotlin.psi.psiUtil.getElementTextWithContext private val LOG = Logger.getInstance("org.jetbrains.kotlin.idea.debugger") @@ -135,7 +136,7 @@ private fun render(desc: DeclarationDescriptor) = DescriptorRenderer.FQ_NAMES_IN private fun reportError(element: JetElement, descriptor: CallableDescriptor?) { LOG.error("Couldn't calculate class name for element in library scope:\n" + - JetPsiUtil.getElementTextWithContext(element) + + element.getElementTextWithContext() + if (descriptor != null) "\ndescriptor = ${render(descriptor)}" else "" ) } diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt index 4b73ddd8e02..4970221f4f6 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt @@ -42,6 +42,7 @@ import org.jetbrains.kotlin.idea.search.usagesSearch.* import org.jetbrains.kotlin.idea.util.ProjectRootsUtil import org.jetbrains.kotlin.lexer.JetTokens import org.jetbrains.kotlin.psi.* +import org.jetbrains.kotlin.psi.psiUtil.getElementTextWithContext import org.jetbrains.kotlin.psi.psiUtil.isAncestor import org.jetbrains.kotlin.utils.singletonOrEmptyList import java.awt.GridBagConstraints @@ -166,7 +167,7 @@ public class UnusedSymbolInspection : AbstractKotlinInspection() { var zeroOccurrences = true for (name in listOf(declaration.getName()) + declaration.getAccessorNames() + declaration.getClassNameForCompanionObject().singletonOrEmptyList()) { - assert(name != null) { "Name is null for " + JetPsiUtil.getElementTextWithContext(declaration) } + assert(name != null) { "Name is null for " + declaration.getElementTextWithContext() } when (psiSearchHelper.isCheapEnoughToSearch(name, useScope, null, null)) { ZERO_OCCURRENCES -> {} // go on, check other names FEW_OCCURRENCES -> zeroOccurrences = false @@ -195,8 +196,8 @@ public class UnusedSymbolInspection : AbstractKotlinInspection() { val query = UsagesSearch.search(request) return !query.forEach(Processor { - assert(it != null, { "Found reference is null, was looking for: " + JetPsiUtil.getElementTextWithContext(declaration) + - " findAll(): " + query.findAll().map { it?.getElement()?.let{ JetPsiUtil.getElementTextWithContext(it) } } }) + assert(it != null, { "Found reference is null, was looking for: " + declaration.getElementTextWithContext() + + " findAll(): " + query.findAll().map { it?.getElement()?.let{ it.getElementTextWithContext() } } }) declaration.isAncestor(it.getElement()) }) } diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyAction.java b/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyAction.java index c1c91bf11f4..a089841b368 100644 --- a/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyAction.java +++ b/idea/src/org/jetbrains/kotlin/idea/intentions/SpecifyTypeExplicitlyAction.java @@ -39,6 +39,7 @@ import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage; import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.idea.util.ShortenReferences; import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.DescriptorUtils; import org.jetbrains.kotlin.types.ErrorUtils; @@ -195,7 +196,7 @@ public class SpecifyTypeExplicitlyAction extends PsiElementBaseIntentionAction { @NotNull JetType exprType ) { assert !exprType.isError() : "Unexpected error type, should have been checked before: " - + JetPsiUtil.getElementTextWithContext(declaration) + ", type = " + exprType; + + PsiUtilPackage.getElementTextWithContext(declaration) + ", type = " + exprType; Expression expression = createTypeExpressionForTemplate(exprType); diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionReturnTypeFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionReturnTypeFix.java index 0af7c99842d..03033b9d5b2 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionReturnTypeFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeFunctionReturnTypeFix.java @@ -37,6 +37,7 @@ import org.jetbrains.kotlin.idea.util.ShortenReferences; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.name.Name; import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils; import org.jetbrains.kotlin.resolve.calls.callUtil.CallUtilPackage; @@ -62,7 +63,7 @@ public class ChangeFunctionReturnTypeFix extends JetIntentionAction if (element instanceof JetFunctionLiteral) { JetFunctionLiteralExpression functionLiteralExpression = PsiTreeUtil.getParentOfType(element, JetFunctionLiteralExpression.class); assert functionLiteralExpression != null : "FunctionLiteral outside any FunctionLiteralExpression: " + - JetPsiUtil.getElementTextWithContext(element); + PsiUtilPackage.getElementTextWithContext(element); changeFunctionLiteralReturnTypeFix = new ChangeFunctionLiteralReturnTypeFix(functionLiteralExpression, type); } else { diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableTypeFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableTypeFix.java index bf588a5fe7c..a7590a16b2f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableTypeFix.java +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableTypeFix.java @@ -36,6 +36,7 @@ import org.jetbrains.kotlin.idea.util.IdeDescriptorRenderers; import org.jetbrains.kotlin.idea.util.ShortenReferences; import org.jetbrains.kotlin.name.FqName; import org.jetbrains.kotlin.psi.*; +import org.jetbrains.kotlin.psi.psiUtil.PsiUtilPackage; import org.jetbrains.kotlin.resolve.BindingContext; import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils; import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall; @@ -144,7 +145,7 @@ public class ChangeVariableTypeFix extends JetIntentionAction { private final String varOrVal; @@ -36,7 +36,7 @@ public class RemoveValVarFromParameterFix extends JetIntentionAction TEMPLATE_FROM_USAGE_SECONDARY_CONSTRUCTOR_BODY is JetNamedFunction -> TEMPLATE_FROM_USAGE_FUNCTION_BODY - else -> throw AssertionError("Unexpected declaration: " + JetPsiUtil.getElementTextWithContext(func)) + else -> throw AssertionError("Unexpected declaration: " + func.getElementTextWithContext()) } val fileTemplate = FileTemplateManager.getInstance()!!.getCodeTemplate(templateName) val properties = Properties() diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableFromUsageFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableFromUsageFix.kt index cde12d6ea83..c593a7b580b 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableFromUsageFix.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/createCallable/CreateCallableFromUsageFix.kt @@ -28,6 +28,7 @@ import org.jetbrains.kotlin.idea.quickfix.createFromUsage.CreateFromUsageFixBase import org.jetbrains.kotlin.idea.quickfix.createFromUsage.callableBuilder.* import org.jetbrains.kotlin.idea.util.application.executeCommand import org.jetbrains.kotlin.psi.* +import org.jetbrains.kotlin.psi.psiUtil.getElementTextWithContext import java.util.Collections import java.util.HashSet @@ -41,7 +42,7 @@ public class CreateCallableFromUsageFix( isExtension: Boolean) : this(originalExpression, Collections.singletonList(callableInfo), isExtension) { } init { - assert (callableInfos.isNotEmpty()) { "No CallableInfos: ${JetPsiUtil.getElementTextWithContext(originalElement)}" } + assert (callableInfos.isNotEmpty()) { "No CallableInfos: ${originalElement.getElementTextWithContext()}" } if (callableInfos.size() > 1) { val receiverSet = callableInfos.mapTo(HashSet()) { it.receiverTypeInfo } if (receiverSet.size() > 1) throw AssertionError("All functions must have common receiver: $receiverSet") diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt index b6bf73d1a3d..28e5915d7bc 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/extractionEngine/extractableAnalysisUtil.kt @@ -61,10 +61,7 @@ import org.jetbrains.kotlin.idea.util.approximateWithResolvableType import org.jetbrains.kotlin.idea.util.isResolvableInScope import org.jetbrains.kotlin.idea.util.makeNullable import org.jetbrains.kotlin.psi.* -import org.jetbrains.kotlin.psi.psiUtil.getNonStrictParentOfType -import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType -import org.jetbrains.kotlin.psi.psiUtil.isInsideOf -import org.jetbrains.kotlin.psi.psiUtil.parents +import org.jetbrains.kotlin.psi.psiUtil.* import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils import org.jetbrains.kotlin.resolve.DescriptorUtils @@ -840,7 +837,7 @@ fun ExtractionData.performAnalysis(): AnalysisResult { val enclosingPseudocode = PseudocodeUtil.generatePseudocode(enclosingPseudocodeDeclaration, bindingContext) val pseudocode = enclosingPseudocode.getPseudocodeByElement(pseudocodeDeclaration) - ?: throw AssertionError("Can't find nested pseudocode for element: ${JetPsiUtil.getElementTextWithContext(pseudocodeDeclaration)}") + ?: throw AssertionError("Can't find nested pseudocode for element: ${pseudocodeDeclaration.getElementTextWithContext()}") val localInstructions = getLocalInstructions(pseudocode) val modifiedVarDescriptorsWithExpressions = localInstructions.getModifiedVarDescriptors(bindingContext) @@ -949,7 +946,7 @@ private fun JetNamedDeclaration.getGeneratedBody() = call?.getFunctionLiteralArguments()?.singleOrNull()?.getFunctionLiteral()?.getBodyExpression() } } - } ?: throw AssertionError("Couldn't get block body for this declaration: ${JetPsiUtil.getElementTextWithContext(this)}") + } ?: throw AssertionError("Couldn't get block body for this declaration: ${getElementTextWithContext()}") fun ExtractableCodeDescriptor.validate(): ExtractableCodeDescriptorWithConflicts { fun getDeclarationMessage(declaration: PsiNamedElement, messageKey: String, capitalize: Boolean = true): String { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinInplaceParameterIntroducer.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinInplaceParameterIntroducer.kt index b8e6e16a3ab..d85375ab973 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinInplaceParameterIntroducer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinInplaceParameterIntroducer.kt @@ -49,6 +49,7 @@ import org.jetbrains.kotlin.psi.JetExpression import org.jetbrains.kotlin.psi.JetParameter import org.jetbrains.kotlin.psi.JetPsiFactory import org.jetbrains.kotlin.psi.JetPsiUtil +import org.jetbrains.kotlin.psi.psiUtil.getElementTextWithContext import org.jetbrains.kotlin.psi.psiUtil.getValueParameterList import org.jetbrains.kotlin.psi.psiUtil.getValueParameters import org.jetbrains.kotlin.psi.psiUtil.isAncestor @@ -159,7 +160,7 @@ public class KotlinInplaceParameterIntroducer( builder.append(")") if (addedRange == null) { - LOG.error("Added parameter not found: ${JetPsiUtil.getElementTextWithContext(callable)}") + LOG.error("Added parameter not found: ${callable.getElementTextWithContext()}") } val document = previewer!!.getDocument() diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt index 38228049cf0..e414aa141b4 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt @@ -49,12 +49,7 @@ import org.jetbrains.kotlin.idea.util.psi.patternMatching.JetPsiUnifier import org.jetbrains.kotlin.idea.util.psi.patternMatching.toRange import org.jetbrains.kotlin.idea.util.supertypes import org.jetbrains.kotlin.psi.* -import org.jetbrains.kotlin.psi.psiUtil.getParentOfTypeAndBranch -import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType -import org.jetbrains.kotlin.psi.psiUtil.getValueParameterList -import org.jetbrains.kotlin.psi.psiUtil.getValueParameters -import org.jetbrains.kotlin.psi.psiUtil.isAncestor -import org.jetbrains.kotlin.psi.psiUtil.parents +import org.jetbrains.kotlin.psi.psiUtil.* import org.jetbrains.kotlin.resolve.BindingContext import org.jetbrains.kotlin.resolve.scopes.JetScopeUtils import org.jetbrains.kotlin.types.JetType @@ -165,14 +160,14 @@ public open class KotlinIntroduceParameterHandler: KotlinIntroduceHandlerBase() is FunctionDescriptor -> descriptor : FunctionDescriptor is ClassDescriptor -> descriptor.getUnsubstitutedPrimaryConstructor() else -> null - } ?: throw AssertionError("Unexpected element type: ${JetPsiUtil.getElementTextWithContext(targetParent)}") + } ?: throw AssertionError("Unexpected element type: ${targetParent.getElementTextWithContext()}") val parameterType = expressionType.approximateWithResolvableType(JetScopeUtils.getResolutionScope(targetParent, context), false) val body = when (targetParent) { is JetFunction -> targetParent.getBodyExpression() is JetClass -> targetParent.getBody() else -> null - } ?: throw AssertionError("Body element is not found: ${JetPsiUtil.getElementTextWithContext(targetParent)}") + } ?: throw AssertionError("Body element is not found: ${targetParent.getElementTextWithContext()}") val nameValidator = JetNameValidatorImpl(body, null, JetNameValidatorImpl.Target.PROPERTIES) val suggestedNames = linkedSetOf(*JetNameSuggester.suggestNames(parameterType, nameValidator, "p")) @@ -228,7 +223,7 @@ public open class KotlinIntroduceParameterHandler: KotlinIntroduceHandlerBase() if (parameterList == null) { val klass = targetParent as? JetClass val anchor = klass?.getTypeParameterList() ?: klass?.getNameIdentifier() - assert(anchor != null, "Invalid declaration: ${JetPsiUtil.getElementTextWithContext(targetParent)}") + assert(anchor != null, "Invalid declaration: ${targetParent.getElementTextWithContext()}") val constructor = targetParent.addAfter(psiFactory.createPrimaryConstructor(), anchor) as JetPrimaryConstructor constructor.getValueParameterList()!! diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinInplacePropertyIntroducer.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinInplacePropertyIntroducer.kt index f5a754a06a4..970f13d709a 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinInplacePropertyIntroducer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinInplacePropertyIntroducer.kt @@ -46,7 +46,7 @@ public class KotlinInplacePropertyIntroducer( property, editor, project, title, JetExpression.EMPTY_ARRAY, null, false, property, false, doNotChangeVar, exprType, false ) { init { - assert(availableTargets.isNotEmpty(), "No targets available: ${JetPsiUtil.getElementTextWithContext(property)}") + assert(availableTargets.isNotEmpty(), "No targets available: ${property.getElementTextWithContext()}") } private var extractionResult = extractionResult diff --git a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextTest.kt b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextTest.kt index 8ecbf95a40f..b38cbd59aac 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextTest.kt +++ b/idea/tests/org/jetbrains/kotlin/idea/decompiler/textBuilder/AbstractDecompiledTextTest.kt @@ -30,6 +30,7 @@ import com.intellij.psi.PsiErrorElement import org.jetbrains.kotlin.psi.JetPsiUtil import com.intellij.psi.PsiFile import org.jetbrains.kotlin.idea.decompiler.JetClsFile +import org.jetbrains.kotlin.psi.psiUtil.getElementTextWithContext public abstract class AbstractDecompiledTextTest() : JetLightCodeInsightFixtureTestCase() { @@ -53,7 +54,7 @@ public abstract class AbstractDecompiledTextTest() : JetLightCodeInsightFixtureT private fun checkThatFileWasParsedCorrectly(clsFile: PsiFile) { clsFile.accept(object : PsiRecursiveElementVisitor() { override fun visitErrorElement(element: PsiErrorElement) { - fail("Decompiled file should not contain error elements!\n${JetPsiUtil.getElementTextWithContext(element)}") + fail("Decompiled file should not contain error elements!\n${element.getElementTextWithContext()}") } }) }