From b054a001ecc6d7ded2a3d33edf203d8c3afd1cf6 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Mon, 31 May 2021 15:15:41 +0200 Subject: [PATCH] move "Convert to Basic Latin" inspection to java-i18n module for consistency and to avoid weird inspection group "i18n" with one element GitOrigin-RevId: 05889f1728fbe5d7001ee28e305883adb2fe91d4 --- java/java-impl/src/META-INF/JavaPlugin.xml | 4 ---- .../resources/messages/JavaBundle.properties | 1 - .../messages/InspectionsBundle.properties | 1 - .../file/exclude/OverrideFileTypeAction.java | 11 ++++++++--- .../impl/CodeInsightTestFixtureImpl.java | 2 +- plugins/java-i18n/intellij.java.i18n.iml | 1 + .../resources/messages/JavaI18nBundle.properties | 1 + plugins/java-i18n/src/META-INF/plugin.xml | 5 ++++- .../i18n}/ConvertToBasicLatinInspection.java | 14 ++++++++------ .../convertToBasicLatin/CharLiteral.java | 0 .../convertToBasicLatin/CharLiteral_after.java | 0 .../convertToBasicLatin/DocComment.java | 0 .../convertToBasicLatin/DocComment_after.java | 0 .../quickFix}/convertToBasicLatin/DocTag.java | 0 .../convertToBasicLatin/DocTag_after.java | 0 .../convertToBasicLatin/PlainComment.java | 0 .../convertToBasicLatin/PlainComment_after.java | 0 .../convertToBasicLatin/StringLiteral.java | 0 .../convertToBasicLatin/StringLiteral_after.java | 0 .../convertToBasicLatin/UnclosedDocComment.java | 0 .../UnclosedDocComment_after.java | 0 .../UnclosedPlainComment.java | 0 .../UnclosedPlainComment_after.java | 0 .../UnclosedStringLiteral.java | 0 .../UnclosedStringLiteral_after.java | 0 .../codeInspection}/ConvertToBasicLatinTest.java | 16 ++++++++-------- 26 files changed, 31 insertions(+), 25 deletions(-) rename {java/java-impl/src/com/intellij/codeInspection => plugins/java-i18n/src/com/intellij/codeInspection/i18n}/ConvertToBasicLatinInspection.java (93%) rename {java/java-tests/testData/codeInsight => plugins/java-i18n/testData/quickFix}/convertToBasicLatin/CharLiteral.java (100%) rename {java/java-tests/testData/codeInsight => plugins/java-i18n/testData/quickFix}/convertToBasicLatin/CharLiteral_after.java (100%) rename {java/java-tests/testData/codeInsight => plugins/java-i18n/testData/quickFix}/convertToBasicLatin/DocComment.java (100%) rename {java/java-tests/testData/codeInsight => plugins/java-i18n/testData/quickFix}/convertToBasicLatin/DocComment_after.java (100%) rename {java/java-tests/testData/codeInsight => plugins/java-i18n/testData/quickFix}/convertToBasicLatin/DocTag.java (100%) rename {java/java-tests/testData/codeInsight => plugins/java-i18n/testData/quickFix}/convertToBasicLatin/DocTag_after.java (100%) rename {java/java-tests/testData/codeInsight => plugins/java-i18n/testData/quickFix}/convertToBasicLatin/PlainComment.java (100%) rename {java/java-tests/testData/codeInsight => plugins/java-i18n/testData/quickFix}/convertToBasicLatin/PlainComment_after.java (100%) rename {java/java-tests/testData/codeInsight => plugins/java-i18n/testData/quickFix}/convertToBasicLatin/StringLiteral.java (100%) rename {java/java-tests/testData/codeInsight => plugins/java-i18n/testData/quickFix}/convertToBasicLatin/StringLiteral_after.java (100%) rename {java/java-tests/testData/codeInsight => plugins/java-i18n/testData/quickFix}/convertToBasicLatin/UnclosedDocComment.java (100%) rename {java/java-tests/testData/codeInsight => plugins/java-i18n/testData/quickFix}/convertToBasicLatin/UnclosedDocComment_after.java (100%) rename {java/java-tests/testData/codeInsight => plugins/java-i18n/testData/quickFix}/convertToBasicLatin/UnclosedPlainComment.java (100%) rename {java/java-tests/testData/codeInsight => plugins/java-i18n/testData/quickFix}/convertToBasicLatin/UnclosedPlainComment_after.java (100%) rename {java/java-tests/testData/codeInsight => plugins/java-i18n/testData/quickFix}/convertToBasicLatin/UnclosedStringLiteral.java (100%) rename {java/java-tests/testData/codeInsight => plugins/java-i18n/testData/quickFix}/convertToBasicLatin/UnclosedStringLiteral_after.java (100%) rename {java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix => plugins/java-i18n/testSrc/com/intellij/codeInspection}/ConvertToBasicLatinTest.java (65%) diff --git a/java/java-impl/src/META-INF/JavaPlugin.xml b/java/java-impl/src/META-INF/JavaPlugin.xml index c6a90611f2cd..b0c9dbd1387b 100644 --- a/java/java-impl/src/META-INF/JavaPlugin.xml +++ b/java/java-impl/src/META-INF/JavaPlugin.xml @@ -1649,10 +1649,6 @@ groupKey="group.names.declaration.redundancy" groupBundle="messages.InspectionsBundle" enabledByDefault="true" level="WARNING" implementationClass="com.intellij.codeInspection.DefaultAnnotationParamInspection" /> - + \ No newline at end of file diff --git a/plugins/java-i18n/resources/messages/JavaI18nBundle.properties b/plugins/java-i18n/resources/messages/JavaI18nBundle.properties index 24672eb23cd7..3f60ae73953d 100644 --- a/plugins/java-i18n/resources/messages/JavaI18nBundle.properties +++ b/plugins/java-i18n/resources/messages/JavaI18nBundle.properties @@ -94,3 +94,4 @@ command.name.edit.property.value=Edit Property Value checkbox.fold.to.context=Fold '{0}', '{1}', ... placeholders to corresponding context expressions from Java/Kotlin code inspection.dialog.title.capitalization.display.name=Incorrect string capitalization inspection.suspicious.locales.languages.display.name=Suspicious resource bundle locale languages +inspection.convert.to.basic.latin=Convert to Basic Latin diff --git a/plugins/java-i18n/src/META-INF/plugin.xml b/plugins/java-i18n/src/META-INF/plugin.xml index c1d7bc00e769..2af786334f98 100644 --- a/plugins/java-i18n/src/META-INF/plugin.xml +++ b/plugins/java-i18n/src/META-INF/plugin.xml @@ -67,7 +67,10 @@ level="WARNING" implementationClass="com.intellij.codeInspection.SuspiciousLocalesLanguagesInspection" key="inspection.suspicious.locales.languages.display.name" bundle="messages.JavaI18nBundle"/> - + com.intellij.codeInspection.capitalization.AnnotateCapitalizationIntention Java/I18N diff --git a/java/java-impl/src/com/intellij/codeInspection/ConvertToBasicLatinInspection.java b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/ConvertToBasicLatinInspection.java similarity index 93% rename from java/java-impl/src/com/intellij/codeInspection/ConvertToBasicLatinInspection.java rename to plugins/java-i18n/src/com/intellij/codeInspection/i18n/ConvertToBasicLatinInspection.java index a3ea7b351b13..e7c7d8b29ee4 100644 --- a/java/java-impl/src/com/intellij/codeInspection/ConvertToBasicLatinInspection.java +++ b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/ConvertToBasicLatinInspection.java @@ -1,7 +1,8 @@ -// Copyright 2000-2021 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.codeInspection; +// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +package com.intellij.codeInspection.i18n; -import com.intellij.java.JavaBundle; +import com.intellij.codeInspection.*; +import com.intellij.java.i18n.JavaI18nBundle; import com.intellij.javaee.ExternalResourceManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; @@ -36,12 +37,13 @@ public class ConvertToBasicLatinInspection extends AbstractBaseJavaLocalInspecti public PsiElementVisitor buildVisitor(@NotNull final ProblemsHolder holder, boolean isOnTheFly) { return new JavaElementVisitor() { @Nullable - @SuppressWarnings("DialogTitleCapitalization" /* "Basic Latin" is a proper noun */) private ProblemDescriptor getProblem(PsiElement element) { if (IOUtil.isAscii(element.getText())) return null; + // "Basic Latin" is a proper noun + //noinspection DialogTitleCapitalization return holder.getManager().createProblemDescriptor(element, (TextRange)null, - JavaBundle.message("inspection.convert.to.basic.latin"), + JavaI18nBundle.message("inspection.convert.to.basic.latin"), ProblemHighlightType.INFORMATION, isOnTheFly, new MyLocalQuickFix()); @@ -198,7 +200,7 @@ public class ConvertToBasicLatinInspection extends AbstractBaseJavaLocalInspecti @NotNull @Override public String getFamilyName() { - return JavaBundle.message("inspection.convert.to.basic.latin"); + return JavaI18nBundle.message("inspection.convert.to.basic.latin"); } @Override diff --git a/java/java-tests/testData/codeInsight/convertToBasicLatin/CharLiteral.java b/plugins/java-i18n/testData/quickFix/convertToBasicLatin/CharLiteral.java similarity index 100% rename from java/java-tests/testData/codeInsight/convertToBasicLatin/CharLiteral.java rename to plugins/java-i18n/testData/quickFix/convertToBasicLatin/CharLiteral.java diff --git a/java/java-tests/testData/codeInsight/convertToBasicLatin/CharLiteral_after.java b/plugins/java-i18n/testData/quickFix/convertToBasicLatin/CharLiteral_after.java similarity index 100% rename from java/java-tests/testData/codeInsight/convertToBasicLatin/CharLiteral_after.java rename to plugins/java-i18n/testData/quickFix/convertToBasicLatin/CharLiteral_after.java diff --git a/java/java-tests/testData/codeInsight/convertToBasicLatin/DocComment.java b/plugins/java-i18n/testData/quickFix/convertToBasicLatin/DocComment.java similarity index 100% rename from java/java-tests/testData/codeInsight/convertToBasicLatin/DocComment.java rename to plugins/java-i18n/testData/quickFix/convertToBasicLatin/DocComment.java diff --git a/java/java-tests/testData/codeInsight/convertToBasicLatin/DocComment_after.java b/plugins/java-i18n/testData/quickFix/convertToBasicLatin/DocComment_after.java similarity index 100% rename from java/java-tests/testData/codeInsight/convertToBasicLatin/DocComment_after.java rename to plugins/java-i18n/testData/quickFix/convertToBasicLatin/DocComment_after.java diff --git a/java/java-tests/testData/codeInsight/convertToBasicLatin/DocTag.java b/plugins/java-i18n/testData/quickFix/convertToBasicLatin/DocTag.java similarity index 100% rename from java/java-tests/testData/codeInsight/convertToBasicLatin/DocTag.java rename to plugins/java-i18n/testData/quickFix/convertToBasicLatin/DocTag.java diff --git a/java/java-tests/testData/codeInsight/convertToBasicLatin/DocTag_after.java b/plugins/java-i18n/testData/quickFix/convertToBasicLatin/DocTag_after.java similarity index 100% rename from java/java-tests/testData/codeInsight/convertToBasicLatin/DocTag_after.java rename to plugins/java-i18n/testData/quickFix/convertToBasicLatin/DocTag_after.java diff --git a/java/java-tests/testData/codeInsight/convertToBasicLatin/PlainComment.java b/plugins/java-i18n/testData/quickFix/convertToBasicLatin/PlainComment.java similarity index 100% rename from java/java-tests/testData/codeInsight/convertToBasicLatin/PlainComment.java rename to plugins/java-i18n/testData/quickFix/convertToBasicLatin/PlainComment.java diff --git a/java/java-tests/testData/codeInsight/convertToBasicLatin/PlainComment_after.java b/plugins/java-i18n/testData/quickFix/convertToBasicLatin/PlainComment_after.java similarity index 100% rename from java/java-tests/testData/codeInsight/convertToBasicLatin/PlainComment_after.java rename to plugins/java-i18n/testData/quickFix/convertToBasicLatin/PlainComment_after.java diff --git a/java/java-tests/testData/codeInsight/convertToBasicLatin/StringLiteral.java b/plugins/java-i18n/testData/quickFix/convertToBasicLatin/StringLiteral.java similarity index 100% rename from java/java-tests/testData/codeInsight/convertToBasicLatin/StringLiteral.java rename to plugins/java-i18n/testData/quickFix/convertToBasicLatin/StringLiteral.java diff --git a/java/java-tests/testData/codeInsight/convertToBasicLatin/StringLiteral_after.java b/plugins/java-i18n/testData/quickFix/convertToBasicLatin/StringLiteral_after.java similarity index 100% rename from java/java-tests/testData/codeInsight/convertToBasicLatin/StringLiteral_after.java rename to plugins/java-i18n/testData/quickFix/convertToBasicLatin/StringLiteral_after.java diff --git a/java/java-tests/testData/codeInsight/convertToBasicLatin/UnclosedDocComment.java b/plugins/java-i18n/testData/quickFix/convertToBasicLatin/UnclosedDocComment.java similarity index 100% rename from java/java-tests/testData/codeInsight/convertToBasicLatin/UnclosedDocComment.java rename to plugins/java-i18n/testData/quickFix/convertToBasicLatin/UnclosedDocComment.java diff --git a/java/java-tests/testData/codeInsight/convertToBasicLatin/UnclosedDocComment_after.java b/plugins/java-i18n/testData/quickFix/convertToBasicLatin/UnclosedDocComment_after.java similarity index 100% rename from java/java-tests/testData/codeInsight/convertToBasicLatin/UnclosedDocComment_after.java rename to plugins/java-i18n/testData/quickFix/convertToBasicLatin/UnclosedDocComment_after.java diff --git a/java/java-tests/testData/codeInsight/convertToBasicLatin/UnclosedPlainComment.java b/plugins/java-i18n/testData/quickFix/convertToBasicLatin/UnclosedPlainComment.java similarity index 100% rename from java/java-tests/testData/codeInsight/convertToBasicLatin/UnclosedPlainComment.java rename to plugins/java-i18n/testData/quickFix/convertToBasicLatin/UnclosedPlainComment.java diff --git a/java/java-tests/testData/codeInsight/convertToBasicLatin/UnclosedPlainComment_after.java b/plugins/java-i18n/testData/quickFix/convertToBasicLatin/UnclosedPlainComment_after.java similarity index 100% rename from java/java-tests/testData/codeInsight/convertToBasicLatin/UnclosedPlainComment_after.java rename to plugins/java-i18n/testData/quickFix/convertToBasicLatin/UnclosedPlainComment_after.java diff --git a/java/java-tests/testData/codeInsight/convertToBasicLatin/UnclosedStringLiteral.java b/plugins/java-i18n/testData/quickFix/convertToBasicLatin/UnclosedStringLiteral.java similarity index 100% rename from java/java-tests/testData/codeInsight/convertToBasicLatin/UnclosedStringLiteral.java rename to plugins/java-i18n/testData/quickFix/convertToBasicLatin/UnclosedStringLiteral.java diff --git a/java/java-tests/testData/codeInsight/convertToBasicLatin/UnclosedStringLiteral_after.java b/plugins/java-i18n/testData/quickFix/convertToBasicLatin/UnclosedStringLiteral_after.java similarity index 100% rename from java/java-tests/testData/codeInsight/convertToBasicLatin/UnclosedStringLiteral_after.java rename to plugins/java-i18n/testData/quickFix/convertToBasicLatin/UnclosedStringLiteral_after.java diff --git a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/ConvertToBasicLatinTest.java b/plugins/java-i18n/testSrc/com/intellij/codeInspection/ConvertToBasicLatinTest.java similarity index 65% rename from java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/ConvertToBasicLatinTest.java rename to plugins/java-i18n/testSrc/com/intellij/codeInspection/ConvertToBasicLatinTest.java index e74062d0099e..5b25e85b834f 100644 --- a/java/java-tests/testSrc/com/intellij/java/codeInsight/daemon/quickFix/ConvertToBasicLatinTest.java +++ b/plugins/java-i18n/testSrc/com/intellij/codeInspection/ConvertToBasicLatinTest.java @@ -1,16 +1,16 @@ -// Copyright 2000-2021 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.java.codeInsight.daemon.quickFix; +// Copyright 2000-2021 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +package com.intellij.codeInspection; -import com.intellij.JavaTestUtil; import com.intellij.codeInsight.intention.IntentionAction; -import com.intellij.codeInspection.ConvertToBasicLatinInspection; -import com.intellij.java.JavaBundle; +import com.intellij.codeInspection.i18n.ConvertToBasicLatinInspection; +import com.intellij.java.i18n.JavaI18nBundle; +import com.intellij.openapi.application.PathManager; import com.intellij.testFramework.fixtures.LightJavaCodeInsightFixtureTestCase; public class ConvertToBasicLatinTest extends LightJavaCodeInsightFixtureTestCase { @Override - protected String getBasePath() { - return JavaTestUtil.getRelativeJavaTestDataPath() + "/codeInsight/convertToBasicLatin/"; + protected String getTestDataPath() { + return PathManager.getCommunityHomePath() + "/plugins/java-i18n/testData/quickFix/convertToBasicLatin"; } @Override @@ -30,7 +30,7 @@ public class ConvertToBasicLatinTest extends LightJavaCodeInsightFixtureTestCase private void doTest() { myFixture.configureByFiles(getTestName(false) + ".java"); - final IntentionAction singleIntention = myFixture.findSingleIntention(JavaBundle.message("inspection.convert.to.basic.latin")); + final IntentionAction singleIntention = myFixture.findSingleIntention(JavaI18nBundle.message("inspection.convert.to.basic.latin")); myFixture.launchAction(singleIntention); myFixture.checkResultByFile(getTestName(false) + ".java", getTestName(false) + "_after.java", true); }