[java] correct naming in modules-related inspections (IDEA-176097)

2026-04-21 05:51:25 +07:00 · 2017-07-21 12:51:51 +02:00
parent 90a3bbab5d
commit 7d7562701b
18 changed files with 35 additions and 34 deletions
--- a/java/java-psi-api/src/com/intellij/psi/PsiPackageAccessibilityStatement.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiPackageAccessibilityStatement.java
@@ -21,7 +21,7 @@ import org.jetbrains.annotations.Nullable;
 import java.util.List;

 /**
- * Represents a package access control statement ({@code exports} or {@code opens}) of a Java module declaration.
+ * Represents a package access control directive ({@code exports} or {@code opens}) of a Java module declaration.
 *
 * @since 2017.1
 */
--- a/java/java-psi-api/src/com/intellij/psi/PsiProvidesStatement.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiProvidesStatement.java
@@ -18,7 +18,7 @@ package com.intellij.psi;
 import org.jetbrains.annotations.Nullable;

 /**
- * Represents a {@code provides} statement of a Java module declaration.
+ * Represents a {@code provides} directive of a Java module declaration.
 *
 * @since 2016.3
 */
--- a/java/java-psi-api/src/com/intellij/psi/PsiRequiresStatement.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiRequiresStatement.java
@@ -18,7 +18,7 @@ package com.intellij.psi;
 import org.jetbrains.annotations.Nullable;

 /**
- * Represents a {@code requires} statement of a Java module declaration.
+ * Represents a {@code requires} directive of a Java module declaration.
 *
 * @since 2016.3
 */
--- a/java/java-psi-api/src/com/intellij/psi/PsiUsesStatement.java
+++ b/java/java-psi-api/src/com/intellij/psi/PsiUsesStatement.java
@@ -18,7 +18,7 @@ package com.intellij.psi;
 import org.jetbrains.annotations.Nullable;

 /**
- * Represents a {@code uses} statement of a Java module declaration.
+ * Represents a {@code uses} directive of a Java module declaration.
 *
 * @since 2016.3
 */
--- a/java/java-psi-impl/src/messages/JavaErrorMessages.properties
+++ b/java/java-psi-impl/src/messages/JavaErrorMessages.properties
@@ -373,7 +373,7 @@ expected.catch.or.finally='catch' or 'finally' expected
 expected.boolean.expression=Boolean expression expected
 expected.with='with' expected
 expected.module.declaration=Module declaration expected
-expected.module.statement=Module statement expected
+expected.module.statement=Module directive expected

 error.cannot.resolve.class=Cannot resolve class ''{0}''
 error.cannot.resolve.class.or.package=Cannot resolve class or package ''{0}''
--- a/java/java-tests/testData/inspection/redundantRequiresStatement/noImportsInSources/expected.xml
+++ b/java/java-tests/testData/inspection/redundantRequiresStatement/noImportsInSources/expected.xml
@@ -4,7 +4,7 @@
    <file>module-info.java</file>
    <line>1</line>
    <entry_point TYPE="java.module" FQNAME="MAIN" />
-    <problem_class severity="WARNING">Redundant 'requires' statement in module-info</problem_class>
-    <description>Redundant statement 'requires M2'</description>
+    <problem_class severity="WARNING">Redundant 'requires' directive in module-info</problem_class>
+    <description>Redundant directive 'requires M2'</description>
  </problem>
 </problems>
--- a/java/java-tests/testData/inspection/redundantRequiresStatement/noSourcesAtAll/expected.xml
+++ b/java/java-tests/testData/inspection/redundantRequiresStatement/noSourcesAtAll/expected.xml
@@ -4,7 +4,7 @@
    <file>module-info.java</file>
    <line>1</line>
    <entry_point TYPE="java.module" FQNAME="MAIN" />
-    <problem_class severity="WARNING">Redundant 'requires' statement in module-info</problem_class>
-    <description>Redundant statement 'requires M2'</description>
+    <problem_class severity="WARNING">Redundant 'requires' directive in module-info</problem_class>
+    <description>Redundant directive 'requires M2'</description>
  </problem>
 </problems>
--- a/java/java-tests/testData/inspection/redundantRequiresStatement/nonexistentMethodImported/expected.xml
+++ b/java/java-tests/testData/inspection/redundantRequiresStatement/nonexistentMethodImported/expected.xml
@@ -4,7 +4,7 @@
    <file>module-info.java</file>
    <line>1</line>
    <entry_point TYPE="java.module" FQNAME="MAIN" />
-    <problem_class severity="WARNING">Redundant 'requires' statement in module-info</problem_class>
-    <description>Redundant statement 'requires M2'</description>
+    <problem_class severity="WARNING">Redundant 'requires' directive in module-info</problem_class>
+    <description>Redundant directive 'requires M2'</description>
  </problem>
 </problems>
--- a/java/java-tests/testData/inspection/redundantRequiresStatement/reexportedPackageImported/expected.xml
+++ b/java/java-tests/testData/inspection/redundantRequiresStatement/reexportedPackageImported/expected.xml
@@ -4,7 +4,7 @@
    <file>module-info.java</file>
    <line>1</line>
    <entry_point TYPE="java.module" FQNAME="MAIN" />
-    <problem_class severity="WARNING">Redundant 'requires' statement in module-info</problem_class>
-    <description>Redundant statement 'requires M6'</description>
+    <problem_class severity="WARNING">Redundant 'requires' directive in module-info</problem_class>
+    <description>Redundant directive 'requires M6'</description>
  </problem>
 </problems>
--- a/java/java-tests/testData/inspection/redundantRequiresStatement/requiresJavaBase/expected.xml
+++ b/java/java-tests/testData/inspection/redundantRequiresStatement/requiresJavaBase/expected.xml
@@ -4,7 +4,7 @@
    <file>module-info.java</file>
    <line>1</line>
    <entry_point TYPE="java.module" FQNAME="MAIN" />
-    <problem_class severity="WARNING">Redundant 'requires' statement in module-info</problem_class>
-    <description>Redundant statement 'requires java.base'</description>
+    <problem_class severity="WARNING">Redundant 'requires' directive in module-info</problem_class>
+    <description>Redundant directive 'requires java.base'</description>
  </problem>
 </problems>
--- a/java/java-tests/testData/inspection/redundantRequiresStatement/requiresManyModulesFewPackagesImported/expected.xml
+++ b/java/java-tests/testData/inspection/redundantRequiresStatement/requiresManyModulesFewPackagesImported/expected.xml
@@ -4,14 +4,14 @@
    <file>module-info.java</file>
    <line>1</line>
    <entry_point TYPE="java.module" FQNAME="MAIN" />
-    <problem_class severity="WARNING">Redundant 'requires' statement in module-info</problem_class>
-    <description>Redundant statement 'requires M7'</description>
+    <problem_class severity="WARNING">Redundant 'requires' directive in module-info</problem_class>
+    <description>Redundant directive 'requires M7'</description>
  </problem>
  <problem>
    <file>module-info.java</file>
    <line>1</line>
    <entry_point TYPE="java.module" FQNAME="MAIN" />
-    <problem_class severity="WARNING">Redundant 'requires' statement in module-info</problem_class>
-    <description>Redundant statement 'requires M4'</description>
+    <problem_class severity="WARNING">Redundant 'requires' directive in module-info</problem_class>
+    <description>Redundant directive 'requires M4'</description>
  </problem>
 </problems>
--- a/java/java-tests/testData/psi/parser-partial/modules/BadContent.txt
+++ b/java/java-tests/testData/psi/parser-partial/modules/BadContent.txt
@@ -11,7 +11,7 @@ PsiJavaFile:BadContent.java
    PsiWhiteSpace(' ')
    PsiJavaToken:LBRACE('{')
    PsiWhiteSpace('\n ')
-    PsiErrorElement:Module statement expected
+    PsiErrorElement:Module directive expected
      PsiIdentifier:some('some')
      PsiWhiteSpace(' ')
      PsiIdentifier:junk('junk')
--- a/java/java-tests/testData/psi/parser-partial/modules/Incomplete4.txt
+++ b/java/java-tests/testData/psi/parser-partial/modules/Incomplete4.txt
@@ -11,5 +11,5 @@ PsiJavaFile:Incomplete4.java
    PsiWhiteSpace(' ')
    PsiJavaToken:LBRACE('{')
    PsiWhiteSpace(' ')
-    PsiErrorElement:Module statement expected
+    PsiErrorElement:Module directive expected
      PsiIdentifier:junk('junk')
--- a/java/java-tests/testData/psi/parser-partial/modules/Requires4.txt
+++ b/java/java-tests/testData/psi/parser-partial/modules/Requires4.txt
@@ -20,7 +20,7 @@ PsiJavaFile:Requires4.java
        PsiIdentifier:A('A')
      PsiErrorElement:';' expected
        <empty list>
-    PsiErrorElement:Module statement expected
+    PsiErrorElement:Module directive expected
      PsiJavaToken:COMMA(',')
      PsiWhiteSpace(' ')
      PsiIdentifier:B('B')
--- a/platform/platform-resources-en/src/messages/InspectionsBundle.properties
+++ b/platform/platform-resources-en/src/messages/InspectionsBundle.properties
@@ -480,10 +480,10 @@ inspection.compiler.javac.quirks.anno.array.comma.fix=Remove trailing comma
 inspection.compiler.javac.quirks.qualifier.type.args.problem=Generics in qualifier reference may cause compilation error in some Javac versions (e.g. JDK 5 and JDK 6).
 inspection.compiler.javac.quirks.qualifier.type.args.fix=Remove generic parameter

-inspection.redundant.requires.statement.name=Redundant 'requires' statement in module-info
-inspection.redundant.requires.statement.description=Redundant statement ''requires {0}''
-inspection.redundant.requires.statement.fix.family=Delete redundant 'requires' statement
-inspection.redundant.requires.statement.fix.name=Delete statement ''requires {0}''
+inspection.redundant.requires.statement.name=Redundant 'requires' directive in module-info
+inspection.redundant.requires.statement.description=Redundant directive ''requires {0}''
+inspection.redundant.requires.statement.fix.family=Delete redundant 'requires' directive
+inspection.redundant.requires.statement.fix.name=Delete directive ''requires {0}''

 inspection.root.node.title=Inspections

@@ -767,7 +767,7 @@ inspection.lambda.to.method.call.fix.family.name=Replace lambda expression with
 inspection.lambda.to.method.call.fix.name=Replace lambda expression with ''{0}''

 inspection.module.exports.package.to.itself=Module exports/opens package to itself
-exports.to.itself.delete.statement.fix=Delete statement
+exports.to.itself.delete.statement.fix=Delete directive
 exports.to.itself.delete.module.ref.fix=Delete reference to module ''{0}''

 inspection.requires.auto.module=Dependencies on automatic modules
--- a/resources-en/src/inspectionDescriptions/Java9RedundantRequiresStatement.html
+++ b/resources-en/src/inspectionDescriptions/Java9RedundantRequiresStatement.html
@@ -3,8 +3,8 @@
 The inspection detects a situation where Java 9 module A requires Java 9 module B, but A doesn't use any package from B.
 Also, requiring the module 'java.base' is redundant.
 <p>
-  The fix deletes the 'requires' statement for such redundant dependencies.
-  If the deleted dependency re-exported modules that are actually used, the fix adds 'requires' statements for these modules.
+  The fix deletes the 'requires' directive for such redundant dependencies.
+  If the deleted dependency re-exported modules that are actually used, the fix adds 'requires' directive for these modules.
 <p>
 <small>New in 2017.1</small>
 </body>
--- a/resources-en/src/inspectionDescriptions/JavaRequiresAutoModule.html
+++ b/resources-en/src/inspectionDescriptions/JavaRequiresAutoModule.html
@@ -1,6 +1,6 @@
 <html>
 <body>
-The inspection warns about use of automatic modules in the "requires" clauses.
+The inspection warns about use of automatic modules in the "requires" directive.
 Corresponds to <code>-Xlint:requires-automatic</code> and <code>-Xlint:requires-transitive-automatic</code> Javac options.
 </body>
 </html>
--- a/resources-en/src/messages/QuickFixBundle.properties
+++ b/resources-en/src/messages/QuickFixBundle.properties
@@ -306,8 +306,8 @@ extract.side.effects.convert.to.if=Convert to 'if' statement
 extract.side.effects=Extract side {0, choice, 1#effect|2#effects}
 extract.side.effects.family.name=Delete statement extracting side effects

-module.info.add.requires.family.name=Add 'requires' statement to module-info.java
-module.info.add.requires.name=Add ''requires {0}'' statement to module-info.java
+module.info.add.requires.family.name=Add 'requires' directive to module-info.java
+module.info.add.requires.name=Add ''requires {0}'' directive to module-info.java

 collection.to.array.text=Apply conversion ''.toArray({0})''
 collection.to.array.family.name=Apply conversion '.toArray()'
@@ -319,7 +319,8 @@ wrap.with.java.io.file.text=Wrap using 'new File()'
 wrap.with.java.io.file.parameter.single.text=Wrap parameter using 'new File()'
 wrap.with.java.io.file.parameter.multiple.text=Wrap {0, choice, 1#1st|2#2nd|3#3rd|4#{0,number}th} parameter using ''new File()''

-java.9.merge.module.statements.fix.family.name=Merge with other ''{0}'' statement
-java.9.merge.module.statements.fix.name=Merge with other ''{0} {1}'' statement
+java.9.merge.module.statements.fix.family.name=Merge with other ''{0}'' directive
+java.9.merge.module.statements.fix.name=Merge with other ''{0} {1}'' directive
+
 model.create.constructor.quickfix.message=Create constructor ''{0}''
 model.create.constructor.quickfix.message.family.name=Create constructor