Fixed for Bug4986

Author: RagiGeorge

org.eclipse.jdt.core.compiler.batch/src/org/eclipse/jdt/internal/compiler/problem/ProblemReporter.java

@@ -3357,8 +3357,27 @@ public void importProblem(ImportReference importRef, Binding expectedImport) {
 			case ProblemReasons.NotVisible :
 			case ProblemReasons.NotAccessible :
 				id = (expectedImport.problemId() == ProblemReasons.NotVisible) ? IProblem.NotVisibleField : IProblem.NotAccessibleField;
-				readableArguments = new String[] {CharOperation.toString(importRef.tokens), new String(field.declaringClass.readableName())};
-				shortArguments = new String[] {CharOperation.toString(importRef.tokens), new String(field.declaringClass.shortReadableName())};
+				if (importRef.isStatic() && field.declaringClass != null) {
+					// messages.properties uses:
+					// 71 = The field {1}.{0} is not visible
+					readableArguments = new String[] {
+							new String(field.name), // {0}
+							new String(field.declaringClass.readableName()) // {1}
+					};
+					shortArguments = new String[] {
+							new String(field.name), // {0}
+							new String(field.declaringClass.shortReadableName()) // {1}
+					};
+				} else {
+					readableArguments = new String[] {
+							CharOperation.toString(importRef.tokens),
+							new String(field.declaringClass.readableName())
+					};
+					shortArguments = new String[] {
+							CharOperation.toString(importRef.tokens),
+							new String(field.declaringClass.shortReadableName())
+					};
+				}
 				break;
 			case ProblemReasons.Ambiguous :
 				id = IProblem.AmbiguousField;
@@ -5039,6 +5058,7 @@ private boolean isRecoveredName(char[][] qualifiedName) {
 	return false;
 }
 
+
 public void javadocAmbiguousMethodReference(int sourceStart, int sourceEnd, Binding fieldBinding, int modifiers) {
 	int severity = computeSeverity(IProblem.JavadocAmbiguousMethodReference);
 	if (severity == ProblemSeverities.Ignore) return;

org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NonFatalErrorTest.java

@@ -518,7 +518,7 @@ public void testImportStaticProblems() {
 			"2. ERROR in X.java (at line 2)\n" +
 			"	import static p1.Y.f;\n" +
 			"	              ^^^^^^\n" +
-			"The field Y.p1.Y.f is not visible\n" +
+			"The field Y.f is not visible\n" +
 			"----------\n",
 			"OK",
 			"",

org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/StaticImportTest.java

@@ -254,7 +254,7 @@ public void test005() { // test visibility
 		"1. ERROR in p\\X.java (at line 3)\n" +
 		"	import static p2.Z.Zint;\n" +
 		"	              ^^^^^^^^^\n" +
-		"The field Z.p2.Z.Zint is not visible\n" +
+		"The field Z.Zint is not visible\n" +
 		"----------\n" +
 		"2. ERROR in p\\X.java (at line 4)\n" +
 		"	import static p2.Z.ZMember;\n" +
@@ -1368,7 +1368,7 @@ public void test036() {
 			"1. ERROR in X.java (at line 2)\n" +
 			"	import static p.A.CONSTANT_B;\n" +
 			"	              ^^^^^^^^^^^^^^\n" +
-			"The field B.p.A.CONSTANT_B is not visible\n" +
+			"The field B.CONSTANT_B is not visible\n" +
 			"----------\n" +
 			"2. ERROR in X.java (at line 5)\n" +
 			"	static int j = p.A.CONSTANT_B;\n" +
@@ -2517,7 +2517,7 @@ public void test073() {
 			"1. ERROR in test\\Outer.java (at line 2)\n" +
 			"	import static test.Outer.Inner.VALUE;\n" +
 			"	              ^^^^^^^^^^^^^^^^^^^^^^\n" +
-			"The field Outer.Inner.test.Outer.Inner.VALUE is not visible\n" +
+			"The field Outer.Inner.VALUE is not visible\n" +
 			"----------\n" +
 			"2. ERROR in test\\Outer.java (at line 4)\n" +
 			"	int i = VALUE;\n" +
@@ -3559,4 +3559,37 @@ public class Sub extends Super {}
 		runner.expectedOutputString = "1";
 		runner.runConformTest();
 	}
+
+	// https://github.com/eclipse-jdt/eclipse.jdt.core/issues/4986
+	// Test that error message for inaccessible static import field is correctly formatted
+	public void testBug4986() {
+		this.runNegativeTest(
+			new String[] {
+				"p/C.java",
+				"""
+				package p;
+				
+				import static p.C.f;
+				
+				public class C {
+					private static int f;
+				}
+				"""
+			},
+			"""
+			----------
+			1. ERROR in p\\C.java (at line 3)
+				import static p.C.f;
+				              ^^^^^
+			The field C.f is not visible
+			----------
+			2. WARNING in p\\C.java (at line 6)
+				private static int f;
+				                   ^
+			The value of the field C.f is not used
+			----------
+			"""
+		);
+	}
+
 }