diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/inspections/MavenParentMissedGroupIdArtefactIdInspection.kt b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/inspections/MavenParentMissedGroupIdArtifactIdInspection.kt similarity index 89% rename from plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/inspections/MavenParentMissedGroupIdArtefactIdInspection.kt rename to plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/inspections/MavenParentMissedGroupIdArtifactIdInspection.kt index d9ea358080e7..a690943c1f4c 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/inspections/MavenParentMissedGroupIdArtefactIdInspection.kt +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/inspections/MavenParentMissedGroupIdArtifactIdInspection.kt @@ -5,7 +5,7 @@ import com.intellij.util.xml.DomFileElement import com.intellij.util.xml.highlighting.DomElementAnnotationHolder import org.jetbrains.idea.maven.dom.model.MavenDomProjectModel -class MavenParentMissedGroupIdArtefactIdInspection : MavenParentMissedCoordinatesInspection() { +class MavenParentMissedGroupIdArtifactIdInspection : MavenParentMissedCoordinatesInspection() { override fun checkFileElement(domFileElement: DomFileElement, holder: DomElementAnnotationHolder) { val parent = getParentIfExists(domFileElement) ?: return @@ -19,6 +19,6 @@ class MavenParentMissedGroupIdArtefactIdInspection : MavenParentMissedCoordinate } override fun getShortName(): String { - return "MavenParentMissedGroupIdArtefactIdInspection" + return "MavenParentMissedGroupIdArtifactIdInspection" } } \ No newline at end of file diff --git a/plugins/maven/src/main/resources/META-INF/plugin.xml b/plugins/maven/src/main/resources/META-INF/plugin.xml index 94a822555f49..6d50e73b2dae 100644 --- a/plugins/maven/src/main/resources/META-INF/plugin.xml +++ b/plugins/maven/src/main/resources/META-INF/plugin.xml @@ -207,10 +207,10 @@ key="inspection.missed.parent.version" groupKey="inspection.group" enabledByDefault="true" level="ERROR" implementationClass="org.jetbrains.idea.maven.dom.inspections.MavenParentMissedVersionInspection"/> - + implementationClass="org.jetbrains.idea.maven.dom.inspections.MavenParentMissedGroupIdArtifactIdInspection"/> Dependency is du inspection.redundant.groupId.name=Redundant groupId inspection.missed.parent.version=Parent version missed -inspection.missed.parent.groupIdArtifactId=Parent groupId or artefactId is missed +inspection.missed.parent.groupIdArtifactId=Parent groupId or artifactId is missed inspection.redundant.groupId.fix=Remove unnecessary inspection.redundant.groupId.fix.description=Definition of groupId is redundant, because it's inherited from the parent diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenParentCompletionAndResolutionTest.kt b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenParentCompletionAndResolutionTest.kt index 34a3727fc63c..f099164ae4bf 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenParentCompletionAndResolutionTest.kt +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/dom/MavenParentCompletionAndResolutionTest.kt @@ -22,7 +22,7 @@ import com.intellij.psi.ElementManipulators import com.intellij.psi.PsiElementVisitor import com.intellij.psi.PsiFile import kotlinx.coroutines.runBlocking -import org.jetbrains.idea.maven.dom.inspections.MavenParentMissedGroupIdArtefactIdInspection +import org.jetbrains.idea.maven.dom.inspections.MavenParentMissedGroupIdArtifactIdInspection import org.jetbrains.idea.maven.dom.inspections.MavenParentMissedVersionInspection import org.jetbrains.idea.maven.dom.inspections.MavenPropertyInParentInspection import org.jetbrains.idea.maven.dom.inspections.MavenRedundantGroupIdInspection @@ -487,7 +487,7 @@ class MavenParentCompletionAndResolutionTest : MavenDomWithIndicesTestCase() { """.trimIndent()) - fixture.enableInspections(MavenParentMissedGroupIdArtefactIdInspection::class.java) + fixture.enableInspections(MavenParentMissedGroupIdArtifactIdInspection::class.java) checkHighlighting() } @@ -504,7 +504,7 @@ class MavenParentCompletionAndResolutionTest : MavenDomWithIndicesTestCase() { """.trimIndent()) - fixture.enableInspections(MavenParentMissedGroupIdArtefactIdInspection::class.java) + fixture.enableInspections(MavenParentMissedGroupIdArtifactIdInspection::class.java) checkHighlighting() } @@ -516,7 +516,7 @@ class MavenParentCompletionAndResolutionTest : MavenDomWithIndicesTestCase() { project 1 """.trimIndent()) - // In Maven 3, and in are required even if the parent's POM could be found by relativePath. + // In Maven 3, and in are required even if the parent's POM could be found by relativePath. val subprojectPom = createModulePom("subdirectory", """ <parent> test @@ -525,7 +525,7 @@ class MavenParentCompletionAndResolutionTest : MavenDomWithIndicesTestCase() { subproject1 """.trimIndent()) - fixture.enableInspections(MavenParentMissedGroupIdArtefactIdInspection::class.java) + fixture.enableInspections(MavenParentMissedGroupIdArtifactIdInspection::class.java) checkHighlighting(subprojectPom) } @@ -537,7 +537,7 @@ class MavenParentCompletionAndResolutionTest : MavenDomWithIndicesTestCase() { project 1 """.trimIndent()) - // In Maven 3, and in are required even if the parent's POM could be found by relativePath. + // In Maven 3, and in are required even if the parent's POM could be found by relativePath. val subprojectPom = createModulePom("subdirectory", """ <parent> project @@ -546,7 +546,7 @@ class MavenParentCompletionAndResolutionTest : MavenDomWithIndicesTestCase() { subproject1 """.trimIndent()) - fixture.enableInspections(MavenParentMissedGroupIdArtefactIdInspection::class.java) + fixture.enableInspections(MavenParentMissedGroupIdArtifactIdInspection::class.java) checkHighlighting(subprojectPom) } @@ -558,14 +558,14 @@ class MavenParentCompletionAndResolutionTest : MavenDomWithIndicesTestCase() { project 1 """.trimIndent()) - // In Maven 4, it's possible to omit and in if the parent's POM could be found by relativePath. + // In Maven 4, it's possible to omit and in if the parent's POM could be found by relativePath. val subprojectPom = createModulePom("sub/subdirectory", """ ../../pom.xml subproject1 """.trimIndent()) - fixture.enableInspections(MavenParentMissedGroupIdArtefactIdInspection::class.java) + fixture.enableInspections(MavenParentMissedGroupIdArtifactIdInspection::class.java) checkHighlighting(subprojectPom) } @@ -577,13 +577,13 @@ class MavenParentCompletionAndResolutionTest : MavenDomWithIndicesTestCase() { project 1 """.trimIndent()) - // In Maven 4, it's possible to omit and in if the parent's POM could be found by relativePath. + // In Maven 4, it's possible to omit and in if the parent's POM could be found by relativePath. // If is not specified, the default value is used (../pom.xml) val subprojectPom = createModulePom("subdirectory", """ subproject1 """.trimIndent()) - fixture.enableInspections(MavenParentMissedGroupIdArtefactIdInspection::class.java) + fixture.enableInspections(MavenParentMissedGroupIdArtifactIdInspection::class.java) checkHighlighting(subprojectPom) }