From ac7e6bdfe42c27c1e72c8cb4ccdb074965acb87b Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Thu, 28 May 2015 23:23:56 +0300
Subject: [PATCH] Moved method to psiUtils.kt

---
 .../src/org/jetbrains/kotlin/psi/psiUtil/jetPsiUtil.kt         | 2 --
 .../frontend/src/org/jetbrains/kotlin/psi/psiUtil/psiUtils.kt  | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

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 b3a8c76dfc0..a1ea2ec133a 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/jetPsiUtil.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/jetPsiUtil.kt
@@ -236,8 +236,6 @@ public fun JetSimpleNameExpression.isImportDirectiveExpression(): Boolean {
     }
 }
 
-public fun JetElement.getTextWithLocation(): String = "'${this.getText()}' at ${DiagnosticUtils.atLocation(this)}"
-
 public fun JetExpression.isFunctionLiteralOutsideParentheses(): Boolean {
     val parent = getParent()
     return when (parent) {
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/psiUtils.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/psiUtils.kt
index d022830f8e1..95138a02eef 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/psiUtils.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/psiUtils.kt
@@ -21,6 +21,7 @@ import com.intellij.psi.*
 import com.intellij.psi.search.PsiSearchScopeUtil
 import com.intellij.psi.search.SearchScope
 import com.intellij.psi.util.PsiTreeUtil
+import org.jetbrains.kotlin.diagnostics.DiagnosticUtils
 import java.util.ArrayList
 
 // NOTE: in this file we collect only LANGUAGE INDEPENDENT methods working with PSI and not modifying it
@@ -256,6 +257,8 @@ public fun PsiElement.getElementTextWithContext(): String {
             .toString()
 }
 
+public fun PsiElement.getTextWithLocation(): String = "'${this.getText()}' at ${DiagnosticUtils.atLocation(this)}"
+
 // -----------------------------------------------------------------------------------------------------------------------------------------
 
 public fun SearchScope.contains(element: PsiElement): Boolean = PsiSearchScopeUtil.isInScope(this, element)