[platform] move properties used in java.psi* modules to JavaPsiBundle (IDEA-209382)

GitOrigin-RevId: bb845bfcca5563227b02947d28913b5070ed03f5

java/java-psi-api/resources/messages/JavaPsiBundle.properties

@@ -1,3 +1,12 @@
+0.is.not.an.identifier=''{0}'' is not an identifier.
+annotation.name.is.missing=Annotation attribute must be of the form 'name=value'
+anonymous.class.context.display=Anonymous in {0}
+anonymous.class.derived.display=Anonymous class derived from {0}
+aux.context.display=(in {0})
+bound.not.expected=Unexpected bound
+catch.without.try='catch' without 'try'
+class.context.display={0} in {1}
+class.literal.expected=.class expected
 context.type.java.comment=Comment
 context.type.string=string
 
@@ -30,9 +39,75 @@ element.statement=statement
 element.unknown=element
 element.variable=variable
 
+else.without.if='else' without 'if'
+enum.constant.context=Enum constant ''{0}'' in ''{1}''
+expected.array.initializer=Array initializer expected
+expected.boolean.expression=Boolean expression expected
+expected.catch.or.finally='catch' or 'finally' expected
+expected.class.or.interface='class' or 'interface' expected
+expected.class.reference=Class reference expected
+expected.colon=':' expected
+expected.comma=',' expected
+expected.comma.or.rparen=',' or ')' expected
+expected.comma.or.semicolon=',' or ';' expected
+expected.dot='.' expected
+expected.eq='=' expected
+expected.expression=Expression expected
+expected.gt='>' expected.
+expected.gt.or.comma='>' or ',' expected
+expected.identifier=Identifier expected
+expected.identifier.or.type=Identifier or type expected
+expected.lbrace='{' expected
+expected.lbrace.or.semicolon='{' or ';' expected
+expected.lbracket='[' expected
+expected.lparen='(' expected
+expected.lparen.or.lbracket='(' or '[' expected
+expected.lt.or.lparen='<' or '(' expected
+expected.module.declaration=Module declaration expected
+expected.module.statement=Module directive expected
+expected.package.reference=Package reference expected
+expected.parameter=Parameter expected
+expected.rbrace='}' expected
+expected.rbracket=']' expected
+expected.resource=Resource definition expected
+expected.rparen=')' expected
+expected.semicolon=';' expected
+expected.statement=Statement expected
+expected.string=String literal expected
+expected.switch.label='case', 'default' or '}' expected
+expected.switch.rule=Expression, block or throw statement expected
+expected.type=Type expected
+expected.type.parameter=Type parameter expected
+expected.value=Value expected
+expected.while='while' expected
+expected.with='with' expected
+filetype.description.class=Java class
+filetype.description.java=Java
+filetype.description.jshell=JShell snippet
+finally.without.try='finally' without 'try'
+import.statement.identifier.or.asterisk.expected.=Identifier or '*' expected
 infer.nullity.annotations=Infer Nullity Annotations
 java.language.name=Java
 
+java.terms.anonymous.class=anonymous class
+java.terms.class=class
+java.terms.field=field
+java.terms.interface=interface
+java.terms.method=method
+java.terms.package=package
+java.terms.parameter=parameter
+java.terms.variable=variable
+javadoc.exception.tag.class.is.not.throwable=Class {0} is not a descendant of Throwable
+javadoc.exception.tag.exception.is.not.thrown={0} is not declared to be thrown by method {1}
+javadoc.exception.tag.wrong.tag.value=Wrong tag value
+javadoc.param.tag.parameter.name.expected=Parameter name expected
+javadoc.param.tag.type.parameter.gt.expected='>' expected
+javadoc.param.tag.type.parameter.name.expected=Type parameter name expected
+javadoc.ref.tag.class.ref.expected=Class reference expected
+javadoc.value.field.required=@value tag must reference a field
+javadoc.value.field.with.initializer.required=@value tag must reference a field with a constant initializer
+javadoc.value.static.field.required=@value tag must reference a static field
+javadoc.value.tag.jdk15.required=@value tag may not have any arguments when JDK 1.4 or earlier is used
 jdk.1.3.language.level.description=1.3 - Plain old Java
 jdk.1.4.language.level.description=1.4 - 'assert' keyword
 jdk.1.5.language.level.description=5 - 'enum' keyword, generics, autoboxing etc.
@@ -51,10 +126,29 @@ jdk.X.language.level.description=X - Experimental features
 
 jshell.language.snippet=JShell Snippet
 
+local.class.preposition=local
+method.context.display={0}() in {1}
+node.abstract.flag.tooltip=Abstract
+node.annotation.tooltip=Annotation
+node.anonymous.class.tooltip=Anonymous Class
+node.class.tooltip=Class
+node.enum.tooltip=Enum
+node.exception.tooltip=Exception
+node.field.tooltip=Field
+node.final.flag.tooltip=Final
+node.interface.tooltip=Interface
+node.junit.test.tooltip=JUnit Test
+node.method.tooltip=Method
+node.record.tooltip=Record (Preview Feature)
+node.runnable.class.tooltip=Runnable Class
+node.static.flag.tooltip=Static
 psi.error.attempt.to.edit.class.file=Cannot modify compiled element in file ''{0}''
 
 task.background.title.maven=Maven
 
+unexpected.identifier=Unexpected identifier
+unexpected.token=Unexpected token
+unexpected.tokens=Unexpected tokens
 # suppress inspection "UnusedProperty"
 visibility.presentation.abstract=abstract
 # suppress inspection "UnusedProperty"
@@ -85,3 +179,4 @@ visibility.presentation.transient=transient
 visibility.presentation.transitive=transitive
 # suppress inspection "UnusedProperty"
 visibility.presentation.volatile=volatile
+wildcard.not.expected=Unexpected wildcard

java/java-psi-api/src/com/intellij/core/JavaPsiBundle.java

@@ -23,8 +23,8 @@ import org.jetbrains.annotations.PropertyKey;
 import java.util.function.Supplier;
 
 public class JavaPsiBundle extends DynamicBundle {
-  @NonNls private static final String BUNDLE = "messages.JavaPsiBundle";
-  private static final JavaPsiBundle INSTANCE = new JavaPsiBundle();
+  @NonNls public static final String BUNDLE = "messages.JavaPsiBundle";
+  public static final JavaPsiBundle INSTANCE = new JavaPsiBundle();
 
   private JavaPsiBundle() { super(BUNDLE); }
 

java/java-psi-api/src/com/intellij/psi/util/PsiFormatUtil.java

@@ -1,6 +1,7 @@
 // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.psi.util;
 
+import com.intellij.core.JavaPsiBundle;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.*;
 import com.intellij.util.BitUtil;
@@ -202,7 +203,7 @@ public class PsiFormatUtil extends PsiFormatUtilBase {
         PsiClassType baseClassReference = ((PsiAnonymousClass)aClass).getBaseClassType();
         PsiClass baseClass = baseClassReference.resolve();
         String name = baseClass == null ? baseClassReference.getPresentableText() : formatClass(baseClass, options);
-        buffer.append(PsiBundle.message("anonymous.class.derived.display", name));
+        buffer.append(JavaPsiBundle.message("anonymous.class.derived.display", name));
       }
       else {
         String name = aClass.getName();
@@ -279,7 +280,7 @@ public class PsiFormatUtil extends PsiFormatUtilBase {
         ? list.hasExplicitModifier(PsiModifier.PACKAGE_LOCAL)
         : list.hasModifierProperty(PsiModifier.PACKAGE_LOCAL)) {
       if (element instanceof PsiClass && element.getParent() instanceof PsiDeclarationStatement) { // local class
-        append(buffer, PsiBundle.message("local.class.preposition"));
+        append(buffer, JavaPsiBundle.message("local.class.preposition"));
       }
       else {
         appendModifier(buffer, PsiModifier.PACKAGE_LOCAL);

java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java

@@ -1,6 +1,7 @@
 // Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package com.intellij.psi.util;
 
+import com.intellij.core.JavaPsiBundle;
 import com.intellij.lang.java.JavaLanguage;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.diagnostic.Logger;
@@ -909,7 +910,7 @@ public final class PsiUtil extends PsiUtilCore {
 
   public static void checkIsIdentifier(@NotNull PsiManager manager, String text) throws IncorrectOperationException{
     if (!PsiNameHelper.getInstance(manager.getProject()).isIdentifier(text)){
-      throw new IncorrectOperationException(PsiBundle.message("0.is.not.an.identifier", text) );
+      throw new IncorrectOperationException(JavaPsiBundle.message("0.is.not.an.identifier", text) );
     }
   }