Bug 563144 - [14]

IProblem.SwitchExpressionaYieldSwitchLabeledBlockCompletesNormally
source position change for error reporting

Change-Id: I09edfc648c6eaba3c5735f069da4238893d32595

2 files changed, 6 insertions, 6 deletions

diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/SwitchExpressionsYieldTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/SwitchExpressionsYieldTest.java
index dd142895b0..9f4532e8f4 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/SwitchExpressionsYieldTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/SwitchExpressionsYieldTest.java
@@ -486,7 +486,7 @@ public class SwitchExpressionsYieldTest extends AbstractRegressionTest {
 					"----------\n" +
 					"1. ERROR in X.java (at line 8)\n" +
 					"	default :v = 2;\n" +
-					"	         ^^^^^\n" +
+					"	            ^^\n" +
 					"A switch labeled block in a switch expression should not complete normally\n" +
 					"----------\n";
 			this.runNegativeTest(
@@ -4800,7 +4800,7 @@ public class SwitchExpressionsYieldTest extends AbstractRegressionTest {
 		"----------\n" +
 		"1. ERROR in X.java (at line 9)\n" +
 		"	default :v = 2;\n" +
-		"	         ^^^^^\n" +
+		"	            ^^\n" +
 		"A switch labeled block in a switch expression should not complete normally\n" +
 		"----------\n");
 	}
@@ -4832,12 +4832,12 @@ public class SwitchExpressionsYieldTest extends AbstractRegressionTest {
 		"----------\n" +
 		"1. ERROR in X.java (at line 8)\n" +
 		"	case 2 ->{v = 2;}\n" +
-		"	         ^^^^^^^^\n" +
+		"	               ^^\n" +
 		"A switch labeled block in a switch expression should not complete normally\n" +
 		"----------\n" +
 		"2. ERROR in X.java (at line 9)\n" +
 		"	default ->{v = 2;}\n" +
-		"	          ^^^^^^^^\n" +
+		"	                ^^\n" +
 		"A switch labeled block in a switch expression should not complete normally\n" +
 		"----------\n");
 	}
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemReporter.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemReporter.java
index dddb9efd6c..b51e9ed5e3 100644
--- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemReporter.java
+++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemReporter.java
@@ -11360,7 +11360,7 @@ public void switchExpressionSwitchLabeledBlockCompletesNormally(Block block) {
 		IProblem.SwitchExpressionaYieldSwitchLabeledBlockCompletesNormally,
 		NoArgument,
 		NoArgument,
-		block.sourceStart,
+		block.sourceEnd - 1,
 		block.sourceEnd);
 }
 public void switchExpressionLastStatementCompletesNormally(Statement stmt) {
@@ -11368,7 +11368,7 @@ public void switchExpressionLastStatementCompletesNormally(Statement stmt) {
 		IProblem.SwitchExpressionaYieldSwitchLabeledBlockCompletesNormally,
 		NoArgument,
 		NoArgument,
-		stmt.sourceStart,
+		stmt.sourceEnd - 1,
 		stmt.sourceEnd);
 }
 public void switchExpressionIllegalLastStatement(Statement stmt) {