azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactoring: better name for SameVersionInspection

Browse Source 
It now has better suppression string
This commit is contained in:
Nikolay Krasko
2016-07-06 19:15:16 +03:00
parent 8450921b58
commit c051bd2d2c
8 changed files with 48 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-maven/resources/inspectionDescriptions/SameVersion.html → idea/idea-maven/resources/inspectionDescriptions/DifferentMavenStdlibVersion.html
View File
idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/inspections/SameVersionInspection.kt → idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/inspections/DifferentMavenStdlibVersionInspection.kt
+1 -1
View File
@@ -33,7 +33,7 @@ import org.jetbrains.kotlin.idea.maven.PomFile
import org.jetbrains.kotlin.idea.maven.configuration.KotlinJavaMavenConfigurator
import org.jetbrains.kotlin.idea.maven.configuration.KotlinMavenConfigurator
class SameVersionInspection : DomElementsInspection<MavenDomProjectModel>(MavenDomProjectModel::class.java) {
class DifferentMavenStdlibVersionInspection : DomElementsInspection<MavenDomProjectModel>(MavenDomProjectModel::class.java) {
override fun checkFileElement(domFileElement: DomFileElement<MavenDomProjectModel>?, holder: DomElementAnnotationHolder?) {
if (domFileElement == null || holder == null) {
return
idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenInspectionTestGenerated.java
+6
View File
@@ -83,6 +83,12 @@ public class KotlinMavenInspectionTestGenerated extends AbstractKotlinMavenInspe
doTest(fileName);
}
@TestMetadata("sameVersionPluginLibrarySuppression.xml")
public void testSameVersionPluginLibrarySuppression() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/idea-maven/testData/maven-inspections/sameVersionPluginLibrarySuppression.xml");
doTest(fileName);
}
@TestMetadata("wrongJsExecution.xml")
public void testWrongJsExecution() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/idea-maven/testData/maven-inspections/wrongJsExecution.xml");
idea/idea-maven/testData/maven-inspections/sameVersionPluginLibrary.fixed.1.xml
Vendored
+1 -1
View File
@@ -32,6 +32,6 @@
</build>
</project>
<!-- inspection: org.jetbrains.kotlin.idea.maven.inspections.SameVersionInspection -->
<!-- inspection: org.jetbrains.kotlin.idea.maven.inspections.DifferentMavenStdlibVersionInspection -->
<!-- problem: on ${kotlin.version.1}, title Plugin version (1.0.1) is not the same as library version (1.0.1-2) -->
<!-- problem: on ${kotlin.version.2}, title Plugin version (1.0.1) is not the same as library version (1.0.1-2) -->
idea/idea-maven/testData/maven-inspections/sameVersionPluginLibrary.fixed.2.xml
Vendored
+1 -1
View File
@@ -32,6 +32,6 @@
</build>
</project>
<!-- inspection: org.jetbrains.kotlin.idea.maven.inspections.SameVersionInspection -->
<!-- inspection: org.jetbrains.kotlin.idea.maven.inspections.DifferentMavenStdlibVersionInspection -->
<!-- problem: on ${kotlin.version.1}, title Plugin version (1.0.1) is not the same as library version (1.0.1-2) -->
<!-- problem: on ${kotlin.version.2}, title Plugin version (1.0.1) is not the same as library version (1.0.1-2) -->
idea/idea-maven/testData/maven-inspections/sameVersionPluginLibrary.xml
Vendored
+1 -1
View File
@@ -32,6 +32,6 @@
</build>
</project>
<!-- inspection: org.jetbrains.kotlin.idea.maven.inspections.SameVersionInspection -->
<!-- inspection: org.jetbrains.kotlin.idea.maven.inspections.DifferentMavenStdlibVersionInspection -->
<!-- problem: on ${kotlin.version.1}, title Plugin version (1.0.1) is not the same as library version (1.0.1-2) -->
<!-- problem: on ${kotlin.version.2}, title Plugin version (1.0.1) is not the same as library version (1.0.1-2) -->
idea/idea-maven/testData/maven-inspections/sameVersionPluginLibrarySuppression.xml
Vendored
+37
View File
@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jetbrains.kotlin.test</groupId>
<artifactId>configure-maven-test</artifactId>
<version>1.0-SNAPSHOT</version>
<properties>
<kotlin.version.1>1.0.1</kotlin.version.1>
<kotlin.version.2>1.0.1-2</kotlin.version.2>
</properties>
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<!--suppress DifferentMavenStdlibVersion -->
<version>${kotlin.version.2}</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-maven-plugin</artifactId>
<!--suppress DifferentMavenStdlibVersion -->
<version>${kotlin.version.1}</version>
</plugin>
</plugins>
</build>
</project>
<!-- inspection: org.jetbrains.kotlin.idea.maven.inspections.DifferentMavenStdlibVersionInspection -->
idea/src/META-INF/maven.xml
+1 -1
View File
@@ -36,7 +36,7 @@
hasStaticDescription="true"
level="WARNING" />
<localInspection implementationClass="org.jetbrains.kotlin.idea.maven.inspections.SameVersionInspection"
<localInspection implementationClass="org.jetbrains.kotlin.idea.maven.inspections.DifferentMavenStdlibVersionInspection"
displayName="Library and maven plugin versions are different"
groupName="Kotlin"
enabledByDefault="true"