Renames

compiler/frontend/src/org/jetbrains/kotlin/diagnostics/PositioningStrategies.kt

@@ -322,13 +322,13 @@ public object PositioningStrategies {
 
     public val ELSE_ENTRY: PositioningStrategy<JetWhenEntry> = object : PositioningStrategy<JetWhenEntry>() {
         override fun mark(element: JetWhenEntry): List<TextRange> {
-            return markElement(element.getElseKeywordElement()!!)
+            return markElement(element.getElseKeyword()!!)
         }
     }
 
     public val WHEN_EXPRESSION: PositioningStrategy<JetWhenExpression> = object : PositioningStrategy<JetWhenExpression>() {
         override fun mark(element: JetWhenExpression): List<TextRange> {
-            return markElement(element.getWhenKeywordElement())
+            return markElement(element.getWhenKeyword())
         }
     }
 

compiler/frontend/src/org/jetbrains/kotlin/psi/JetDoWhileExpression.java

@@ -34,7 +34,7 @@ public class JetDoWhileExpression extends JetWhileExpressionBase {
 
     @Nullable
     @IfNotParsed
-    public PsiElement getWhileKeywordElement() {
+    public PsiElement getWhileKeyword() {
         //noinspection ConstantConditions
         return findChildByType(JetTokens.WHILE_KEYWORD);
     }

compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhenEntry.java

@@ -28,11 +28,11 @@ public class JetWhenEntry extends JetElementImpl {
     }
 
     public boolean isElse() {
-        return getElseKeywordElement() != null;
+        return getElseKeyword() != null;
     }
 
     @Nullable
-    public PsiElement getElseKeywordElement() {
+    public PsiElement getElseKeyword() {
         return findChildByType(JetTokens.ELSE_KEYWORD);
     }
 

compiler/frontend/src/org/jetbrains/kotlin/psi/JetWhenExpression.java

@@ -46,7 +46,7 @@ public class JetWhenExpression extends JetExpressionImpl {
     }
 
     @NotNull
-    public PsiElement getWhenKeywordElement() {
+    public PsiElement getWhenKeyword() {
         //noinspection ConstantConditions
         return findChildByType(JetTokens.WHEN_KEYWORD);
     }

idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinDoWhileFixer.kt

@@ -32,7 +32,7 @@ public class KotlinDoWhileFixer : SmartEnterProcessorWithFixers.Fixer<KotlinSmar
         val start = stmt.range.start
         val body = stmt.getBody()
 
-        val whileKeyword = stmt.getWhileKeywordElement()
+        val whileKeyword = stmt.getWhileKeyword()
         if (body == null) {
             if (whileKeyword == null) {
                 doc.replaceString(start, start + "do".length(), "do {} while()")

idea/src/org/jetbrains/kotlin/idea/editor/fixers/KotlinMissingWhenBodyFixer.kt

@@ -44,6 +44,6 @@ public class KotlinMissingWhenBodyFixer : SmartEnterProcessorWithFixers.Fixer<Ko
         getRightParenthesis() != null -> getRightParenthesis()
         getSubjectExpression() != null -> null
         getLeftParenthesis() != null -> null
-        else -> getWhenKeywordElement()
+        else -> getWhenKeyword()
     }
 }

idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/FlattenWhenIntention.kt

@@ -39,7 +39,7 @@ public class FlattenWhenIntention : JetSelfTargetingIntention<JetWhenExpression>
         if (!subject.matches(innerWhen.getSubjectExpression())) return false
         if (!JetPsiUtil.checkWhenExpressionHasSingleElse(innerWhen)) return false
 
-        return elseEntry.startOffset <= caretOffset && caretOffset <= innerWhen.getWhenKeywordElement().endOffset
+        return elseEntry.startOffset <= caretOffset && caretOffset <= innerWhen.getWhenKeyword().endOffset
     }
 
     override fun applyTo(element: JetWhenExpression, editor: Editor) {

idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/FoldWhenToAssignmentIntention.kt

@@ -44,7 +44,7 @@ public class FoldWhenToAssignmentIntention : JetSelfTargetingRangeIntention<JetW
             if (!BranchedFoldingUtils.checkAssignmentsMatch(assignment, firstAssignment)) return null
         }
 
-        return element.getWhenKeywordElement().getTextRange()
+        return element.getWhenKeyword().getTextRange()
     }
 
     override fun applyTo(element: JetWhenExpression, editor: Editor) {

idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/FoldWhenToReturnIntention.kt

@@ -34,7 +34,7 @@ public class FoldWhenToReturnIntention : JetSelfTargetingRangeIntention<JetWhenE
             if (BranchedFoldingUtils.getFoldableBranchedReturn(entry.getExpression()) == null) return null
         }
 
-        return element.getWhenKeywordElement().getTextRange()
+        return element.getWhenKeyword().getTextRange()
     }
 
     override fun applyTo(element: JetWhenExpression, editor: Editor) {

idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/IntroduceWhenSubjectIntention.kt

@@ -27,7 +27,7 @@ public class IntroduceWhenSubjectIntention : JetSelfTargetingRangeIntention<JetW
     override fun applicabilityRange(element: JetWhenExpression): TextRange? {
         val subject = element.getSubjectToIntroduce() ?: return null
         setText("Introduce '${subject.getText()}' as argument to 'when'")
-        return element.getWhenKeywordElement().getTextRange()
+        return element.getWhenKeyword().getTextRange()
     }
 
     override fun applyTo(element: JetWhenExpression, editor: Editor) {

idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldAssignmentToWhenIntention.kt

@@ -33,7 +33,7 @@ public class UnfoldAssignmentToWhenIntention : JetSelfTargetingRangeIntention<Je
         if (element.getLeft() == null) return null
         val right = element.getRight() as? JetWhenExpression ?: return null
         if (!JetPsiUtil.checkWhenExpressionHasSingleElse(right)) return null
-        return TextRange(element.startOffset, right.getWhenKeywordElement().endOffset)
+        return TextRange(element.startOffset, right.getWhenKeyword().endOffset)
     }
 
     override fun applyTo(element: JetBinaryExpression, editor: Editor) {

idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldPropertyToWhenIntention.kt

@@ -32,7 +32,7 @@ public class UnfoldPropertyToWhenIntention : JetSelfTargetingRangeIntention<JetP
         if (!element.isLocal()) return null
         val initializer = element.getInitializer() as? JetWhenExpression ?: return null
         if (!JetPsiUtil.checkWhenExpressionHasSingleElse(initializer)) return null
-        return TextRange(element.startOffset, initializer.getWhenKeywordElement().endOffset)
+        return TextRange(element.startOffset, initializer.getWhenKeyword().endOffset)
     }
 
     override fun applyTo(element: JetProperty, editor: Editor) {

idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/UnfoldReturnToWhenIntention.kt

@@ -29,7 +29,7 @@ public class UnfoldReturnToWhenIntention : JetSelfTargetingRangeIntention<JetRet
     override fun applicabilityRange(element: JetReturnExpression): TextRange? {
         val whenExpr = element.getReturnedExpression() as? JetWhenExpression ?: return null
         if (!JetPsiUtil.checkWhenExpressionHasSingleElse(whenExpr)) return null
-        return TextRange(element.startOffset, whenExpr.getWhenKeywordElement().endOffset)
+        return TextRange(element.startOffset, whenExpr.getWhenKeyword().endOffset)
     }
 
     override fun applyTo(element: JetReturnExpression, editor: Editor) {

idea/src/org/jetbrains/kotlin/idea/intentions/branchedTransformations/intentions/WhenToIfIntention.kt

@@ -28,7 +28,7 @@ public class WhenToIfIntention : JetSelfTargetingRangeIntention<JetWhenExpressio
         if (entries.isEmpty()) return null
         val lastEntry = entries.last()
         if (entries.any { it != lastEntry && it.isElse() }) return null
-        return element.getWhenKeywordElement().getTextRange()
+        return element.getWhenKeyword().getTextRange()
     }
 
     override fun applyTo(element: JetWhenExpression, editor: Editor) {