From 8e0d1b142f5a1cbd055b958e504caafc78dccd1d Mon Sep 17 00:00:00 2001 From: Bas Leijdekkers Date: Fri, 10 Jan 2025 10:08:55 +0100 Subject: [PATCH] Java: fix error message (IDEA-364189) (cherry picked from commit 6ddc29ca9af9523ac8597bc00b920b872a4250b6) GitOrigin-RevId: 4ae3e61c614cde608f4593ec7fa758b2ed6c1a5d --- .../resources/messages/JavaErrorBundle.properties | 2 +- .../daemonCodeAnalyzer/advHighlighting/CtrCallIsFirst.java | 6 +++--- .../advHighlighting/FlexibleConstructorBodies.java | 4 ++-- .../advHighlighting/StatementsBeforeSuper.java | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/java/java-psi-impl/resources/messages/JavaErrorBundle.properties b/java/java-psi-impl/resources/messages/JavaErrorBundle.properties index d47e99f8eefc..f2f1e0c350cb 100644 --- a/java/java-psi-impl/resources/messages/JavaErrorBundle.properties +++ b/java/java-psi-impl/resources/messages/JavaErrorBundle.properties @@ -163,7 +163,7 @@ missing.return.type=Invalid method declaration; return type required duplicate.method=''{0}'' is already defined in ''{1}'' constructor.call.must.be.first.statement=Call to ''{0}'' must be first statement in constructor body constructor.call.only.allowed.in.constructor=Call to ''{0}'' only allowed in constructor body -constructor.call.must.be.top.level.statement=Call to ''{0}'' must be a top level statement in constructor body +constructor.call.must.be.top.level.statement=Call to ''{0}'' must be top-level statement in constructor body only.one.constructor.call.allowed.in.constructor=Only one explicit constructor call allowed in constructor direct.abstract.method.access=Abstract method ''{0}'' cannot be accessed directly unrelated.overriding.methods.return.types=methods have unrelated return types diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/CtrCallIsFirst.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/CtrCallIsFirst.java index be681d1da534..26ffe3d63ec1 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/CtrCallIsFirst.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/CtrCallIsFirst.java @@ -20,14 +20,14 @@ class b extends a { b(String s) { try { - super(2); + super(2); } finally { } } b(String s, int i) { { - super(2); + super(2); } } @@ -41,7 +41,7 @@ class b extends a { } class Z { Z() { - Object x = super(); + Object x = super(); } } class O extends A.B diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/FlexibleConstructorBodies.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/FlexibleConstructorBodies.java index a152b11fa494..188e39a5d754 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/FlexibleConstructorBodies.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/FlexibleConstructorBodies.java @@ -31,14 +31,14 @@ class B extends A { B(String s) { try { - super(2); + super(2); } finally { } } B(String s, int i) { { - super(2); + super(2); } } B(boolean b, int i) { diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/StatementsBeforeSuper.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/StatementsBeforeSuper.java index cc487d3dee93..cec8d0e10be4 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/StatementsBeforeSuper.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/StatementsBeforeSuper.java @@ -28,14 +28,14 @@ class B extends A { B(String s) { try { - super(2); + super(2); } finally { } } B(String s, int i) { { - super(2); + super(2); } } B(boolean b, int i) {