From f244bfb073810f9bdaa7498f6ccec3d210cd3b11 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Tue, 1 Sep 2015 13:05:37 +0300
Subject: [PATCH] Removed conflicting extensions from our code

---
 .../kotlin/idea/conversion/copy/RangeUtils.kt |  3 ---
 .../idea/intentions/SplitIfIntention.kt       |  1 -
 .../kotlin/js/translate/utils/astUtils.kt     | 23 -------------------
 3 files changed, 27 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/RangeUtils.kt b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/RangeUtils.kt
index f8765b3bc9a..a8a54f6dda8 100644
--- a/idea/src/org/jetbrains/kotlin/idea/conversion/copy/RangeUtils.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/conversion/copy/RangeUtils.kt
@@ -28,9 +28,6 @@ public val TextRange.start: Int
 public val TextRange.end: Int
     get() = getEndOffset()
 
-public val TextRange.length: Int
-    get() = getLength()
-
 public val PsiElement.range: TextRange
     get() = getTextRange()!!
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/SplitIfIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/SplitIfIntention.kt
index fe76a44eae1..86eaf715d40 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/SplitIfIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/SplitIfIntention.kt
@@ -19,7 +19,6 @@ package org.jetbrains.kotlin.idea.intentions
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.util.TextRange
 import com.intellij.psi.util.PsiTreeUtil
-import org.jetbrains.kotlin.idea.conversion.copy.length
 import org.jetbrains.kotlin.idea.conversion.copy.range
 import org.jetbrains.kotlin.idea.conversion.copy.start
 import org.jetbrains.kotlin.idea.core.CommentSaver
diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/astUtils.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/astUtils.kt
index 05f6a5650fe..2fd894ff7d4 100644
--- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/astUtils.kt
+++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/utils/astUtils.kt
@@ -77,18 +77,10 @@ fun JsExpression.toInvocationWith(thisExpr: JsExpression): JsExpression {
     }
 }
 
-public var JsNameRef.qualifier: JsExpression?
-    get() = getQualifier()
-    set(value) = setQualifier(value)
-
 public var JsWhile.test: JsExpression
     get() = getCondition()
     set(value) = setCondition(value)
 
-public var JsWhile.body: JsStatement
-    get() = getBody()
-    set(value) = setBody(value)
-
 public var JsArrayAccess.index: JsExpression
     get() = getIndexExpression()
     set(value) = setIndexExpression(value)
@@ -108,18 +100,3 @@ public var JsConditional.then: JsExpression
 public var JsConditional.otherwise: JsExpression
     get() = getElseExpression()
     set(value) = setElseExpression(value)
-
-public var JsBinaryOperation.arg1: JsExpression
-    get() = getArg1()
-    set(value) = setArg1(value)
-
-public var JsBinaryOperation.arg2: JsExpression
-    get() = getArg2()
-    set(value) = setArg2(value)
-
-public val JsBinaryOperation.operator: JsBinaryOperator
-    get() = getOperator()
-
-public var JsVars.JsVar.initExpression: JsExpression?
-    get() = getInitExpression()
-    set(value) = setInitExpression(value)