Rename

JetLabelQualifiedExpression -> JetExpressionWithLabel
JetLabelQualifiedInstanceExpression -> JetInstanceExpressionWithLabel

compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java

@@ -1136,7 +1136,7 @@ public class ExpressionCodegen extends JetVisitor<StackValue, StackValue> implem
     }
 
     @NotNull
-    private StackValue generateBreakOrContinueExpression(@NotNull JetLabelQualifiedExpression expression, boolean isBreak) {
+    private StackValue generateBreakOrContinueExpression(@NotNull JetExpressionWithLabel expression, boolean isBreak) {
         assert expression instanceof JetContinueExpression || expression instanceof JetBreakExpression;
 
         if (!blockStackElements.isEmpty()) {

compiler/frontend/src/org/jetbrains/jet/lang/cfg/JetControlFlowProcessor.java

@@ -229,7 +229,7 @@ public class JetControlFlowProcessor {
         }
 
         @Override
-        public void visitLabelQualifiedExpressionVoid(@NotNull JetLabelQualifiedExpression expression, CFPContext context) {
+        public void visitExpressionWithLabelVoid(@NotNull JetExpressionWithLabel expression, CFPContext context) {
             String labelName = expression.getLabelName();
             JetExpression labeledExpression = expression.getLabeledExpression();
             if (labelName != null && labeledExpression != null) {
@@ -665,7 +665,7 @@ public class JetControlFlowProcessor {
             }
         }
 
-        private JetElement getCorrespondingLoop(JetLabelQualifiedExpression expression) {
+        private JetElement getCorrespondingLoop(JetExpressionWithLabel expression) {
             String labelName = expression.getLabelName();
             JetElement loop;
             if (labelName != null) {
@@ -689,7 +689,7 @@ public class JetControlFlowProcessor {
             return loop;
         }
 
-        private void checkJumpDoesNotCrossFunctionBoundary(@NotNull JetLabelQualifiedExpression jumpExpression, @NotNull JetElement jumpTarget) {
+        private void checkJumpDoesNotCrossFunctionBoundary(@NotNull JetExpressionWithLabel jumpExpression, @NotNull JetElement jumpTarget) {
             BindingContext bindingContext = trace.getBindingContext();
 
             FunctionDescriptor labelExprEnclosingFunc = BindingContextUtils.getEnclosingFunctionDescriptor(bindingContext, jumpExpression);

compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/Errors.java

@@ -431,9 +431,9 @@ public interface Errors {
     DiagnosticFactory0<JetSimpleNameExpression> LABEL_NAME_CLASH = DiagnosticFactory0.create(WARNING);
     DiagnosticFactory0<JetSimpleNameExpression> AMBIGUOUS_LABEL = DiagnosticFactory0.create(ERROR);
 
-    DiagnosticFactory0<JetLabelQualifiedExpression> BREAK_OR_CONTINUE_OUTSIDE_A_LOOP = DiagnosticFactory0.create(ERROR);
+    DiagnosticFactory0<JetExpressionWithLabel> BREAK_OR_CONTINUE_OUTSIDE_A_LOOP = DiagnosticFactory0.create(ERROR);
-    DiagnosticFactory0<JetLabelQualifiedExpression> BREAK_OR_CONTINUE_JUMPS_ACROSS_FUNCTION_BOUNDARY = DiagnosticFactory0.create(ERROR);
+    DiagnosticFactory0<JetExpressionWithLabel> BREAK_OR_CONTINUE_JUMPS_ACROSS_FUNCTION_BOUNDARY = DiagnosticFactory0.create(ERROR);
-    DiagnosticFactory1<JetLabelQualifiedExpression, String> NOT_A_LOOP_LABEL = DiagnosticFactory1.create(ERROR);
+    DiagnosticFactory1<JetExpressionWithLabel, String> NOT_A_LOOP_LABEL = DiagnosticFactory1.create(ERROR);
     DiagnosticFactory1<JetReturnExpression, String> NOT_A_RETURN_LABEL = DiagnosticFactory1.create(ERROR);
 
     // Control flow / Data flow

compiler/frontend/src/org/jetbrains/jet/lang/psi/JetBreakExpression.java

@@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.psi;
 import com.intellij.lang.ASTNode;
 import org.jetbrains.annotations.NotNull;
 
-public class JetBreakExpression extends JetLabelQualifiedExpression implements JetStatementExpression {
+public class JetBreakExpression extends JetExpressionWithLabel implements JetStatementExpression {
     public JetBreakExpression(@NotNull ASTNode node) {
         super(node);
     }

compiler/frontend/src/org/jetbrains/jet/lang/psi/JetContinueExpression.java

@@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.psi;
 import com.intellij.lang.ASTNode;
 import org.jetbrains.annotations.NotNull;
 
-public class JetContinueExpression extends JetLabelQualifiedExpression implements JetStatementExpression {
+public class JetContinueExpression extends JetExpressionWithLabel implements JetStatementExpression {
     public JetContinueExpression(@NotNull ASTNode node) {
         super(node);
     }

compiler/frontend/src/org/jetbrains/jet/lang/psi/JetExpressionWithLabel.java

@@ -21,9 +21,9 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.JetNodeTypes;
 
-public class JetLabelQualifiedExpression extends JetExpressionImpl {
+public class JetExpressionWithLabel extends JetExpressionImpl {
 
-    public JetLabelQualifiedExpression(@NotNull ASTNode node) {
+    public JetExpressionWithLabel(@NotNull ASTNode node) {
         super(node);
     }
     

compiler/frontend/src/org/jetbrains/jet/lang/psi/JetInstanceExpressionWithLabel.java

@@ -20,9 +20,9 @@ import com.intellij.lang.ASTNode;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.JetNodeTypes;
 
-public abstract class JetLabelQualifiedInstanceExpression extends JetLabelQualifiedExpression {
+public abstract class JetInstanceExpressionWithLabel extends JetExpressionWithLabel {
 
-    public JetLabelQualifiedInstanceExpression(@NotNull ASTNode node) {
+    public JetInstanceExpressionWithLabel(@NotNull ASTNode node) {
         super(node);
     }
 

compiler/frontend/src/org/jetbrains/jet/lang/psi/JetReturnExpression.java

@@ -20,7 +20,7 @@ import com.intellij.lang.ASTNode;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-public class JetReturnExpression extends JetLabelQualifiedExpression implements JetStatementExpression {
+public class JetReturnExpression extends JetExpressionWithLabel implements JetStatementExpression {
     public JetReturnExpression(@NotNull ASTNode node) {
         super(node);
     }

compiler/frontend/src/org/jetbrains/jet/lang/psi/JetSuperExpression.java

@@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.JetNodeTypes;
 
-public class JetSuperExpression extends JetLabelQualifiedInstanceExpression implements JetStatementExpression {
+public class JetSuperExpression extends JetInstanceExpressionWithLabel implements JetStatementExpression {
 
     public JetSuperExpression(@NotNull ASTNode node) {
         super(node);

compiler/frontend/src/org/jetbrains/jet/lang/psi/JetThisExpression.java

@@ -19,7 +19,7 @@ package org.jetbrains.jet.lang.psi;
 import com.intellij.lang.ASTNode;
 import org.jetbrains.annotations.NotNull;
 
-public class JetThisExpression extends JetLabelQualifiedInstanceExpression {
+public class JetThisExpression extends JetInstanceExpressionWithLabel {
 
     public JetThisExpression(@NotNull ASTNode node) {
         super(node);

compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitor.java

@@ -187,10 +187,10 @@ public class JetVisitor<R, D> extends PsiElementVisitor {
     }
 
     public R visitReturnExpression(@NotNull JetReturnExpression expression, D data) {
-        return visitLabelQualifiedExpression(expression, data);
+        return visitExpressionWithLabel(expression, data);
     }
 
-    public R visitLabelQualifiedExpression(@NotNull JetLabelQualifiedExpression expression, D data) {
+    public R visitExpressionWithLabel(@NotNull JetExpressionWithLabel expression, D data) {
         return visitExpression(expression, data);
     }
 
@@ -199,11 +199,11 @@ public class JetVisitor<R, D> extends PsiElementVisitor {
     }
 
     public R visitBreakExpression(@NotNull JetBreakExpression expression, D data) {
-        return visitLabelQualifiedExpression(expression, data);
+        return visitExpressionWithLabel(expression, data);
     }
 
     public R visitContinueExpression(@NotNull JetContinueExpression expression, D data) {
-        return visitLabelQualifiedExpression(expression, data);
+        return visitExpressionWithLabel(expression, data);
     }
 
     public R visitIfExpression(@NotNull JetIfExpression expression, D data) {
@@ -287,11 +287,11 @@ public class JetVisitor<R, D> extends PsiElementVisitor {
     }
 
     public R visitThisExpression(@NotNull JetThisExpression expression, D data) {
-        return visitLabelQualifiedExpression(expression, data);
+        return visitExpressionWithLabel(expression, data);
     }
 
     public R visitSuperExpression(@NotNull JetSuperExpression expression, D data) {
-        return visitLabelQualifiedExpression(expression, data);
+        return visitExpressionWithLabel(expression, data);
     }
 
     public R visitParenthesizedExpression(@NotNull JetParenthesizedExpression expression, D data) {

compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoid.java

@@ -189,8 +189,8 @@ public class JetVisitorVoid extends JetVisitor<Void, Void> {
         super.visitReturnExpression(expression, null);
     }
 
-    public void visitLabelQualifiedExpression(@NotNull JetLabelQualifiedExpression expression) {
+    public void visitExpressionWithLabel(@NotNull JetExpressionWithLabel expression) {
-        super.visitLabelQualifiedExpression(expression, null);
+        super.visitExpressionWithLabel(expression, null);
     }
 
     public void visitThrowExpression(@NotNull JetThrowExpression expression) {
@@ -661,8 +661,8 @@ public class JetVisitorVoid extends JetVisitor<Void, Void> {
     }
 
     @Override
-    public final Void visitLabelQualifiedExpression(@NotNull JetLabelQualifiedExpression expression, Void data) {
+    public final Void visitExpressionWithLabel(@NotNull JetExpressionWithLabel expression, Void data) {
-        visitLabelQualifiedExpression(expression);
+        visitExpressionWithLabel(expression);
         return null;
     }
 

compiler/frontend/src/org/jetbrains/jet/lang/psi/JetVisitorVoidWithParameter.java

@@ -190,8 +190,8 @@ public class JetVisitorVoidWithParameter<P> extends JetVisitor<Void, P> {
         super.visitReturnExpression(expression, data);
     }
 
-    public void visitLabelQualifiedExpressionVoid(@NotNull JetLabelQualifiedExpression expression, P data) {
+    public void visitExpressionWithLabelVoid(@NotNull JetExpressionWithLabel expression, P data) {
-        super.visitLabelQualifiedExpression(expression, data);
+        super.visitExpressionWithLabel(expression, data);
     }
 
     public void visitThrowExpressionVoid(@NotNull JetThrowExpression expression, P data) {
@@ -658,8 +658,8 @@ public class JetVisitorVoidWithParameter<P> extends JetVisitor<Void, P> {
     }
 
     @Override
-    public final Void visitLabelQualifiedExpression(@NotNull JetLabelQualifiedExpression expression, P data) {
+    public final Void visitExpressionWithLabel(@NotNull JetExpressionWithLabel expression, P data) {
-        visitLabelQualifiedExpressionVoid(expression, data);
+        visitExpressionWithLabelVoid(expression, data);
     	return null;
     }
 

compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/BasicExpressionTypingVisitor.java

@@ -370,7 +370,7 @@ public class BasicExpressionTypingVisitor extends ExpressionTypingVisitor {
 
     @NotNull // No class receivers
     private static LabelResolver.LabeledReceiverResolutionResult resolveToReceiver(
-            JetLabelQualifiedInstanceExpression expression,
+            JetInstanceExpressionWithLabel expression,
             ExpressionTypingContext context,
             boolean onlyClassReceivers
     ) {

compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/LabelResolver.java

@@ -117,7 +117,7 @@ public class LabelResolver {
 
     @Nullable
     public JetElement resolveControlLabel(
-            @NotNull JetLabelQualifiedExpression expression,
+            @NotNull JetExpressionWithLabel expression,
             @NotNull ResolutionContext context
     ) {
         JetSimpleNameExpression labelElement = expression.getTargetLabel();
@@ -170,7 +170,7 @@ public class LabelResolver {
     
     @NotNull
     public LabeledReceiverResolutionResult resolveThisOrSuperLabel(
-            @NotNull JetLabelQualifiedInstanceExpression expression,
+            @NotNull JetInstanceExpressionWithLabel expression,
             @NotNull ResolutionContext context,
             @NotNull Name labelName
     ) {

idea/src/org/jetbrains/jet/plugin/highlighter/LabelsHighlightingVisitor.java

@@ -18,7 +18,7 @@ package org.jetbrains.jet.plugin.highlighter;
 
 import com.intellij.lang.annotation.AnnotationHolder;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.psi.JetLabelQualifiedExpression;
+import org.jetbrains.jet.lang.psi.JetExpressionWithLabel;
 import org.jetbrains.jet.lang.psi.JetPrefixExpression;
 import org.jetbrains.jet.lang.psi.JetSimpleNameExpression;
 import org.jetbrains.jet.lexer.JetTokens;
@@ -37,7 +37,7 @@ class LabelsHighlightingVisitor extends HighlightingVisitor {
     }
 
     @Override
-    public void visitLabelQualifiedExpression(@NotNull JetLabelQualifiedExpression expression) {
+    public void visitExpressionWithLabel(@NotNull JetExpressionWithLabel expression) {
         JetSimpleNameExpression targetLabel = expression.getTargetLabel();
         if (targetLabel != null) {
             JetPsiChecker.highlightName(holder, targetLabel, JetHighlightingColors.LABEL);

js/js.translator/src/org/jetbrains/k2js/translate/expression/ExpressionVisitor.java

@@ -365,7 +365,7 @@ public final class ExpressionVisitor extends TranslatorVisitor<JsNode> {
         return name.charAt(0) == '@' ? name.substring(1) + '$' : name;
     }
 
-    private static String getTargetLabel(JetLabelQualifiedExpression expression, TranslationContext context) {
+    private static String getTargetLabel(JetExpressionWithLabel expression, TranslationContext context) {
         JetSimpleNameExpression labelElement = expression.getTargetLabel();
         if (labelElement == null) {
             return null;