[java] IDEA-374204 JEP 512: use 'Compact Source Files' for implicitly declared classes

GitOrigin-RevId: e77a013fa84cbafbfec866f6489147115532f656

java/codeserver/highlighting/resources/messages/JavaCompilationErrorBundle.properties

@@ -136,10 +136,10 @@ class.or.package.expected=Expected class or package
 class.inherits.abstract.and.default={0} inherits abstract and default for {1} from types {2} and {3}
 class.inherits.unrelated.defaults={0} inherits unrelated defaults for {1} from types {2} and {3}
 
-class.implicit.no.main.method=Implicitly declared class contains no 'main' method
-class.implicit.invalid.file.name=The file name of an implicitly declared class is not a valid identifier
-class.implicit.initializer=Initializers are not allowed in implicitly declared classes
-class.implicit.package.statement=Package statement is not allowed for implicitly declared class
+class.implicit.no.main.method=Compact source files contains no 'main' method
+class.implicit.invalid.file.name=The file name of a compact source file is not a valid identifier
+class.implicit.initializer=Initializers are not allowed in compact source files
+class.implicit.package.statement=Package statement is not allowed in compact source files
 
 package.clashes.with.class=Package ''{0}'' clashes with class of same name
 
@@ -232,7 +232,7 @@ clash.methods.message.show.classes=''{0}'' in ''{2}'' clashes with ''{1}'' in ''
 
 constructor.ambiguous.implicit.call=Ambiguous implicit constructor call: both ''{0}'' and ''{1}'' match
 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
+constructor.in.implicit.class=Explicit constructor in implicitly declared class of a compact source file is not allowed
 
 type.incompatible=Incompatible types. Found: ''{1}'', required: ''{0}''
 type.incompatible.tooltip.required.type=Required type:
@@ -302,7 +302,7 @@ reference.qualifier.not.expression=Qualifier must be an expression
 reference.qualifier.primitive=Cannot access fields on ''{0}'' type
 reference.unresolved=Cannot resolve symbol ''{0}''
 reference.ambiguous=Reference to ''{0}'' is ambiguous, both ''{1}'' and ''{2}'' match
-reference.implicit.class=Implicitly declared class ''{0}'' cannot be referenced
+reference.implicit.class=Implicitly declared class of a compact source file ''{0}'' cannot be referenced
 reference.class.in.default.package=Class ''{0}'' is in the default package
 reference.non.static.from.static.context=Non-static {0} ''{1}'' cannot be referenced from a static context
 reference.outer.type.parameter.from.static.context=''{0}'' cannot be referenced from a static context

java/java-impl/resources/messages/RefactorJBundle.properties

@@ -18,7 +18,7 @@ the.selected.class.is.an.annotation.type=The selected class is an annotation int
 the.refactoring.is.not.supported.on.non.static.inner.classes=The refactoring is not supported on non-static inner classes.
 the.selected.class.has.no.members.to.extract=The selected class has no members to extract.
 the.selected.class.should.belong.to.project.sources=The selected class should belong to project sources
-refactoring.cannot.be.done.in.implicit.class=Refactoring cannot be done in implicitly declared class
+refactoring.cannot.be.done.in.implicit.class=Refactoring cannot be done in compact source files
 references.to.extract=References to extract ( {0, choice, 0#(Not found)|1#{0} reference|2#{0} references}{1, choice, 0#|1# in {1} file|2# in {1} files})
 extract.class.as.enum.column.title=As Enum
 extract.class.depends.on.0.from.1.tooltip=Depends on {0} from {1}

java/java-syntax/resources/messages/JavaSyntaxBundle.properties

@@ -58,12 +58,12 @@ feature.javadoc.snippets=@snippet in Javadoc
 feature.pattern.guard.and.record.patterns=Pattern guards and record patterns
 feature.record.patterns.in.for.each=Record patterns in for-each loops
 feature.primitive.types.in.patterns=Primitive types in patterns, instanceof and switch
-feature.implicit.import.in.implicit.classes=Implicit import in implicitly declared classes
+feature.implicit.import.in.implicit.classes=Implicit import in compact source files
 feature.enum.qualified.name.in.switch=Qualified enum as a constant in switch
 feature.string.templates=String templates
 feature.unnamed.vars=Unnamed patterns and variables
-feature.implicit.classes=Implicitly declared classes
-feature.implicit.class.name.out.of.scope=Names of implicitly declared classes are out of scopes
+feature.implicit.classes=Compact source files
+feature.implicit.class.name.out.of.scope=Names of implicitly declared class of a compact source file are out of scopes
 feature.instance.main.method=Instance main method
 feature.inherited.static.main.method=Inherited static main method
 feature.scoped.values=Scoped Values

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/ReferenceToImplicitClass.java

@@ -1,5 +1,5 @@
-<error descr="Implicitly declared class 'ReferenceToImplicitClass' cannot be referenced">ReferenceToImplicitClass</error> a;
+<error descr="Implicitly declared class of a compact source file 'ReferenceToImplicitClass' cannot be referenced">ReferenceToImplicitClass</error> a;
 
 public static void main(String[] args) {
-  Class<<error descr="Implicitly declared class 'ReferenceToImplicitClass' cannot be referenced">ReferenceToImplicitClass</error>> stringClass = <error descr="Implicitly declared class 'ReferenceToImplicitClass' cannot be referenced">ReferenceToImplicitClass</error>.class;
+  Class<<error descr="Implicitly declared class of a compact source file 'ReferenceToImplicitClass' cannot be referenced">ReferenceToImplicitClass</error>> stringClass = <error descr="Implicitly declared class of a compact source file 'ReferenceToImplicitClass' cannot be referenced">ReferenceToImplicitClass</error>.class;
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/implicitClass/BrokenFileNoHighlightingWithPackage.java

@@ -1,4 +1,4 @@
-<error descr="Package statement is not allowed for implicitly declared class">package a;</error>
+<error descr="Package statement is not allowed in compact source files">package a;</error>
 
 int ab;
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/implicitClass/HighlightInsufficientLevel.java

@@ -1,10 +1,10 @@
-void <error descr="Implicitly declared classes are not supported at language level '20'">foo</error>() {
+void <error descr="Compact source files are not supported at language level '20'">foo</error>() {
 
 }
 
-String <error descr="Implicitly declared classes are not supported at language level '20'">s</error> = "asd";
+String <error descr="Compact source files are not supported at language level '20'">s</error> = "asd";
 
-<error descr="Implicitly declared classes are not supported at language level '20'">static {
+<error descr="Compact source files are not supported at language level '20'">static {
 
 }</error>
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/implicitClass/ImplicitClassConstructorNoParam.java

@@ -2,6 +2,6 @@ void main(String[] args) {
   System.out.println("AAAAA");
 }
 
-<error descr="Explicit constructor in implicitly declared class is not allowed">public ImplicitClassConstructorNoParam()</error> {
+<error descr="Explicit constructor in implicitly declared class of a compact source file is not allowed">public ImplicitClassConstructorNoParam()</error> {
   System.out.println("BBBBB");
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/implicitClass/ImplicitClassConstructorParam.java

@@ -2,6 +2,6 @@ void main(String[] args) {
   System.out.println("AAAAA");
 }
 
-<error descr="Explicit constructor in implicitly declared class is not allowed">public ImplicitClassConstructorParam(String a)</error> {
+<error descr="Explicit constructor in implicitly declared class of a compact source file is not allowed">public ImplicitClassConstructorParam(String a)</error> {
   System.out.println("BBBBB");
 }

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/implicitClass/Incorrect implicit class name with spaces.java

@@ -1 +1 @@
-<error descr="The file name of an implicitly declared class is not a valid identifier">void main() {}</error>
+<error descr="The file name of a compact source file is not a valid identifier">void main() {}</error>

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/implicitClass/Incorrect.implicit.class.name.java

@@ -1 +1 @@
-<error descr="The file name of an implicitly declared class is not a valid identifier">void main() {}</error>
+<error descr="The file name of a compact source file is not a valid identifier">void main() {}</error>

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/implicitClass/SameNameInnerClass.java

@@ -1,4 +1,4 @@
-<error descr="Implicitly declared class contains no 'main' method">public class SameNameInnerClass {
+<error descr="Compact source files contains no 'main' method">public class SameNameInnerClass {
 
 }
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/implicitClass/SameNameInnerClass21.java

@@ -1,4 +1,4 @@
-<error descr="Implicitly declared class contains no 'main' method">public class <error descr="Duplicate class: 'SameNameInnerClass21'">SameNameInnerClass21</error> {
+<error descr="Compact source files contains no 'main' method">public class <error descr="Duplicate class: 'SameNameInnerClass21'">SameNameInnerClass21</error> {
 
 }
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/implicitClass/StaticInitializer.java

@@ -1,4 +1,4 @@
-<error descr="Initializers are not allowed in implicitly declared classes" textAttributesKey="ERRORS_ATTRIBUTES">static {
+<error descr="Initializers are not allowed in compact source files" textAttributesKey="ERRORS_ATTRIBUTES">static {
 
 }</error>
 

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/implicitClass/WithPackageStatement.java

@@ -1,4 +1,4 @@
-<error descr="Package statement is not allowed for implicitly declared class">package pack.bar;</error>
+<error descr="Package statement is not allowed in compact source files">package pack.bar;</error>
 
 void foo() {
 

java/java-tests/testData/inspection/explicitToImplicitClassMigration/afterWithImportConflict.java

@@ -1,6 +1,6 @@
 import p.List;
 
 void main(String[] args) {
-  <caret>  List a = null;
+    List <caret>a = null;
     System.out.println("Hello, world!" + args);
 }

java/java-tests/testData/inspection/explicitToImplicitClassMigration/afterWithImportConflictDemandsOverModule.java

@@ -1,6 +1,6 @@
 import p.List;
 
-void main() {
-    List a = nu<caret>ll;
+void ma<caret>in() {
+    List a = null;
     System.out.println("Hello, world!");
 }

java/java-tests/testData/inspection/explicitToImplicitClassMigration/beforeCaretAtClass.java

@@ -1,4 +1,4 @@
-<warning descr="Explicit class declaration can be converted into implicitly declared class">public class beforeCaretAtClass</warning> {
+<warning descr="Explicit class declaration can be converted into a compact source file">public class beforeCaretAtClass</warning> {
   public static void main(String[] args) {
     System.out.println("Hello, world!");
   }

java/java-tests/testData/inspection/explicitToImplicitClassMigration/beforeExtendsObject.java

@@ -1,4 +1,4 @@
-<warning descr="Explicit class declaration can be converted into implicitly declared class">public class beforeExtendsObject</warning> extends Object {
+<warning descr="Explicit class declaration can be converted into a compact source file">public class beforeExtendsObject</warning> extends Object {
   public static void main(String[] args) {
     System.out.println("Hello, world!");
   }

java/java-tests/testData/inspection/explicitToImplicitClassMigration/beforeSimple.java

@@ -1,5 +1,5 @@
 
-<warning descr="Explicit class declaration can be converted into implicitly declared class">public class before<caret>Simple</warning> {
+<warning descr="Explicit class declaration can be converted into a compact source file">public class before<caret>Simple</warning> {
   public static void main(String[] args) {
     System.out.println("Hello, world!");
   }

java/java-tests/testData/inspection/explicitToImplicitClassMigration/beforeSimpleWithComments.java

@@ -1,5 +1,5 @@
 
-<warning descr="Explicit class declaration can be converted into implicitly declared class">/**
+<warning descr="Explicit class declaration can be converted into a compact source file">/**
  * comments
  */
 

java/java-tests/testData/inspection/explicitToImplicitClassMigration/beforeWithEnhancedMain.java

@@ -1,4 +1,4 @@
-<warning descr="Explicit class declaration can be converted into implicitly declared class">public class beforeWithEnhancedMain</warning> {
+<warning descr="Explicit class declaration can be converted into a compact source file">public class beforeWithEnhancedMain</warning> {
   public static void main() {
     System.out.println("Hello, world!");
   }

java/java-tests/testData/inspection/explicitToImplicitClassMigration/beforeWithEnhancedMain2.java

@@ -1,4 +1,4 @@
-<warning descr="Explicit class declaration can be converted into implicitly declared class">public class beforeWith<caret>EnhancedMain2</warning> {
+<warning descr="Explicit class declaration can be converted into a compact source file">public class beforeWithEnhancedMain2</warning> {
   public void main() {
     System.out.println("Hello, world!");
   }

java/java-tests/testData/inspection/explicitToImplicitClassMigration/beforeWithImportConflict.java

@@ -1,6 +1,6 @@
 import p.*;
 
-<warning descr="Explicit class declaration can be converted into implicitly declared class">public class beforeWithImport<caret>Conflict</warning>  {
+<warning descr="Explicit class declaration can be converted into a compact source file">public class beforeWithImportConflic<caret>t</warning>  {
 
   public static void main(String[] args) {
     List a = null;

java/java-tests/testData/inspection/explicitToImplicitClassMigration/beforeWithImportConflictDemandsOverModule.java

@@ -1,6 +1,6 @@
 import p.*;
 
-<warning descr="Explicit class declaration can be converted into implicitly declared class">public class beforeWithImport<caret>ConflictDemandsOverModule</warning>  {
+<warning descr="Explicit class declaration can be converted into a compact source file">public <caret>class beforeWithImportConflictDemandsOverModule</warning>  {
 
   public static void main(String[] args) {
     List a = null;

java/openapi/resources/messages/JavaBundle.properties

@@ -182,7 +182,7 @@ dialog.title.testdatapath.method.generate=Generate methods from @TestDataPath
 dialog.title.testdatapath.file.generate=Generate files from class to @TestDataPath
 enum.not.allowed=Enum is not allowed
 error.attempt.to.generate.constructor.for.anonymous.class=Cannot add constructor to an anonymous class
-error.attempt.to.generate.constructor.for.implicit.class=Cannot add constructor to an implicitly declared class
+error.attempt.to.generate.constructor.for.implicit.class=Cannot add constructor to an implicitly declared class of a compact source file
 error.hint.no.expression.found=No expression found
 error.package.already.contains.package-info=''package-info.java'' already exists for package ''{0}''
 error.package.already.contains.package.html=Package ''{0}'' already has a ''package.html'' file. Create ''package-info.java'' anyway?
@@ -725,10 +725,10 @@ inspection.string.template.reverse.migration.string.message=String template can
 inspection.string.template.migration.concatenation.message=Concatenation can be replaced with string template
 inspection.string.template.migration.name=String template can be used
 inspection.string.template.reverse.migration.name=String template can be concatenated string
-inspection.implicit.to.explicit.class.backward.migration.name=Implicitly declared class can be replaced with ordinary class
-inspection.implicit.to.explicit.class.backward.migration.fix.name=Convert implicitly declared class into regular class
-inspection.explicit.to.implicit.class.migration.name=Explicit class declaration can be converted into implicitly declared class
-inspection.explicit.to.implicit.class.migration.fix.name=Convert into implicitly declared class
+inspection.implicit.to.explicit.class.backward.migration.name=Compact source file can be replaced with an ordinary class
+inspection.implicit.to.explicit.class.backward.migration.fix.name=Convert an implicitly declared class of a compact source file into a regular class
+inspection.explicit.to.implicit.class.migration.name=Explicit class declaration can be converted into a compact source file
+inspection.explicit.to.implicit.class.migration.fix.name=Convert into compact source file
 inspection.explicit.to.implicit.move.to.root.title=Move Simple Source File
 inspection.explicit.to.implicit.move.to.root.move=Move under the project root
 inspection.explicit.to.implicit.move.to.root.delete.package=Don't move, only delete package statement
@@ -1323,7 +1323,7 @@ live.template.context.declaration=Declaration
 live.template.context.statement.java.lang.io=Statement with available java.lang.IO
 live.template.context.normal.class.before.instance.main.declaration=Declaration inside a normal class without instance 'main' method
 live.template.context.normal.class.after.instance.main.declaration=Declaration inside a normal class with instance 'main' method
-live.template.context.implicit.class.declaration=Declaration inside an implicitly declared class
+live.template.context.implicit.class.declaration=Declaration inside a compact source file
 inspection.unused.display.name=Unused declaration
 inspection.unused.assignment.display.name=Unused assignment
 inspection.unchecked.warning.display.name=Unchecked warning

java/openapi/resources/messages/JavaRefactoringBundle.properties

@@ -822,7 +822,7 @@ dialog.message.moving.directories.to=Moving directories to ''{0}''
 progress.title.collect.hierarchy=Collect ''{0}'' hierarchy
 introduce.variable.message.change.semantics.warning=Extracting the selected expression changes the semantics of the surrounding expression.
 introduce.variable.message.expression.refers.to.pattern.variable.declared.outside=The selected expression refers to pattern variable ''{0}'', which will be out of scope.
-introduce.variable.message.cannot.extract.in.implicit.class=Cannot extract in implicitly declared class.
+introduce.variable.message.cannot.extract.in.implicit.class=Cannot extract in compact source file.
 introduce.variable.message.cannot.extract.variable.in.interface=Cannot extract variable in an interface.
 tooltip.cannot.inline.pattern.variable=Cannot inline pattern variable
 inline.popup.highlight=Highlight {0} conflicting {0, choice, 1#write|2#writes}