MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 11:50:54 +07:00
Code Issues Packages Projects Releases Wiki Activity

[java-highlighting] JavaCompilationErrorBundle.properties proofreading (DOC-34381)

Browse Source 
GitOrigin-RevId: 05bdca159a63027ea0d1e3d767d4adb9b258f47e
This commit is contained in:
Tagir Valeev
2025-02-13 14:28:26 +01:00
committed by intellij-monorepo-bot
parent 4408629488
commit 2350d69472
58 changed files with 157 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
java/codeserver/highlighting/resources/messages/JavaCompilationErrorBundle.properties
View File

@@ -10,10 +10,10 @@ annotation.not.allowed.var='var' type may not be annotated
annotation.not.allowed.class=Class literal type may not be annotated
annotation.not.allowed.ref=Annotation is not applicable to this kind of reference
annotation.not.allowed.static=Static member qualifying type may not be annotated
annotation.not.allowed.on.package=Package annotations should be in file package-info.java
annotation.not.allowed.on.package=Package annotations should be in the package-info.java file
annotation.not.allowed.in.permit.list=Annotations not allowed in 'permits' list
annotation.type.expected=Annotation type expected
annotation.missing.attribute={0} missing though required
annotation.missing.attribute={0} missing but required
annotation.repeated.target=Repeated annotation target
annotation.attribute.name.missing=Annotation attribute of the form 'name=value' expected
annotation.attribute.unknown.method=Cannot find @interface method ''{0}()''
@@ -29,7 +29,7 @@ annotation.member.invalid.type=Invalid type ''{0}'' for annotation member
annotation.member.clash=@interface member clashes with ''{0}'' in {1}
annotation.may.not.have.extends.list='extends' not allowed on @interface
annotation.cyclic.element.type=Cyclic annotation element type
annotation.container.wrong.place=Container annotation ''{0}'' must not be present at the same time as the element it contains
annotation.container.wrong.place=Container annotation ''{0}'' must not be present together with the element it contains
annotation.container.not.applicable=Container annotation ''@{0}'' is not applicable to {1}
annotation.duplicate=Duplicate annotation
annotation.duplicate.explained=Duplicate annotation. {0}
@@ -42,15 +42,15 @@ annotation.container.missed.annotation=Container annotation ''{0}'' does not hav
annotation.container.no.value=Invalid container annotation ''{0}'': no ''value'' method declared
annotation.container.bad.type=Invalid container annotation ''{0}'': ''value'' method should have type ''{1}''
annotation.container.low.retention=Container annotation ''{0}'' has shorter retention (''{1}'') than the contained annotation
annotation.container.wide.target=Target of container annotation ''{0}'' is not a subset of target of this annotation
annotation.container.wide.target=Target of container annotation ''{0}'' is not a subset of this annotation\u2019s target
annotation.container.abstract=Container annotation ''{0}'' does not have a default value for ''{1}''
lambda.not.a.functional.interface={0} is not a functional interface
lambda.no.target.method.found=No target method found
lambda.multiple.sam.candidates=Multiple non-overriding abstract methods found in {0}
lambda.sam.generic=Target method is generic
lambda.sealed.functional.interface=Functional interface can't be declared as 'sealed'
lambda.not.expected=Lambda expression not expected here
lambda.sealed.functional.interface=Functional interface cannot be declared as 'sealed'
lambda.not.expected=Unexpected lambda expression
lambda.parameters.inconsistent.var=Cannot mix 'var' and explicitly typed parameters in lambda expression
lambda.sealed=Lambda cannot implement a sealed interface
lambda.type.inference.failure=Cannot infer functional interface type
@@ -80,7 +80,7 @@ safe.varargs.on.record.component=@SafeVarargs is not allowed on a record compone
safe.varargs.on.fixed.arity=@SafeVarargs is not allowed on methods with fixed arity
safe.varargs.on.non.final.method=@SafeVarargs is not allowed on non-final instance methods
receiver.wrong.context=Receivers are not allowed outside of method parameter list
receiver.wrong.context=Receivers are not allowed outside of method\u2019s parameter list
receiver.static.context=The receiver cannot be used in a static context
receiver.wrong.position=The receiver should be the first parameter
receiver.type.mismatch=The receiver type does not match the enclosing class type
@@ -105,7 +105,7 @@ class.sealed.no.inheritors=Sealed class must have subclasses
class.sealed.incomplete.permits=Sealed class permits clause must contain all subclasses
class.sealed.inheritor.expected.modifiers.can.be.final=Modifier 'sealed', 'non-sealed' or 'final' expected
class.sealed.inheritor.expected.modifiers=Modifier 'sealed' or 'non-sealed' expected
class.sealed.permits.on.non.sealed=Invalid permits clause: ''{0}'' must be sealed
class.sealed.permits.on.non.sealed=Invalid ''permits'' clause: ''{0}'' must be sealed
class.cannot.extend.multiple.classes=Class cannot extend multiple classes
class.implements.class=Interface expected here
class.extends.interface=No interface expected here
@@ -126,7 +126,7 @@ class.inheritance.method.clash=Methods {0} from {1} and {2} from {3} are inherit
class.not.accessible=Cannot access {0}
class.generic.extends.exception=Generic class may not extend 'java.lang.Throwable'
class.initializer.must.complete.normally=Initializer must be able to complete normally
class.permitted.not.direct.subclass=Invalid permits clause: ''{0}'' must directly {1, choice, 1#extend|2#implement} ''{2}''
class.permitted.not.direct.subclass=Invalid ''permits'' clause: ''{0}'' must directly {1, choice, 1#extend|2#implement} ''{2}''
class.permitted.must.have.modifier=All sealed class subclasses must either be final, sealed or non-sealed
class.or.package.expected=Expected class or package
@@ -144,12 +144,12 @@ interface.class.initializer=Class initializer is not allowed in interface
interface.implements='implements' not allowed on interface
interface.extends.class=Interface expected here
record.instance.initializer=Instance initializer is not allowed in record
record.instance.field=Instance field is not allowed in record
record.instance.initializer=Instance initializer is not allowed in records
record.instance.field=Instance field is not allowed in records
record.no.header=Record has no header declared
record.header.regular.class=Record header declared for non-record
record.extends='extends' not allowed on record
record.permits='permits' not allowed on record
record.extends='extends' not allowed on records
record.permits='permits' not allowed on records
record.component.vararg.not.last=Vararg record component must be the last in the list
record.component.cstyle.declaration=C-style array declaration not allowed in record component
record.component.restricted.name=Illegal record component name ''{0}''
@@ -158,7 +158,7 @@ record.accessor.wrong.return.type=Incorrect component accessor return type. Expe
record.accessor.non.public=Record component accessor must be 'public'
record.constructor.stronger.access={0} access level cannot be more restrictive than the record access level (''{1}'')
record.special.method.type.parameters={0} cannot have type parameters
record.special.method.throws={0} should not declare ''throws'' clause
record.special.method.throws={0} should not declare a ''throws'' clause
record.canonical.constructor.wrong.parameter.type=Incorrect parameter type for record component ''{0}''. Expected: ''{1}'', found: ''{2}''
record.canonical.constructor.wrong.parameter.name=Canonical constructor parameter names must match record component names. Expected: ''{0}'', found: ''{1}''
record.no.constructor.call.in.non.canonical=Non-canonical record constructor must delegate to another constructor
@@ -198,7 +198,7 @@ type.parameter.actual.inferred.mismatch=Actual type argument and inferred type c
method.duplicate=''{0}'' is already defined in ''{1}''
method.throws.class.name.expected=Class name expected
method.interface.body=Interface abstract methods cannot have body
method.interface.body=Interface abstract methods cannot have a body
method.abstract.body=Abstract methods cannot have a body
method.abstract.in.non.abstract.class=Abstract method in non-abstract class
method.native.body=Native methods cannot have a body
@@ -214,7 +214,7 @@ method.static.overrides.instance=Static method ''{0}'' in ''{1}'' cannot overrid
method.overrides.final=''{0}'' cannot override ''{1}'' in ''{2}''; overridden method is final
method.inheritance.weaker.privileges={0}; attempting to assign weaker access privileges (''{1}''); was ''{2}''
method.inheritance.clash.unrelated.return.types={0}; methods have unrelated return types
method.inheritance.clash.incompatible.return.types={0}; attempting to use incompatible return type
method.inheritance.clash.incompatible.return.types={0}; incompatible return type
method.inheritance.clash.does.not.throw={0}; overridden method does not throw ''{1}''
method.no.parameter.list=Parameter list expected
method.missing.return.type=Invalid method declaration; return type required
@@ -225,7 +225,7 @@ clash.methods.message=''{0}'' clashes with ''{1}''
clash.methods.message.show.classes=''{0}'' in ''{2}'' clashes with ''{1}'' in ''{3}''
constructor.ambiguous.implicit.call=Ambiguous implicit constructor call: both ''{0}'' and ''{1}'' match
constructor.no.default=There is no parameterless constructor available in ''{0}''
constructor.no.default=There is no no-arg constructor available in ''{0}''
constructor.in.implicit.class=Explicit constructor in implicitly declared class is not allowed
type.incompatible=Incompatible types. Found: ''{1}'', required: ''{0}''
@@ -235,7 +235,7 @@ type.incompatible.reason.ambiguous.method.reference=reason: method reference is
type.incompatible.reason.inference=reason: {0}
type.void.not.allowed='void' type is not allowed here
type.void.illegal=Illegal type: 'void'
type.inaccessible=''{0}'' is inaccessible here
type.inaccessible=''{0}'' is inaccessible from here
type.restricted.identifier=Illegal reference to restricted type ''{0}''
type.unknown.class=Unknown class: ''{0}''
type.argument.primitive=Type argument cannot be of a primitive type
@@ -245,9 +245,9 @@ type.argument.on.raw.method=Type arguments given on a raw method
type.argument.in.permits.list=Generics are not allowed in permits list
type.wildcard.cannot.be.instantiated=Wildcard type ''{0}'' cannot be instantiated directly
type.wildcard.not.expected=No wildcard expected
type.wildcard.may.be.used.only.as.reference.parameters=Wildcards may be used only as reference parameters
type.wildcard.may.be.used.only.as.reference.parameters=Wildcards may only be used as reference parameters
lvti.no.initializer=Cannot infer type: 'var' on variable without initializer
lvti.no.initializer=Cannot infer type: 'var' on variable without an initializer
lvti.lambda=Cannot infer type: lambda expression requires an explicit target type
lvti.method.reference=Cannot infer type: method reference requires an explicit target type
lvti.array='var' is not allowed as an element type of an array
@@ -273,12 +273,12 @@ foreach.not.applicable=Foreach not applicable to type ''{0}''
new.expression.qualified.malformed=Invalid qualified new
new.expression.qualified.static.class=Qualified new of static class
new.expression.qualified.anonymous.implements.interface=Anonymous class implements interface; cannot have qualifier for new
new.expression.qualified.anonymous.implements.interface=Unexpected qualifier for anonymous class implementing interface
new.expression.qualified.qualified.class.reference=Qualified class reference is not allowed in qualified new
new.expression.diamond.not.allowed=Diamond operator is not allowed here
new.expression.diamond.not.applicable=Diamond operator is not applicable for non-parameterized types
new.expression.diamond.not.applicable=Diamond operator is not applicable to non-parameterized types
new.expression.diamond.inference.failure={0}
new.expression.diamond.anonymous.inner.non.private=Cannot use '<>' due to non-private method which doesn't override or implement a method from a supertype
new.expression.diamond.anonymous.inner.non.private=Cannot use '<>' due to a non-private method which doesn't override or implement a method from a supertype
new.expression.anonymous.implements.interface.with.type.arguments=Anonymous class implements interface; cannot have type arguments
new.expression.arguments.to.default.constructor.call=Default constructor is invoked with arguments
new.expression.unresolved.constructor=Cannot resolve constructor ''{0}''
@@ -309,14 +309,14 @@ statement.bad.expression=Not a statement
statement.unreachable=Unreachable statement
statement.unreachable.loop.body=Loop condition is always false making the loop body unreachable
switch.rule.should.produce.result=Switch expression rule should produce result in all execution paths
switch.rule.should.produce.result=Switch expression rule should produce a result in all execution paths
switch.expression.no.result=Switch expression does not have any result expressions
switch.expression.should.produce.result=Switch expression should produce result in all execution paths
switch.expression.should.produce.result=Switch expression should produce a result in all execution paths
switch.expression.incompatible.type=Bad type in switch expression: {0} cannot be converted to {1}
switch.expression.cannot.be.void=Target type for switch expression cannot be void
guard.misplaced=Guard is allowed after patterns only
guard.evaluated.to.false=This case label has a guard that is a constant expression with value 'false'
guard.evaluated.to.false=Case label has a guard that is a constant expression with value 'false'
comment.shebang.java.file=Shebang mechanism in .java files is not permitted
comment.unclosed=Unclosed comment
@@ -338,20 +338,20 @@ literal.string.illegal.escape=Illegal escape character in string literal
literal.text.block.unclosed=Unclosed text block
literal.text.block.no.new.line=Illegal text block start: missing new line after opening quotes
#{0} - exceptions list (comma separated), {1} - exceptions count in the list
#{0} - exception list (comma separated), {1} - exceptions count in the list
exception.unhandled=Unhandled {1, choice, 0#exception|2#exceptions}: {0}
#{0} - exceptions list (comma separated), {1} - exceptions count in the list
#{0} - exception list (comma separated), {1} - exceptions count in the list
exception.unhandled.close=Unhandled {1, choice, 0#exception|2#exceptions} from auto-closeable resource: {0}
exception.must.be.disjoint=Types in multi-catch must be disjoint: ''{0}'' is a subclass of ''{1}''
exception.already.caught=Exception ''{0}'' has already been caught
exception.never.thrown.try=Exception ''{0}'' is never thrown in the corresponding try block
exception.never.thrown.try.multi=Exception ''{0}'' is never thrown in the corresponding try block
call.super.enum.constructor=Call to super is not allowed in enum constructor
call.super.enum.constructor=Call to 'super' is not allowed in enum constructor
call.super.qualifier.not.inner.class=Qualifier is not allowed because superclass ''{0}'' is not a non-static inner class
call.expected=Method call expected
call.static.interface.method.qualifier=Static method may only be called on its containing interface
call.formal.varargs.element.type.inaccessible.here=Formal varargs element type {0} is inaccessible here
call.formal.varargs.element.type.inaccessible.here=Formal varargs element type {0} is inaccessible from here
call.type.inference.error={0}
call.wrong.arguments=''{0}'' in ''{1}'' cannot be applied to ''{2}''
call.wrong.arguments.count.mismatch=Expected {0, choice, 0#no arguments|1#1 argument|1<{0} arguments} but found {1}
@@ -407,7 +407,7 @@ variable.already.assigned=Variable ''{0}'' might already have been assigned to
variable.already.assigned.constructor=Cannot assign final field ''{0}'' after chained constructor call
variable.already.assigned.field=Final field ''{0}'' is already initialized in another field initializer
variable.already.assigned.initializer=Final field ''{0}'' is already initialized in a class initializer
variable.assigned.in.loop=Variable ''{0}'' might be assigned in loop
variable.assigned.in.loop=Variable ''{0}'' might be assigned in a loop
variable.already.defined=Variable ''{0}'' is already defined in the scope
field.not.initialized=Field ''{0}'' might not have been initialized
field.initialized.before.constructor.call=Cannot assign initialized field ''{0}'' before superclass constructor is called
@@ -431,9 +431,9 @@ expression.super.no.enclosing.instance=No enclosing instance of type ''{0}'' is
expression.super.unqualified.default.method=Unqualified super reference is not allowed in extension method
expression.qualified.class.expected=Class name expected here
expression.class.type.parameter=Cannot access class object of a type parameter
expression.class.parameterized.type=Cannot access class object of parameterized type
expression.class.parameterized.type=Cannot access class object of a parameterized type
resource.declaration.or.variable.expected=Declaration, final or effectively final variable expected
resource.declaration.or.variable.expected=Declaration, final, or effectively final variable expected
assignment.declared.outside.guard=Cannot assign a value to variable ''{0}'', because it is declared outside the guard
assignment.to.final.variable=Cannot assign a value to final variable ''{0}''
@@ -468,7 +468,7 @@ import.static.on.demand.resolves.to.class=Class {0} not found
import.list.extra.semicolon=Extra semicolons between import statements are not allowed
import.module.not.allowed=Import module is not allowed
underscore.identifier=Since Java 9, '_' is a keyword, and may not be used as an identifier
underscore.identifier=Since Java 9, '_' is a keyword and may not be used as an identifier
underscore.identifier.unnamed=Using '_' as a reference is not allowed
underscore.identifier.lambda=Use of '_' as a lambda parameter name is not allowed
@@ -489,7 +489,7 @@ return.missing=Missing return statement
catch.type.parameter=Cannot catch type parameters
module.no.package=A module file should not have 'package' statement
module.no.package=A module file should not have a 'package' statement
module.conflicting.packages=Package ''{0}'' exists in another module: {1}
module.conflicting.reads=Module ''{0}'' reads package ''{1}'' from both ''{2}'' and ''{3}''
module.file.wrong.name=Module declaration should be in a file named 'module-info.java'
@@ -510,7 +510,7 @@ module.service.inner=The service implementation is an inner class: {0}
module.service.no.constructor=The service implementation does not have a public default constructor: {0}
module.not.found=Module not found: {0}
module.not.on.path=Module is not in dependencies: {0}
module.cyclic.dependence=Cyclic dependence: {0}
module.cyclic.dependence=Cyclic dependency: {0}
module.duplicate.exports.target=Duplicate ''exports'' target: {0}
module.duplicate.opens.target=Duplicate ''opens'' target: {0}
module.duplicate.implementation=Duplicate implementation: {0}

8
java/java-analysis-api/resources/messages/JavaAnalysisBundle.properties
View File

@@ -412,12 +412,12 @@ inspection.contract.checker.contract.violated=Contract clause ''{0}'' is violate
inspection.contract.checker.no.exception.thrown=Contract clause ''{0}'' is violated: no exception is thrown
inspection.contract.checker.method.always.fails.trivial=Return value of clause ''{0}'' could be replaced with ''fail'' as method always fails
inspection.contract.checker.method.always.fails.nontrivial=Return value of clause ''{0}'' could be replaced with ''fail'' as method always fails in this case
contract.return.validator.not.applicable.for.constructor=not applicable for constructor
contract.return.validator.not.applicable.static=not applicable for static method
contract.return.validator.not.applicable.primitive=not applicable for primitive return type ''{0}''
contract.return.validator.not.applicable.for.constructor=not applicable to constructor
contract.return.validator.not.applicable.static=not applicable to static method
contract.return.validator.not.applicable.primitive=not applicable to primitive return type ''{0}''
contract.return.validator.return.type.must.be.boolean=method return type must be 'boolean'
contract.return.validator.method.return.incompatible.with.method.containing.class=method return type should be compatible with method containing class
contract.return.validator.too.few.parameters=not applicable for method that has {0, choice, 0#no parameters|1#one parameter|2#{0} parameters}
contract.return.validator.too.few.parameters=not applicable to method that has {0, choice, 0#no parameters|1#one parameter|2#{0} parameters}
contract.return.validator.incompatible.return.parameter.type=return type ''{0}'' must be convertible from parameter type ''{1}''
contract.return.value.validation.prefix=Contract return value ''{0}'':
suspicious.invocation.handler.implementation.display.name=Suspicious 'InvocationHandler' implementation

2
java/java-frontback-psi-api/resources/messages/JavaPsiBundle.properties
View File

@@ -263,7 +263,7 @@ diamond.error.explicit.type.parameters.for.constructor=Cannot use diamonds with
diamond.error.cannot.infer.arguments=Cannot infer arguments
diamond.error.cannot.infer.arguments.unable.to.resolve.constructor=Cannot infer arguments (unable to resolve constructor)
diamond.error.anonymous.inner.classes=Cannot use '<>' with anonymous inner classes
diamond.error.anonymous.inner.classes.non.private=Cannot use '<>' due to non-private method which doesn't override or implement a method from a supertype
diamond.error.anonymous.inner.classes.non.private=Cannot use '<>' due to a non-private method which doesn't override or implement a method from a supertype
diamond.error.cannot.infer.type.arguments=Cannot infer type arguments for {0}
error.incompatible.type.no.type.variable=no instance(s) of type variable(s) exist so that {0}
error.incompatible.type.no.type.variable.0=no instance(s) of type variable(s) {0} exist so that {1}

2
java/java-psi-impl/resources/messages/JavaErrorBundle.properties
View File

@@ -53,7 +53,7 @@ switch.pattern.expected=Pattern expected for switch selector type ''{0}''
unexpected.type=Unexpected type. Found: ''{1}'', required: ''{0}''
incompatible.types.reason.ambiguous.method.reference=<br/>reason: method reference is ambiguous: both ''{0}'' and ''{1}'' match
incompatible.switch.null.type=''{0}'' cannot be converted to ''{1}''
inaccessible.type=''{0}'' is inaccessible here
inaccessible.type=''{0}'' is inaccessible from here
valid.switch.selector.types=byte, char, short or int
valid.switch.1_7.selector.types=char, byte, short, int, Character, Byte, Short, Integer, String, or an enum
switch.illegal.fall.through.to=Illegal fall-through to a pattern

4
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advFixture/ProtectedInnerClass.java
View File

@@ -3,8 +3,8 @@ import a.*;
public class Foo {
private <T> T f() { return null;}
void m(Outer o){
o.get(f<error descr="'a.Outer.Inner' is inaccessible here">()</error>);
o.get(f<error descr="'a.Outer.Inner' is inaccessible from here">()</error>);
o.get1();
o.f = f<error descr="'a.Outer.Inner' is inaccessible here">()</error>;
o.f = f<error descr="'a.Outer.Inner' is inaccessible from here">()</error>;
}
}

12
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/AccessLevelClash.java
View File

@@ -7,7 +7,7 @@ public class a implements i {
void <error descr="'ff()' in 'a' clashes with 'ff()' in 'i'; attempting to assign weaker access privileges ('package-private'); was 'public'">ff</error>() {}
}
class ai implements i {
public <error descr="'ff()' in 'ai' clashes with 'ff()' in 'i'; attempting to use incompatible return type">int</error> ff() { return 0;}
public <error descr="'ff()' in 'ai' clashes with 'ff()' in 'i'; incompatible return type">int</error> ff() { return 0;}
}
class c2 implements i {
@@ -29,7 +29,7 @@ class c4 extends c3 {
private String fff(String s) throws java.io.IOException { return null; }
}
class c4i extends c3 {
protected <error descr="'g()' in 'c4i' clashes with 'g()' in 'c2'; attempting to use incompatible return type">Object</error> g() {return null;}
protected <error descr="'g()' in 'c4i' clashes with 'g()' in 'c2'; incompatible return type">Object</error> g() {return null;}
}
// sibling inheritance
@@ -39,7 +39,7 @@ interface i5 { void ff(); }
}
class c7 { public String ff() { return null;} }
<error descr="'ff()' in 'c7' clashes with 'ff()' in 'i5'; attempting to use incompatible return type">class c8 extends c7 implements i5</error> {
<error descr="'ff()' in 'c7' clashes with 'ff()' in 'i5'; incompatible return type">class c8 extends c7 implements i5</error> {
}
// interface should not clash with Object
@@ -47,9 +47,9 @@ interface A {
Object clone() throws CloneNotSupportedException;
void finalize();
<error descr="'hashCode()' in 'A' clashes with 'hashCode()' in 'java.lang.Object'; attempting to use incompatible return type">void</error> hashCode();
<error descr="'equals(Object)' in 'A' clashes with 'equals(Object)' in 'java.lang.Object'; attempting to use incompatible return type">void</error> equals(Object o);
<error descr="'toString()' in 'A' clashes with 'toString()' in 'java.lang.Object'; attempting to use incompatible return type">void</error> toString();
<error descr="'hashCode()' in 'A' clashes with 'hashCode()' in 'java.lang.Object'; incompatible return type">void</error> hashCode();
<error descr="'equals(Object)' in 'A' clashes with 'equals(Object)' in 'java.lang.Object'; incompatible return type">void</error> equals(Object o);
<error descr="'toString()' in 'A' clashes with 'toString()' in 'java.lang.Object'; incompatible return type">void</error> toString();
}
interface ConflictWithObject {

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/AssignToFinal.java
View File

@@ -126,7 +126,7 @@ class T29a {
private final int j;
T29a (int b) {
do {
<error descr="Variable 'j' might be assigned in loop">j</error> = 34; // not guaranteed by JLS to only be executed once
<error descr="Variable 'j' might be assigned in a loop">j</error> = 34; // not guaranteed by JLS to only be executed once
if (j > 0) break;
} while (b == 1);
}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/CanHaveBody.java
View File

@@ -12,5 +12,5 @@ abstract public class a1 {
}
interface ii {
<error descr="Interface abstract methods cannot have body">int iif(int i) throws Exception</error> { return 2; }
<error descr="Interface abstract methods cannot have a body">int iif(int i) throws Exception</error> { return 2; }
}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/QualifiedNew.java
View File

@@ -29,7 +29,7 @@ class WithAnonym {
class WithAnonymInheritor extends WithAnonym {
{
<error descr="Anonymous class implements interface; cannot have qualifier for new">this.new I() {}</error>;
<error descr="Unexpected qualifier for anonymous class implementing interface">this.new I() {}</error>;
this.new Inner() {};
}
}

4
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/StaticOverride.java
View File

@@ -22,7 +22,7 @@ interface ii {
int f();
}
<error descr="'f()' in 'a1' clashes with 'f()' in 'ii'; attempting to use incompatible return type">abstract class c_a1_ii extends a1 implements ii</error> {
<error descr="'f()' in 'a1' clashes with 'f()' in 'ii'; incompatible return type">abstract class c_a1_ii extends a1 implements ii</error> {
}
interface i2 {
@@ -94,7 +94,7 @@ class StA {
}
}
class StB extends StA {
public static <error descr="'createInstance()' in 'StB' clashes with 'createInstance()' in 'StA'; attempting to use incompatible return type">String</error> createInstance() {
public static <error descr="'createInstance()' in 'StB' clashes with 'createInstance()' in 'StA'; incompatible return type">String</error> createInstance() {
return null;
}
}

4
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/UnhandledExceptionsInSuperclass.java
View File

@@ -7,11 +7,11 @@ class a {
// super ctr
<error descr="There is no parameterless constructor available in 'a'">class b extends a</error> {
<error descr="There is no no-arg constructor available in 'a'">class b extends a</error> {
}
class c extends a {
<error descr="There is no parameterless constructor available in 'a'">c()</error> {
<error descr="There is no no-arg constructor available in 'a'">c()</error> {
}
c(String s) {

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/Unreachable.java
View File

@@ -475,7 +475,7 @@ class ManyExitsFromTry {
outer:
{
while (true) {
<error descr="Variable 'i' might be assigned in loop">i</error> = 1;
<error descr="Variable 'i' might be assigned in a loop">i</error> = 1;
try {
if (i > 1) continue;
if (i > 2) break;

4
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/VarDoubleInitialization.java
View File

@@ -35,7 +35,7 @@ public class a21 {
void f7(int i) {
final int j;
while (i < 4) {
<error descr="Variable 'j' might be assigned in loop">j</error> = 2;
<error descr="Variable 'j' might be assigned in a loop">j</error> = 2;
final int ii = 4;
i+=ii;
}
@@ -130,7 +130,7 @@ class A {
final int k;
A() {
for (;;) {
<error descr="Variable 'k' might be assigned in loop">k</error>=0;
<error descr="Variable 'k' might be assigned in a loop">k</error>=0;
}
}
}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting6/IDEADEV11877.java
View File

@@ -3,7 +3,7 @@ interface MyCloneable {
//protected method from java.lang.Object is not implicitly declared in interface with no base interfaces
int clone();
<error descr="'toString()' in 'MyCloneable' clashes with 'toString()' in 'java.lang.Object'; attempting to use incompatible return type">int</error> toString();
<error descr="'toString()' in 'MyCloneable' clashes with 'toString()' in 'java.lang.Object'; incompatible return type">int</error> toString();
}
interface MyCloneable1 {

4
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/InaccessibleInferredTypeForVarargsArgument.java
View File

@@ -2,7 +2,7 @@ import java.util.Arrays;
class Test {
{
Arrays.asList<error descr="Formal varargs element type Outer.A is inaccessible here">(new Outer.B(), new Outer.C())</error>;
Arrays.asList<error descr="Formal varargs element type Outer.A is inaccessible from here">(new Outer.B(), new Outer.C())</error>;
}
}
@@ -19,6 +19,6 @@ class An {
class C {
{
An.foo<error descr="Formal varargs element type An.B is inaccessible here">()</error>;
An.foo<error descr="Formal varargs element type An.B is inaccessible from here">()</error>;
}
}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting7/SwitchByInaccessibleEnum.java
View File

@@ -13,7 +13,7 @@ interface A {
class D {
public static void f(A a) {
A.B b = a.getB();
switch (<error descr="'A.B.C' is inaccessible here">b.c</error>) {
switch (<error descr="'A.B.C' is inaccessible from here">b.c</error>) {
case SOME:
break;
}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting9/DiamondsWithAnonymousDiamond.java
View File

@@ -18,7 +18,7 @@ class Outer {
@Override
public void m() {}
};
I<String> i2 = new I<error descr="Cannot use '<>' due to non-private method which doesn't override or implement a method from a supertype"><></error>() {
I<String> i2 = new I<error descr="Cannot use '<>' due to a non-private method which doesn't override or implement a method from a supertype"><></error>() {
@Override
public void m() {}
public void m1() {}

4
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting9/TryWithResources.java
View File

@@ -52,7 +52,7 @@ class TryWithResources {
}
void testMoreUsefulParseForIncorrectExpression() {
try (<error descr="Declaration, final or effectively final variable expected">new Resource()</error>) {}
try (<error descr="Declaration, final or effectively final variable expected">Resource.create()</error>) {}
try (<error descr="Declaration, final, or effectively final variable expected">new Resource()</error>) {}
try (<error descr="Declaration, final, or effectively final variable expected">Resource.create()</error>) {}
}
}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting9/Underscore.java
View File

@@ -1,3 +1,3 @@
class Undescore {
void <error descr="Since Java 9, '_' is a keyword, and may not be used as an identifier">_</error>() { }
void <error descr="Since Java 9, '_' is a keyword and may not be used as an identifier">_</error>() { }
}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlightingPatterns/UnnamedPatternsUnavailable.java
View File

@@ -2,7 +2,7 @@ public class UnnamedPatterns {
record R(int a, int b) {}
void test(Object obj) {
if (obj instanceof <error descr="Since Java 9, '_' is a keyword, and may not be used as an identifier">_</error>) {}
if (obj instanceof <error descr="Since Java 9, '_' is a keyword and may not be used as an identifier">_</error>) {}
if (obj instanceof R(<error descr="Unnamed patterns and variables are not supported at language level '20'">_</error>, <error descr="Unnamed patterns and variables are not supported at language level '20'">_</error>)) {}
if (obj instanceof R(int a, <error descr="Unnamed patterns and variables are not supported at language level '20'">_</error>)) {

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlightingPatternsInSwitch/SwitchExprHasResult.java
View File

@@ -39,7 +39,7 @@ class Test {
String nestedPattern(Object o) {
return switch (o) {
<error descr="Switch expression rule should produce result in all execution paths">default</error> -> {
<error descr="Switch expression rule should produce a result in all execution paths">default</error> -> {
switch (o) {
case Integer i -> {
System.out.println(); // completes normally

4
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlightingPatternsInSwitch/WhenExpressionIsFalse.java
View File

@@ -2,9 +2,9 @@ public class Main {
void foo(Object obj) {
final boolean flag = false;
switch (obj) {
case String s when <error descr="This case label has a guard that is a constant expression with value 'false'">false</error> -> {}
case String s when <error descr="Case label has a guard that is a constant expression with value 'false'">false</error> -> {}
case String s when s.length() < 0 -> {}
case String s when <error descr="This case label has a guard that is a constant expression with value 'false'">((flag || flag)) && 1 < 0</error> -> {}
case String s when <error descr="Case label has a guard that is a constant expression with value 'false'">((flag || flag)) && 1 < 0</error> -> {}
default -> {}
}
}

4
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlightingRecords/RecordAccessors.java
View File

@@ -15,7 +15,7 @@ record RecNonPublic(int x, int y, int z) {
private int <error descr="Record component accessor must be 'public'">z</error>() {return z;}
}
record RecThrows(int x) {
public int x() <error descr="Record component accessor should not declare 'throws' clause">throws</error> Exception {return x;}
public int x() <error descr="Record component accessor should not declare a 'throws' clause">throws</error> Exception {return x;}
public int y() throws Exception {return x;}
}
record CheckOverride(int x) {
@@ -29,4 +29,4 @@ record VarArg(int... x) {
interface I {
String bar();
}
record Impl(<error descr="'bar()' in 'Impl' clashes with 'bar()' in 'I'; attempting to use incompatible return type">int</error> bar) implements I {}
record Impl(<error descr="'bar()' in 'Impl' clashes with 'bar()' in 'I'; incompatible return type">int</error> bar) implements I {}

10
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlightingRecords/RecordBasics.java
View File

@@ -8,8 +8,8 @@ record NoComponents() {}
class ClassWithComponents<error descr="Record header declared for non-record">(int x)</error> {}
class ClassWithComponents2<error descr="Record header declared for non-record">(int x, int y)</error> {}
<error descr="Modifier 'abstract' not allowed here">abstract</error> record AbstractRecord() {}
record ExtendsObject() <error descr="'extends' not allowed on record">extends</error> Object {}
record PermitsObject() <error descr="'permits' not allowed on record">permits</error> Object {}
record ExtendsObject() <error descr="'extends' not allowed on records">extends</error> Object {}
record PermitsObject() <error descr="'permits' not allowed on records">permits</error> Object {}
class ExtendsRecord extends <error descr="Cannot inherit from record 'NoComponents'">NoComponents</error> {}
abstract class ExtendsJLR extends <error descr="Classes cannot directly extend 'java.lang.Record'">Record</error> {}
class AnonymousExtendsJLR {
@@ -61,9 +61,9 @@ class Outer {
}
record ProhibitedMembers() {
<error descr="Instance field is not allowed in record">int x = 5;</error>
<error descr="Instance field is not allowed in records">int x = 5;</error>
<error descr="Instance initializer is not allowed in record">{
<error descr="Instance initializer is not allowed in records">{
System.out.println("initializer");
}</error>
<error descr="Modifier 'native' not allowed here">native</error> void test();
@@ -76,7 +76,7 @@ record CStyle(int a<error descr="C-style array declaration not allowed in record
record CStyle2(int[] a<error descr="C-style array declaration not allowed in record component">[] []</error> ) {}
record JavaStyle(int[] [] a) {}
record SafeVarargComponent(<error descr="@SafeVarargs is not allowed on a record component">@SafeVarargs</error> int... component) {}
record ExtendsRecordExplicitly() <error descr="'extends' not allowed on record">extends</error> java.lang.Record {}
record ExtendsRecordExplicitly() <error descr="'extends' not allowed on records">extends</error> java.lang.Record {}
record AbstractMethod() {
<error descr="Abstract method in non-abstract class">abstract</error> void f();

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlightingRecords/RecordCompactConstructors.java
View File

@@ -9,7 +9,7 @@ record NonPublic(int x) {
}
}
record Throws(int x) {
public Throws <error descr="Compact constructor should not declare 'throws' clause">throws</error> Throwable {}
public Throws <error descr="Compact constructor should not declare a 'throws' clause">throws</error> Throwable {}
}
record Generic() {
public <error descr="Compact constructor cannot have type parameters"><T></error> Generic {}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlightingRecords/RecordConstructors.java
View File

@@ -7,7 +7,7 @@ record Generic(String x) {
public <T> Generic() {this("");}
}
record Throws() {
public Throws() <error descr="Canonical constructor should not declare 'throws' clause">throws</error> Throwable {}
public Throws() <error descr="Canonical constructor should not declare a 'throws' clause">throws</error> Throwable {}
public Throws(int x) throws Throwable { this(); }
}
record TypeMismatch<T>(T t) {

4
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlightingSealedTypes/PermitsList.java
View File

@@ -2,7 +2,7 @@ package p;
import java.lang.annotation.ElementType;
import java.lang.annotation.Target;
interface I0 <error descr="Invalid permits clause: 'I0' must be sealed">permits</error> I {}
interface I0 <error descr="Invalid 'permits' clause: 'I0' must be sealed">permits</error> I {}
sealed interface I extends I0 permits <error descr="Cannot resolve symbol 'Unresolved'">Unresolved</error>, I1, <error descr="Duplicate reference to 'p.I1' in 'permits' list">I1</error>{}
non-sealed interface I1 extends I {}
@@ -16,7 +16,7 @@ class Usage {
}
sealed interface Indirect permits <error descr="Invalid permits clause: 'IndirectInheritor' must directly implement 'Indirect'">IndirectInheritor</error>, MiddleMan {}
sealed interface Indirect permits <error descr="Invalid 'permits' clause: 'IndirectInheritor' must directly implement 'Indirect'">IndirectInheritor</error>, MiddleMan {}
non-sealed interface MiddleMan extends Indirect {}
final class IndirectInheritor implements MiddleMan {}

4
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlightingSealedTypes/SealedClassCast.java
View File

@@ -32,8 +32,8 @@ interface Foo {
sealed interface W permits X {}
final class X implements W {}
sealed class Recursive1 permits <error descr="Invalid permits clause: 'Recursive2' must directly extend 'Recursive1'">Recursive2</error> {}
sealed class Recursive2 permits <error descr="Invalid permits clause: 'Recursive1' must directly extend 'Recursive2'">Recursive1</error> {}
sealed class Recursive1 permits <error descr="Invalid 'permits' clause: 'Recursive2' must directly extend 'Recursive1'">Recursive2</error> {}
sealed class Recursive2 permits <error descr="Invalid 'permits' clause: 'Recursive1' must directly extend 'Recursive2'">Recursive1</error> {}
interface I1 {}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlightingSealedTypes/SealedFunctionalInterface.java
View File

@@ -1,4 +1,4 @@
<error descr="Functional interface can't be declared as 'sealed'">@FunctionalInterface</error>
<error descr="Functional interface cannot be declared as 'sealed'">@FunctionalInterface</error>
sealed interface I {
void m();
}

10
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlightingUnnamed/UnnamedVariablesJava9.java
View File

@@ -2,18 +2,18 @@ import java.util.function.*;
public class UnnamedVariables {
void testParameter(<error descr="Unnamed patterns and variables are not supported at language level '9'">int _</error>, <error descr="Unnamed patterns and variables are not supported at language level '9'">String _</error>) {
System.out.println(<error descr="Since Java 9, '_' is a keyword, and may not be used as an identifier">_</error>);
System.out.println(<error descr="Since Java 9, '_' is a keyword and may not be used as an identifier">_</error>);
}
<error descr="Unnamed patterns and variables are not supported at language level '9'">int _ = 123;</error>
String s = <error descr="Since Java 9, '_' is a keyword, and may not be used as an identifier">_</error>;
String s = <error descr="Since Java 9, '_' is a keyword and may not be used as an identifier">_</error>;
void testLambda() {
Consumer<String> consumer = <error descr="Unnamed patterns and variables are not supported at language level '9'">_</error> -> System.out.println("Hello");
Consumer<String> consumer2 = <error descr="Unnamed patterns and variables are not supported at language level '9'">_</error> -> System.out.println(<error descr="Since Java 9, '_' is a keyword, and may not be used as an identifier">_</error>);
Consumer<String> consumer3 = <error descr="Unnamed patterns and variables are not supported at language level '9'">_</error> -> System.out.println(<error descr="Since Java 9, '_' is a keyword, and may not be used as an identifier">_</error>.trim());
Consumer<String> consumer2 = <error descr="Unnamed patterns and variables are not supported at language level '9'">_</error> -> System.out.println(<error descr="Since Java 9, '_' is a keyword and may not be used as an identifier">_</error>);
Consumer<String> consumer3 = <error descr="Unnamed patterns and variables are not supported at language level '9'">_</error> -> System.out.println(<error descr="Since Java 9, '_' is a keyword and may not be used as an identifier">_</error>.trim());
Consumer<String> consumer4 = <error descr="Unnamed patterns and variables are not supported at language level '9'">_</error> -> {
<error descr="Cannot resolve symbol 'var'" textAttributesKey="WRONG_REFERENCES_ATTRIBUTES">var</error> v = <error descr="Since Java 9, '_' is a keyword, and may not be used as an identifier">_</error>;
<error descr="Cannot resolve symbol 'var'" textAttributesKey="WRONG_REFERENCES_ATTRIBUTES">var</error> v = <error descr="Since Java 9, '_' is a keyword and may not be used as an identifier">_</error>;
System.out.println(v.<error descr="Cannot resolve method 'trim()'" textAttributesKey="WRONG_REFERENCES_ATTRIBUTES">trim</error>());
};
BiConsumer<String, String> consumer5 = (<error descr="Unnamed patterns and variables are not supported at language level '9'">_</error>,<error descr="Unnamed patterns and variables are not supported at language level '9'">_</error>) -> {};

4
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advLVTI/SimpleAvailability.java
View File

@@ -7,7 +7,7 @@ class Main {
<error descr="'var' is not allowed as an element type of an array">var</error> d[] = new int[4];
var d1 = new int[] {4};
var d2 = new int[4];
<error descr="Cannot infer type: 'var' on variable without initializer">var</error> e;
<error descr="Cannot infer type: 'var' on variable without an initializer">var</error> e;
var f = <error descr="Array initializer is not allowed here">{ 6 }</error>;
var g = (<error descr="Cannot infer type for 'g', it is used in its own variable initializer">g</error> = 7);
var x = (<error descr="Cannot infer type for 'x', it is used in its own variable initializer">x</error> = 1) + 1;
@@ -41,7 +41,7 @@ class Main {
<error descr="Cannot infer type: lambda expression requires an explicit target type">var</error> fp = (() -> "hello");
<error descr="Cannot infer type: method reference requires an explicit target type">var</error> m = Main::localVariableDeclaration;
<error descr="Cannot infer type: variable initializer is 'null'">var</error> g = null;
var runnable = true ? <error descr="Lambda expression not expected here">() -> {}</error> : <error descr="Lambda expression not expected here">() -> {}</error>;
var runnable = true ? <error descr="Unexpected lambda expression">() -> {}</error> : <error descr="Unexpected lambda expression">() -> {}</error>;
Function<String, String> f1 = (<error descr="Cannot resolve symbol 'var'">var</error> var) -> var;

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/annotations/missingAttribute.java
View File

@@ -2,5 +2,5 @@
int i ();
}
@<error descr="'i' missing though required">Ann</error>() class D {
@<error descr="'i' missing but required">Ann</error>() class D {
}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/annotations/packageAnnotationNotInPackageInfo.java
View File

@@ -1 +1 @@
<error descr="Package annotations should be in file package-info.java">@Deprecated</error> package annotations.packageAnnotationNotInPackageInfo;
<error descr="Package annotations should be in the package-info.java file">@Deprecated</error> package annotations.packageAnnotationNotInPackageInfo;

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/annotations/receiverParameters.java
View File

@@ -15,7 +15,7 @@ class C {
@interface Anno { String f<error descr="@interface members may not have parameters">(Anno this)</error>; }
void m0() {
Runnable r = (C <error descr="Receivers are not allowed outside of method parameter list">C.this</error>) -> { };
Runnable r = (C <error descr="Receivers are not allowed outside of method’s parameter list">C.this</error>) -> { };
}
void m1a(<error descr="Modifier 'final' not allowed here">final</error> C this) { }

4
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/annotations/repeatable.java
View File

@@ -25,7 +25,7 @@ class C5 { }
@interface AA6 { A6[] value() default { }; }
@Repeatable(AA6.class) @interface A6 { }
@A6 @A6 <error descr="Container annotation 'AA6' must not be present at the same time as the element it contains">@AA6</error> class C6 { }
@A6 @A6 <error descr="Container annotation 'AA6' must not be present together with the element it contains">@AA6</error> class C6 { }
@A6 @A6 class C6bis1 { }
@A6 @AA6 class C6bis2 { }
@A6
@@ -48,7 +48,7 @@ class DupTypeAnno {
}
@interface AA7 { A7[] value() default { }; }
@Target({METHOD}) @Repeatable(<error descr="Target of container annotation 'AA7' is not a subset of target of this annotation">AA7.class</error>) @interface A7 { }
@Target({METHOD}) @Repeatable(<error descr="Target of container annotation 'AA7' is not a subset of this annotation’s target">AA7.class</error>) @interface A7 { }
@Target({METHOD}) @interface AA8 { A8[] value() default { }; }
@Target({METHOD, FIELD}) @Repeatable(AA8.class) @interface A8 { }

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/DeepConflictingReturnTypes.java
View File

@@ -15,7 +15,7 @@ interface IQ {
}
<error descr="'f()' in 'WW' clashes with 'f()' in 'IQ'; attempting to use incompatible return type">class WWW extends WW implements IQ</error> {
<error descr="'f()' in 'WW' clashes with 'f()' in 'IQ'; incompatible return type">class WWW extends WW implements IQ</error> {
}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/Enum.java
View File

@@ -105,7 +105,7 @@ enum TestEnum
{
A(<error descr="Cannot refer to enum constant 'B' before its definition">B</error>), B(A);
TestEnum(TestEnum other) {
<error descr="Call to super is not allowed in enum constructor">super(null, 0)</error>;
<error descr="Call to 'super' is not allowed in enum constructor">super(null, 0)</error>;
}
}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/IDEA57274.java
View File

@@ -4,5 +4,5 @@ interface I{
abstract class A {
abstract int foo();
abstract <<error descr="'foo()' in 'A' clashes with 'foo()' in 'I'; attempting to use incompatible return type"></error><error descr="'foo()' in 'A' clashes with 'foo()' in 'I'; attempting to use incompatible return type"></error>T extends A & I> void bar(T x);
abstract <<error descr="'foo()' in 'A' clashes with 'foo()' in 'I'; incompatible return type"></error><error descr="'foo()' in 'A' clashes with 'foo()' in 'I'; incompatible return type"></error>T extends A & I> void bar(T x);
}

14
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/OverridingMethods.java
View File

@@ -9,16 +9,16 @@ abstract class C<T> {
<A> A get() { return null; }
}
abstract class D<U> extends C<C<U>> {
abstract <error descr="'f(int)' in 'D' clashes with 'f(int)' in 'C'; attempting to use incompatible return type">U</error> f(int t);
abstract <error descr="'f(int)' in 'D' clashes with 'f(int)' in 'C'; incompatible return type">U</error> f(int t);
// overloaded, not overrridden
int ff(int u) { return 0; }
<error descr="'ff(C<U>)' in 'D' clashes with 'ff(T)' in 'C'; attempting to use incompatible return type">int</error> ff(C<U> u) {
<error descr="'ff(C<U>)' in 'D' clashes with 'ff(T)' in 'C'; incompatible return type">int</error> ff(C<U> u) {
return 0;
}
<error descr="'covariant1()' in 'D' clashes with 'covariant1()' in 'C'; attempting to use incompatible return type">Object</error> covariant1() { return null; }
<error descr="'covariant1()' in 'D' clashes with 'covariant1()' in 'C'; incompatible return type">Object</error> covariant1() { return null; }
D covariant2() { return null; }
<A> A get() { return null; }
@@ -43,15 +43,15 @@ class CC<T> {
int fPrimitive() { return 0; }
}
class DD<T> extends CC<T> {
<error descr="'f()' in 'DD' clashes with 'f()' in 'CC'; attempting to use incompatible return type">DD<String></error> f() { return null; }
<error descr="'f()' in 'DD' clashes with 'f()' in 'CC'; incompatible return type">DD<String></error> f() { return null; }
DD<Integer> f2() { return null; }
CC f3() { return null; }
<P,O> <error descr="'f(O)' in 'DD' clashes with 'f(V)' in 'CC'; attempting to use incompatible return type">O</error> f(O o) { return null; }
<P,O> <error descr="'f(O)' in 'DD' clashes with 'f(V)' in 'CC'; incompatible return type">O</error> f(O o) { return null; }
// incompatible although assignable
<error descr="'fPrimitive()' in 'DD' clashes with 'fPrimitive()' in 'CC'; attempting to use incompatible return type">double</error> fPrimitive() { return 0; }
<error descr="'fPrimitive()' in 'DD' clashes with 'fPrimitive()' in 'CC'; incompatible return type">double</error> fPrimitive() { return 0; }
}
interface Gen<T> {
@@ -500,7 +500,7 @@ interface C extends A,B {
}
class s implements C {
public <error descr="'f()' in 'ideadev.s' clashes with 'f()' in 'ideadev.B'; attempting to use incompatible return type">A</error> f() {
public <error descr="'f()' in 'ideadev.s' clashes with 'f()' in 'ideadev.B'; incompatible return type">A</error> f() {
return null;
}
}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/RawOverridingMethods.java
View File

@@ -94,7 +94,7 @@ interface I2 {
//IDEA-9321
abstract class MyMap<K, V> implements java.util.Map<K, V> {
public <error descr="'put(K, V)' in 'MyMap' clashes with 'put(K, V)' in 'java.util.Map'; attempting to use incompatible return type">Object</error> put(K key, V value) {
public <error descr="'put(K, V)' in 'MyMap' clashes with 'put(K, V)' in 'java.util.Map'; incompatible return type">Object</error> put(K key, V value) {
return null;
}
}

4
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/ReferenceTypeParams.java
View File

@@ -133,8 +133,8 @@ class ClassLiteral<T> {
Object c1 = <error descr="Cannot access class object of a type parameter">T</error>.class;
Object c2 = <error descr="Cannot access class object of a type parameter">T[]</error>.class;
Object c3 = <error descr="Cannot access class object of parameterized type">List<String></error>.class;
Object c4 = <error descr="Cannot access class object of parameterized type">List<String>[]</error>.class;
Object c3 = <error descr="Cannot access class object of a parameterized type">List<String></error>.class;
Object c4 = <error descr="Cannot access class object of a parameterized type">List<String>[]</error>.class;
Object c5 = List[].class;
Object c6 = List.class;
}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting/ReturnTypeSubstitutableForSameOverrideEquivalentMethods.java
View File

@@ -4,5 +4,5 @@ interface I<T, S extends Throwable> {
}
class A implements I<Throwable, Throwable>{
public <error descr="'foo(Throwable)' in 'A' clashes with 'foo(T)' in 'I'; attempting to use incompatible return type">void</error> foo(Throwable x) { }
public <error descr="'foo(Throwable)' in 'A' clashes with 'foo(T)' in 'I'; incompatible return type">void</error> foo(Throwable x) { }
}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/DeepConflictingReturnTypes.java
View File

@@ -15,7 +15,7 @@ interface IQ {
}
<error descr="'f()' in 'WW' clashes with 'f()' in 'IQ'; attempting to use incompatible return type">class WWW extends WW implements IQ</error> {
<error descr="'f()' in 'WW' clashes with 'f()' in 'IQ'; incompatible return type">class WWW extends WW implements IQ</error> {
}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/Enum.java
View File

@@ -93,7 +93,7 @@ enum TestEnum
{
A(<error descr="Cannot refer to enum constant 'B' before its definition">B</error>), B(A);
TestEnum(TestEnum other) {
<error descr="Call to super is not allowed in enum constructor">super(null, 0)</error>;
<error descr="Call to 'super' is not allowed in enum constructor">super(null, 0)</error>;
}
}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/RawOverridingMethods.java
View File

@@ -94,7 +94,7 @@ interface I2 {
//IDEA-9321
abstract class MyMap<K, V> implements java.util.Map<K, V> {
public <error descr="'put(K, V)' in 'MyMap' clashes with 'put(K, V)' in 'java.util.Map'; attempting to use incompatible return type">Object</error> put(K key, V value) {
public <error descr="'put(K, V)' in 'MyMap' clashes with 'put(K, V)' in 'java.util.Map'; incompatible return type">Object</error> put(K key, V value) {
return null;
}
}

4
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/genericsHighlighting8/ReferenceTypeParams.java
View File

@@ -133,8 +133,8 @@ class ClassLiteral<T> {
Object c1 = <error descr="Cannot access class object of a type parameter">T</error>.class;
Object c2 = <error descr="Cannot access class object of a type parameter">T[]</error>.class;
Object c3 = <error descr="Cannot access class object of parameterized type">List<String></error>.class;
Object c4 = <error descr="Cannot access class object of parameterized type">List<String>[]</error>.class;
Object c3 = <error descr="Cannot access class object of a parameterized type">List<String></error>.class;
Object c4 = <error descr="Cannot access class object of a parameterized type">List<String>[]</error>.class;
Object c5 = List[].class;
Object c6 = List.class;
}

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/graphInference/NotInferredVarShouldNotBeUsedForInferenceJava10.java
View File

@@ -7,7 +7,7 @@ import java.util.stream.Collectors;
class MyTest {
public List<Integer> someMethod() {
<error descr="Cannot infer type: 'var' on variable without initializer">var</error> listOfInteger;
<error descr="Cannot infer type: 'var' on variable without an initializer">var</error> listOfInteger;
Integer[] arrayOfInteger = {2, 4, 8};
listOfInteger = Arrays.stream(arrayOfInteger)
.filter(number -> number >= 4)

8
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/LambdaContext.java
View File

@@ -6,8 +6,8 @@ class Test {
void foo(Object x) {}
void bar() {
foo(!<error descr="Lambda expression not expected here">(int x)-> {}</error>);
foo(<error descr="Lambda expression not expected here">(int x)-> { }</error> instanceof Object );
foo(!<error descr="Unexpected lambda expression">(int x)-> {}</error>);
foo(<error descr="Unexpected lambda expression">(int x)-> { }</error> instanceof Object );
}
I bazz() {
@@ -23,9 +23,9 @@ interface II {
class Test1 {
void bar(boolean b){
II ik = b ? (s)-> true : (s)->false;
II ik1 = (II)((b ? <error descr="Lambda expression not expected here">(s)-> true</error> : <error descr="Lambda expression not expected here">(s)->false</error>));
II ik1 = (II)((b ? <error descr="Unexpected lambda expression">(s)-> true</error> : <error descr="Unexpected lambda expression">(s)->false</error>));
II ik2 = (II)(ik1 = (b ? (s)-> true : (s)->false));
(b ? <error descr="Lambda expression not expected here">(s) -> true</error> : ik).m("");
(b ? <error descr="Unexpected lambda expression">(s) -> true</error> : ik).m("");
}
}

20
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/switchExpressions/SwitchExpressionHasResult.java
View File

@@ -19,19 +19,19 @@ class C {
}
void defaultBranchHasNoResult(int n) {
String s = <error descr="Switch expression should produce result in all execution paths">switch</error> (n) {
String s = <error descr="Switch expression should produce a result in all execution paths">switch</error> (n) {
default:
};
}
void defaultRuleHasNoResult(int n) {
String s = switch (n) {
<error descr="Switch expression rule should produce result in all execution paths">default</error> -> {}
<error descr="Switch expression rule should produce a result in all execution paths">default</error> -> {}
};
}
void defaultBranchSometimesHasNoResult(int n, boolean b) {
String s = <error descr="Switch expression should produce result in all execution paths">switch</error> (n) {
String s = <error descr="Switch expression should produce a result in all execution paths">switch</error> (n) {
default: {
if (b) yield "";
}
@@ -40,7 +40,7 @@ class C {
void defaultRuleSometimesHasNoResult(int n, boolean b) {
String s = switch (n) {
<error descr="Switch expression rule should produce result in all execution paths">default</error> -> {
<error descr="Switch expression rule should produce a result in all execution paths">default</error> -> {
if (b) yield "";
}
};
@@ -96,7 +96,7 @@ class C {
}
void oneOfBranchesHasNoResult(int n) {
String s = <error descr="Switch expression should produce result in all execution paths">switch</error> (n) {
String s = <error descr="Switch expression should produce a result in all execution paths">switch</error> (n) {
case 0: yield "";
default:
};
@@ -105,13 +105,13 @@ class C {
void oneOfRulesHasNoResult(int n) {
String s = switch (n) {
case 0 -> "";
<error descr="Switch expression rule should produce result in all execution paths">default</error> -> {
<error descr="Switch expression rule should produce a result in all execution paths">default</error> -> {
}
};
}
void allBranchesHaveNoResult(int n) {
String s = <error descr="Switch expression should produce result in all execution paths">switch</error> (n) {
String s = <error descr="Switch expression should produce a result in all execution paths">switch</error> (n) {
case 0:
default:
};
@@ -119,9 +119,9 @@ class C {
void allRulesHaveNoResult(int n) {
String s = switch (n) {
<error descr="Switch expression rule should produce result in all execution paths">case</error> 0 -> {
<error descr="Switch expression rule should produce a result in all execution paths">case</error> 0 -> {
}
<error descr="Switch expression rule should produce result in all execution paths">default</error> -> {
<error descr="Switch expression rule should produce a result in all execution paths">default</error> -> {
}
};
}
@@ -168,7 +168,7 @@ class C {
void systemExit(int x) {
int result = switch(x) {
<error descr="Switch expression rule should produce result in all execution paths">case</error> 1 -> {
<error descr="Switch expression rule should produce a result in all execution paths">case</error> 1 -> {
System.exit(0);
}
default -> 0;

2
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/switchExpressions/SwitchExpressionsNoResult.java
View File

@@ -31,7 +31,7 @@ class Test {
Object invalidLambdaContext(int x) {
return (Runnable) switch (x) {
default -> x > 0 ? <error descr="Lambda expression not expected here">() -> {}</error> : <error descr="Lambda expression not expected here">() -> {}</error>;
default -> x > 0 ? <error descr="Unexpected lambda expression">() -> {}</error> : <error descr="Unexpected lambda expression">() -> {}</error>;
};
}
}

4
java/java-tests/testData/ig/com/siyeh/igtest/controlflow/condition_covered_by_further_condition/ConditionCoveredByFurtherCondition.java
View File

@@ -163,11 +163,11 @@ public class ConditionCoveredByFurtherCondition {
}
void testIncompleteLambda(Object x) {
if (x != null && <error descr="Lambda expression not expected here">() -> x</error><EOLError descr="')' expected"></EOLError>
if (x != null && <error descr="Unexpected lambda expression">() -> x</error><EOLError descr="')' expected"></EOLError>
}
void testIncompleteLambda2(Object x) {
if (x != null && <error descr="Lambda expression not expected here">() -> x instanceof</error><error descr="')' expected"><error descr="Type expected"> </error></error>
if (x != null && <error descr="Unexpected lambda expression">() -> x instanceof</error><error descr="')' expected"><error descr="Type expected"> </error></error>
}
void testBooleanChain(boolean b1, boolean b2) {

2
java/java-tests/testData/ig/com/siyeh/igtest/style/simplifiable_annotation/SimplifiableAnnotation.java
View File

@@ -18,7 +18,7 @@ public class SimplifiableAnnotation {
@ArrayAnnotation(array = <warning descr="Unnecessary braces around '{\"first\"}' in annotation">{</warning>"first"<warning descr="Unnecessary braces around '{\"first\"}' in annotation">}</warning>)
class MyClass {
@ <error descr="'value' missing though required">ValueAnnotation</error>
@ <error descr="'value' missing but required">ValueAnnotation</error>
int foo(@ArrayAnnotation(array="") String s) {
return -1;
}

2
java/java-tests/testData/inspection/dataFlow/contractCheck/CheckConstructorContracts.java
View File

@@ -1,7 +1,7 @@
import org.jetbrains.annotations.Contract;
class Zoo {
@Contract("null-><warning descr="Contract return value 'null': not applicable for constructor">null</warning>" )
@Contract("null-><warning descr="Contract return value 'null': not applicable to constructor">null</warning>" )
Zoo(Object o) {}
@Contract("_->fail" )

16
java/java-tests/testData/inspection/dataFlow/contractCheck/SignatureIssues.java
View File

@@ -11,22 +11,22 @@ class Foo {
@Contract(pure=true)
void voidPureMethod() {}
@Contract("-><warning descr="Contract return value 'null': not applicable for primitive return type 'void'">null</warning>")
@Contract("-><warning descr="Contract return value 'null': not applicable to primitive return type 'void'">null</warning>")
public native void throwMe();
@Contract("-><warning descr="Contract return value 'null': not applicable for primitive return type 'boolean'">null</warning>")
@Contract("-><warning descr="Contract return value 'null': not applicable to primitive return type 'boolean'">null</warning>")
public native boolean wrongReturnType();
@Contract("-><warning descr="Contract return value 'true': method return type must be 'boolean'">true</warning>")
public native String wrongReturnType2();
@Contract("-><warning descr="Contract return value 'param1': not applicable for method that has no parameters">param1</warning>")
@Contract("-><warning descr="Contract return value 'param1': not applicable to method that has no parameters">param1</warning>")
public native String absentParameter();
@Contract("_-><warning descr="Contract return value 'param2': not applicable for method that has one parameter">param2</warning>")
@Contract("_-><warning descr="Contract return value 'param2': not applicable to method that has one parameter">param2</warning>")
public native String absentParameter2(String x);
@Contract("_,_-><warning descr="Contract return value 'param3': not applicable for method that has 2 parameters">param3</warning>")
@Contract("_,_-><warning descr="Contract return value 'param3': not applicable to method that has 2 parameters">param3</warning>")
public native String absentParameter3(String x, int y);
@Contract("_-><warning descr="Contract return value 'param1': return type 'String' must be convertible from parameter type 'Integer'">param1</warning>")
@@ -35,10 +35,10 @@ class Foo {
@Contract("_->param1")
public native Object okParameterType(Integer x);
@Contract("-><warning descr="Contract return value 'new': not applicable for primitive return type 'boolean'">new</warning>")
@Contract("-><warning descr="Contract return value 'new': not applicable to primitive return type 'boolean'">new</warning>")
public native boolean wrongReturnTypeNew();
@Contract("-><warning descr="Contract return value 'this': not applicable for primitive return type 'boolean'">this</warning>")
@Contract("-><warning descr="Contract return value 'this': not applicable to primitive return type 'boolean'">this</warning>")
public native boolean wrongReturnTypeThis();
@Contract("-><warning descr="Contract return value 'this': method return type should be compatible with method containing class">this</warning>")
@@ -46,7 +46,7 @@ class Foo {
public native Foo okReturnTypeThis();
@Contract("-><warning descr="Contract return value 'this': not applicable for static method">this</warning>")
@Contract("-><warning descr="Contract return value 'this': not applicable to static method">this</warning>")
public native static Foo staticThis();
@Contract("-><warning descr="Return value should be one of: null, !null, true, false, this, new, paramN, fail, _. Found: foo">foo</warning>")

6
java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/ModuleHighlightingTest.kt
View File

@@ -118,7 +118,7 @@ class ModuleHighlightingTest : LightJava9ModulesCodeInsightFixtureTestCase() {
fun testPackageStatement() {
highlight("package pkg;")
highlight("""
<error descr="A module file should not have 'package' statement">package pkg;</error>
<error descr="A module file should not have a 'package' statement">package pkg;</error>
module M { }""".trimIndent())
fixes("<caret>package pkg;\nmodule M { }", arrayOf("DeleteElementFix", "FixAllHighlightingProblems"))
}
@@ -221,8 +221,8 @@ class ModuleHighlightingTest : LightJava9ModulesCodeInsightFixtureTestCase() {
highlight("""
module M1 {
requires <error descr="Module not found: M.missing">M.missing</error>;
requires <error descr="Cyclic dependence: M1">M1</error>;
requires <error descr="Cyclic dependence: M1, M2">M2</error>;
requires <error descr="Cyclic dependency: M1">M1</error>;
requires <error descr="Cyclic dependency: M1, M2">M2</error>;
requires <error descr="Module is not in dependencies: M3">M3</error>;
requires <warning descr="Ambiguous module reference: lib.auto">lib.auto</warning>;
requires lib.multi.release;

4
java/openapi/resources/messages/JavaBundle.properties
View File

@@ -1433,8 +1433,8 @@ inspection.slow.list.contains.all.fix.family.name=Wrap in 'HashSet' constructor
inspection.slow.list.contains.all.fix.name=Wrap ''{0}'' in ''HashSet'' constructor
inspection.static.import.can.be.used.display.name=Static import can be used
inspection.static.import.can.be.used.fix.name=Add static import
slice.filter.parse.error.null.filter.not.applicable.for.primitive.type=''null'' filter is not applicable for primitive type {0}
slice.filter.parse.error.not.null.filter.not.applicable.for.primitive.type=''!null'' filter is not applicable for primitive type {0}
slice.filter.parse.error.null.filter.not.applicable.for.primitive.type=''null'' filter is not applicable to primitive type {0}
slice.filter.parse.error.not.null.filter.not.applicable.for.primitive.type=''!null'' filter is not applicable to primitive type {0}
slice.filter.parse.error.enum.constant.not.found=Enum constant not found: {0}
slice.filter.parse.error.incorrect.expression=Incorrect expression: {0}
slice.filter.parse.error.incorrect.constant.type=Incorrect constant type (required: {0})

4
plugins/devkit/devkit-java-tests/testData/inspections/missingAccessibleContext/MissingAccessibleContext.java
View File

@@ -93,7 +93,7 @@ class X implements ListCellRenderer<String> {
void lambdaOk() {
ListCellRenderer<Integer> renderer = (list, val, index, sel, cell) -> {
JPanel panel = new JPanel() {
public <error descr="'getAccessibleContext()' in 'Anonymous class derived from javax.swing.JPanel' clashes with 'getAccessibleContext()' in 'javax.swing.JPanel'; attempting to use incompatible return type">AccessibleContext</error> getAccessibleContext() {
public <error descr="'getAccessibleContext()' in 'Anonymous class derived from javax.swing.JPanel' clashes with 'getAccessibleContext()' in 'javax.swing.JPanel'; incompatible return type">AccessibleContext</error> getAccessibleContext() {
return null;
}
};
@@ -106,7 +106,7 @@ class X implements ListCellRenderer<String> {
}
private class MyJPanel extends JPanel {
public <error descr="'getAccessibleContext()' in 'X.MyJPanel' clashes with 'getAccessibleContext()' in 'javax.swing.JPanel'; attempting to use incompatible return type">AccessibleContext</error> getAccessibleContext() {
public <error descr="'getAccessibleContext()' in 'X.MyJPanel' clashes with 'getAccessibleContext()' in 'javax.swing.JPanel'; incompatible return type">AccessibleContext</error> getAccessibleContext() {
return null;
}
}

10
plugins/kotlin/idea/tests/testData/kotlinAndJavaChecker/javaAgainstKotlin/KotlinAnnotations.java
View File

@@ -1,17 +1,17 @@
class KotlinAnnotations {
@<error descr="'d' missing though required">k.Anno1</error>()
@<error descr="'c', 'g' missing though required">k.Anno2</error>()
@<error descr="'d' missing but required">k.Anno1</error>()
@<error descr="'c', 'g' missing but required">k.Anno2</error>()
public static void m1() {
}
@<error descr="'d' missing though required">k.Anno1</error>(c = 3)
@<error descr="'g' missing though required">k.Anno2</error>(c = 3)
@<error descr="'d' missing but required">k.Anno1</error>(c = 3)
@<error descr="'g' missing but required">k.Anno2</error>(c = 3)
public static void m2() {
}
@k.Anno1(d = 5)
@<error descr="'c' missing though required">k.Anno2</error>(g = "asdas")
@<error descr="'c' missing but required">k.Anno2</error>(g = "asdas")
public static void m3() {
}