From 4a8f357bb97efc5893fdce9627cdabd595f4e37d Mon Sep 17 00:00:00 2001 From: Yaroslav Pankratyev Date: Tue, 15 May 2018 17:42:15 +0700 Subject: [PATCH] Add jvm-analysis modules and related changes, move JvmLocalInspection to jvm-analysis-api, move UnstableApiUsageInspection to jvm-analysis-impl --- .idea/modules.xml | 5 +++++ .../intellij/build/BaseIdeaProperties.groovy | 2 ++ .../build/IntelliJCoreArtifactsBuilder.groovy | 2 ++ .../intellij.java.analysis.impl.iml | 1 + .../intellij.jvm.analysis.iml | 15 ++++++++++++++ .../jvm/inspection/JvmLocalInspection.java | 0 .../intellij.jvm.analysis.impl.iml | 13 ++++++++++++ .../resources/META-INF/JvmAnalysisPlugin.xml | 8 ++++++++ .../jvm/analysis/JvmAnalysisBundle.properties | 5 +++++ .../UnstableApiUsage.html | 0 .../intellij/analysis/JvmAnalysisBundle.java | 20 +++++++++++++++++++ .../UnstableApiUsageInspection.java | 11 ++++------ .../intellij.jvm.analysis.java.tests.iml | 12 +++++++++++ .../UnstableElementsTest.java | 1 + .../UnstableApiUsageInspectionTest.kt | 8 ++++---- .../jvm/analysis/JvmAnalysisTestsUtil.java | 6 ++++++ .../intellij.jvm.analysis.kotlin.tests.iml | 14 +++++++++++++ .../unstableApiUsage/UnstableElementsTest.kt | 0 .../KtUnstableApiUsageInspectionTest.kt | 9 ++++----- .../jvm/analysis/JvmAnalysisKtTestsUtil.java | 6 ++++++ .../intellij.jvm.analysis.tests.iml | 13 ++++++++++++ .../UnstableApiUsageInspectionTestBase.kt | 2 +- .../devkit/devkit-core/intellij.devkit.iml | 1 + .../devkit-core/resources/META-INF/plugin.xml | 4 ---- .../intellij.devkit.tests.iml | 1 + plugins/junit/intellij.junit.iml | 1 + resources/src/META-INF/JavaIdePlugin.xml | 1 + 27 files changed, 140 insertions(+), 21 deletions(-) create mode 100644 jvm/jvm-analysis-api/intellij.jvm.analysis.iml rename {java/java-analysis-api => jvm/jvm-analysis-api}/src/com/intellij/lang/jvm/inspection/JvmLocalInspection.java (100%) create mode 100644 jvm/jvm-analysis-impl/intellij.jvm.analysis.impl.iml create mode 100644 jvm/jvm-analysis-impl/resources/META-INF/JvmAnalysisPlugin.xml create mode 100644 jvm/jvm-analysis-impl/resources/com/intellij/jvm/analysis/JvmAnalysisBundle.properties rename {plugins/devkit/devkit-core => jvm/jvm-analysis-impl}/resources/inspectionDescriptions/UnstableApiUsage.html (100%) create mode 100644 jvm/jvm-analysis-impl/src/com/intellij/analysis/JvmAnalysisBundle.java rename {plugins/devkit/devkit-core/src/inspections => jvm/jvm-analysis-impl/src/com/intellij/codeInspection}/UnstableApiUsageInspection.java (91%) create mode 100644 jvm/jvm-analysis-java-tests/intellij.jvm.analysis.java.tests.iml rename {plugins/devkit/devkit-java-tests/testData/inspections => jvm/jvm-analysis-java-tests/testData/codeInspection}/unstableApiUsage/UnstableElementsTest.java (98%) rename {plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/inspections => jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection}/UnstableApiUsageInspectionTest.kt (56%) create mode 100644 jvm/jvm-analysis-java-tests/testSrc/com/intellij/jvm/analysis/JvmAnalysisTestsUtil.java create mode 100644 jvm/jvm-analysis-kotlin-tests/intellij.jvm.analysis.kotlin.tests.iml rename {plugins/devkit/devkit-kotlin-tests/testData/inspections => jvm/jvm-analysis-kotlin-tests/testData/codeInspection}/unstableApiUsage/UnstableElementsTest.kt (100%) rename {plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections => jvm/jvm-analysis-kotlin-tests/testSrc/com/intellij/codeInspection}/KtUnstableApiUsageInspectionTest.kt (66%) create mode 100644 jvm/jvm-analysis-kotlin-tests/testSrc/com/intellij/jvm/analysis/JvmAnalysisKtTestsUtil.java create mode 100644 jvm/jvm-analysis-tests-api/intellij.jvm.analysis.tests.iml rename {plugins/devkit/devkit-tests-api/src/org/jetbrains/idea/devkit/inspections => jvm/jvm-analysis-tests-api/src/com/intellij/codeInspection}/UnstableApiUsageInspectionTestBase.kt (99%) diff --git a/.idea/modules.xml b/.idea/modules.xml index db4e62859d03..6c87522f1be1 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -518,6 +518,11 @@ + + + + + diff --git a/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy b/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy index 7abf1b174f27..bd71090c73d0 100644 --- a/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy +++ b/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy @@ -72,6 +72,7 @@ abstract class BaseIdeaProperties extends ProductProperties { layout.customize { def JAVA_RESOURCES_JAR = "java_resources_en.jar" withModule("intellij.java.analysis", JAVA_API_JAR, JAVA_RESOURCES_JAR) + withModule("intellij.jvm.analysis", JAVA_API_JAR, JAVA_RESOURCES_JAR) withModule("intellij.java.indexing", JAVA_API_JAR, JAVA_RESOURCES_JAR) withModule("intellij.java.psi", JAVA_API_JAR, JAVA_RESOURCES_JAR) withModule("intellij.java", JAVA_API_JAR, JAVA_RESOURCES_JAR) @@ -80,6 +81,7 @@ abstract class BaseIdeaProperties extends ProductProperties { withModule("intellij.platform.uast", JAVA_API_JAR, JAVA_RESOURCES_JAR) withModule("intellij.java.analysis.impl", JAVA_IMPL_JAR, JAVA_RESOURCES_JAR) + withModule("intellij.jvm.analysis.impl", JAVA_IMPL_JAR, JAVA_RESOURCES_JAR) withModule("intellij.java.indexing.impl", JAVA_IMPL_JAR, JAVA_RESOURCES_JAR) withModule("intellij.java.psi.impl", JAVA_IMPL_JAR, JAVA_RESOURCES_JAR) withModule("intellij.java.impl", JAVA_IMPL_JAR, JAVA_RESOURCES_JAR) diff --git a/build/groovy/org/jetbrains/intellij/build/IntelliJCoreArtifactsBuilder.groovy b/build/groovy/org/jetbrains/intellij/build/IntelliJCoreArtifactsBuilder.groovy index 802cd8620c7e..1dca189a8c14 100644 --- a/build/groovy/org/jetbrains/intellij/build/IntelliJCoreArtifactsBuilder.groovy +++ b/build/groovy/org/jetbrains/intellij/build/IntelliJCoreArtifactsBuilder.groovy @@ -43,6 +43,7 @@ class IntelliJCoreArtifactsBuilder { "intellij.xml.analysis", "intellij.xml.psi", "intellij.xml.structureView", + "intellij.jvm.analysis", ] private static final List ANALYSIS_IMPL_MODULES = [ "intellij.platform.analysis.impl", @@ -56,6 +57,7 @@ class IntelliJCoreArtifactsBuilder { "intellij.xml.analysis.impl", "intellij.xml.psi.impl", "intellij.xml.structureView.impl", + "intellij.jvm.analysis.impl", ] private final BuildContext buildContext diff --git a/java/java-analysis-impl/intellij.java.analysis.impl.iml b/java/java-analysis-impl/intellij.java.analysis.impl.iml index 372f9e0bdb49..fb703caa01c6 100644 --- a/java/java-analysis-impl/intellij.java.analysis.impl.iml +++ b/java/java-analysis-impl/intellij.java.analysis.impl.iml @@ -22,5 +22,6 @@ + \ No newline at end of file diff --git a/jvm/jvm-analysis-api/intellij.jvm.analysis.iml b/jvm/jvm-analysis-api/intellij.jvm.analysis.iml new file mode 100644 index 000000000000..1672443c8ebb --- /dev/null +++ b/jvm/jvm-analysis-api/intellij.jvm.analysis.iml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/java/java-analysis-api/src/com/intellij/lang/jvm/inspection/JvmLocalInspection.java b/jvm/jvm-analysis-api/src/com/intellij/lang/jvm/inspection/JvmLocalInspection.java similarity index 100% rename from java/java-analysis-api/src/com/intellij/lang/jvm/inspection/JvmLocalInspection.java rename to jvm/jvm-analysis-api/src/com/intellij/lang/jvm/inspection/JvmLocalInspection.java diff --git a/jvm/jvm-analysis-impl/intellij.jvm.analysis.impl.iml b/jvm/jvm-analysis-impl/intellij.jvm.analysis.impl.iml new file mode 100644 index 000000000000..3645177bca7b --- /dev/null +++ b/jvm/jvm-analysis-impl/intellij.jvm.analysis.impl.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/jvm/jvm-analysis-impl/resources/META-INF/JvmAnalysisPlugin.xml b/jvm/jvm-analysis-impl/resources/META-INF/JvmAnalysisPlugin.xml new file mode 100644 index 000000000000..0944c92cbe6d --- /dev/null +++ b/jvm/jvm-analysis-impl/resources/META-INF/JvmAnalysisPlugin.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/jvm/jvm-analysis-impl/resources/com/intellij/jvm/analysis/JvmAnalysisBundle.properties b/jvm/jvm-analysis-impl/resources/com/intellij/jvm/analysis/JvmAnalysisBundle.properties new file mode 100644 index 000000000000..f8e3c0ec18f8 --- /dev/null +++ b/jvm/jvm-analysis-impl/resources/com/intellij/jvm/analysis/JvmAnalysisBundle.properties @@ -0,0 +1,5 @@ +jvm.inspections.group.name=JVM languages + +jvm.inspections.unstable.api.usage.display.name=Unstable API Usage +jvm.inspections.unstable.api.usage.annotations.list=Unstable API annotations +jvm.inspections.unstable.api.usage.description=''{0}'' is marked unstable \ No newline at end of file diff --git a/plugins/devkit/devkit-core/resources/inspectionDescriptions/UnstableApiUsage.html b/jvm/jvm-analysis-impl/resources/inspectionDescriptions/UnstableApiUsage.html similarity index 100% rename from plugins/devkit/devkit-core/resources/inspectionDescriptions/UnstableApiUsage.html rename to jvm/jvm-analysis-impl/resources/inspectionDescriptions/UnstableApiUsage.html diff --git a/jvm/jvm-analysis-impl/src/com/intellij/analysis/JvmAnalysisBundle.java b/jvm/jvm-analysis-impl/src/com/intellij/analysis/JvmAnalysisBundle.java new file mode 100644 index 000000000000..daf9c4eac854 --- /dev/null +++ b/jvm/jvm-analysis-impl/src/com/intellij/analysis/JvmAnalysisBundle.java @@ -0,0 +1,20 @@ +// 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.analysis; + +import com.intellij.AbstractBundle; +import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.PropertyKey; + +public class JvmAnalysisBundle extends AbstractBundle { + public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, @NotNull Object... params) { + return ourInstance.getMessage(key, params); + } + + @NonNls private static final String BUNDLE = "com.intellij.jvm.analysis.JvmAnalysisBundle"; + private static final JvmAnalysisBundle ourInstance = new JvmAnalysisBundle(); + + private JvmAnalysisBundle() { + super(BUNDLE); + } +} diff --git a/plugins/devkit/devkit-core/src/inspections/UnstableApiUsageInspection.java b/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/UnstableApiUsageInspection.java similarity index 91% rename from plugins/devkit/devkit-core/src/inspections/UnstableApiUsageInspection.java rename to jvm/jvm-analysis-impl/src/com/intellij/codeInspection/UnstableApiUsageInspection.java index 85e41c7759bb..a62fc554e835 100644 --- a/plugins/devkit/devkit-core/src/inspections/UnstableApiUsageInspection.java +++ b/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/UnstableApiUsageInspection.java @@ -1,9 +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 org.jetbrains.idea.devkit.inspections; +package com.intellij.codeInspection; -import com.intellij.codeInspection.LocalInspectionTool; -import com.intellij.codeInspection.ProblemHighlightType; -import com.intellij.codeInspection.ProblemsHolder; +import com.intellij.analysis.JvmAnalysisBundle; import com.intellij.codeInspection.util.SpecialAnnotationsUtil; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.project.Project; @@ -15,7 +13,6 @@ import com.intellij.psi.search.GlobalSearchScope; import com.siyeh.ig.ui.ExternalizableStringSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.jetbrains.idea.devkit.DevKitBundle; import javax.swing.*; import java.awt.*; @@ -38,7 +35,7 @@ public class UnstableApiUsageInspection extends LocalInspectionTool { JPanel panel = new JPanel(new GridBagLayout()); //TODO in add annotation window "Include non-project items" should be enabled by default JPanel annotationsListControl = SpecialAnnotationsUtil.createSpecialAnnotationsListControl( - unstableApiAnnotations, DevKitBundle.message("inspections.unstable.api.usage.annotations.list")); + unstableApiAnnotations, JvmAnalysisBundle.message("jvm.inspections.unstable.api.usage.annotations.list")); GridBagConstraints constraints = new GridBagConstraints(); constraints.gridx = 0; constraints.gridy = 0; @@ -78,7 +75,7 @@ public class UnstableApiUsageInspection extends LocalInspectionTool { for (String annotation : unstableApiAnnotations) { if (modifierListOwner.hasAnnotation(annotation)) { holder.registerProblem(reference, - DevKitBundle.message("inspections.unstable.api.usage.description", getReferenceText(reference)), + JvmAnalysisBundle.message("jvm.inspections.unstable.api.usage.description", getReferenceText(reference)), ProblemHighlightType.GENERIC_ERROR_OR_WARNING); return; } diff --git a/jvm/jvm-analysis-java-tests/intellij.jvm.analysis.java.tests.iml b/jvm/jvm-analysis-java-tests/intellij.jvm.analysis.java.tests.iml new file mode 100644 index 000000000000..43a9d1f7f207 --- /dev/null +++ b/jvm/jvm-analysis-java-tests/intellij.jvm.analysis.java.tests.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/plugins/devkit/devkit-java-tests/testData/inspections/unstableApiUsage/UnstableElementsTest.java b/jvm/jvm-analysis-java-tests/testData/codeInspection/unstableApiUsage/UnstableElementsTest.java similarity index 98% rename from plugins/devkit/devkit-java-tests/testData/inspections/unstableApiUsage/UnstableElementsTest.java rename to jvm/jvm-analysis-java-tests/testData/codeInspection/unstableApiUsage/UnstableElementsTest.java index 5f4585752093..9d16aad40341 100644 --- a/plugins/devkit/devkit-java-tests/testData/inspections/unstableApiUsage/UnstableElementsTest.java +++ b/jvm/jvm-analysis-java-tests/testData/codeInspection/unstableApiUsage/UnstableElementsTest.java @@ -1,3 +1,4 @@ +// 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. import pkg.ExperimentalClass; import static pkg.ExperimentalClass.NON_EXPERIMENTAL_CONSTANT_IN_EXPERIMENTAL_CLASS; import static pkg.ExperimentalClass.staticNonExperimentalMethodInExperimentalClass; diff --git a/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/inspections/UnstableApiUsageInspectionTest.kt b/jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/UnstableApiUsageInspectionTest.kt similarity index 56% rename from plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/inspections/UnstableApiUsageInspectionTest.kt rename to jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/UnstableApiUsageInspectionTest.kt index 32a892cce600..6f902e28ef8e 100644 --- a/plugins/devkit/devkit-java-tests/testSrc/org/jetbrains/idea/devkit/inspections/UnstableApiUsageInspectionTest.kt +++ b/jvm/jvm-analysis-java-tests/testSrc/com/intellij/codeInspection/UnstableApiUsageInspectionTest.kt @@ -1,12 +1,12 @@ // 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 org.jetbrains.idea.devkit.inspections +package com.intellij.codeInspection +import com.intellij.jvm.analysis.JvmAnalysisTestsUtil.TEST_DATA_PROJECT_RELATIVE_BASE_PATH import com.intellij.testFramework.TestDataPath -import org.jetbrains.idea.devkit.DevkitJavaTestsUtil -@TestDataPath("\$CONTENT_ROOT/testData/inspections/unstableApiUsage") +@TestDataPath("/testData/codeInspection/unstableApiUsage") class UnstableApiUsageInspectionTest : UnstableApiUsageInspectionTestBase() { - override fun getBasePath() = "${DevkitJavaTestsUtil.TESTDATA_PATH}inspections/unstableApiUsage" + override fun getBasePath() = "${TEST_DATA_PROJECT_RELATIVE_BASE_PATH}/codeInspection/unstableApiUsage" fun testInspection() { myFixture.testHighlighting(true, false, false, "UnstableElementsTest.java") diff --git a/jvm/jvm-analysis-java-tests/testSrc/com/intellij/jvm/analysis/JvmAnalysisTestsUtil.java b/jvm/jvm-analysis-java-tests/testSrc/com/intellij/jvm/analysis/JvmAnalysisTestsUtil.java new file mode 100644 index 000000000000..f288b36b6744 --- /dev/null +++ b/jvm/jvm-analysis-java-tests/testSrc/com/intellij/jvm/analysis/JvmAnalysisTestsUtil.java @@ -0,0 +1,6 @@ +// 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.jvm.analysis; + +public final class JvmAnalysisTestsUtil { + public static final String TEST_DATA_PROJECT_RELATIVE_BASE_PATH = "/community/jvm/jvm-analysis-java-tests/testData"; +} diff --git a/jvm/jvm-analysis-kotlin-tests/intellij.jvm.analysis.kotlin.tests.iml b/jvm/jvm-analysis-kotlin-tests/intellij.jvm.analysis.kotlin.tests.iml new file mode 100644 index 000000000000..f2bd7c7f02cd --- /dev/null +++ b/jvm/jvm-analysis-kotlin-tests/intellij.jvm.analysis.kotlin.tests.iml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/plugins/devkit/devkit-kotlin-tests/testData/inspections/unstableApiUsage/UnstableElementsTest.kt b/jvm/jvm-analysis-kotlin-tests/testData/codeInspection/unstableApiUsage/UnstableElementsTest.kt similarity index 100% rename from plugins/devkit/devkit-kotlin-tests/testData/inspections/unstableApiUsage/UnstableElementsTest.kt rename to jvm/jvm-analysis-kotlin-tests/testData/codeInspection/unstableApiUsage/UnstableElementsTest.kt diff --git a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtUnstableApiUsageInspectionTest.kt b/jvm/jvm-analysis-kotlin-tests/testSrc/com/intellij/codeInspection/KtUnstableApiUsageInspectionTest.kt similarity index 66% rename from plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtUnstableApiUsageInspectionTest.kt rename to jvm/jvm-analysis-kotlin-tests/testSrc/com/intellij/codeInspection/KtUnstableApiUsageInspectionTest.kt index 4c45b43ae490..5ec5f0a3bb27 100644 --- a/plugins/devkit/devkit-kotlin-tests/testSrc/org/jetbrains/idea/devkit/kotlin/inspections/KtUnstableApiUsageInspectionTest.kt +++ b/jvm/jvm-analysis-kotlin-tests/testSrc/com/intellij/codeInspection/KtUnstableApiUsageInspectionTest.kt @@ -1,15 +1,14 @@ // 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 org.jetbrains.idea.devkit.kotlin.inspections +package com.intellij.codeInspection +import com.intellij.jvm.analysis.JvmAnalysisKtTestsUtil.TEST_DATA_PROJECT_RELATIVE_BASE_PATH import com.intellij.openapi.vfs.VirtualFileFilter import com.intellij.testFramework.TestDataPath import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl -import org.jetbrains.idea.devkit.inspections.UnstableApiUsageInspectionTestBase -import org.jetbrains.idea.devkit.kotlin.DevkitKtTestsUtil -@TestDataPath("\$CONTENT_ROOT/testData/inspections/unstableApiUsage") +@TestDataPath("/testData/codeInspection/unstableApiUsage") class KtUnstableApiUsageInspectionTest : UnstableApiUsageInspectionTestBase() { - override fun getBasePath() = "${DevkitKtTestsUtil.TESTDATA_PATH}inspections/unstableApiUsage" + override fun getBasePath() = "${TEST_DATA_PROJECT_RELATIVE_BASE_PATH}/codeInspection/unstableApiUsage" override fun performAdditionalSetUp() { // otherwise assertion in PsiFileImpl ("Access to tree elements not allowed") will not pass diff --git a/jvm/jvm-analysis-kotlin-tests/testSrc/com/intellij/jvm/analysis/JvmAnalysisKtTestsUtil.java b/jvm/jvm-analysis-kotlin-tests/testSrc/com/intellij/jvm/analysis/JvmAnalysisKtTestsUtil.java new file mode 100644 index 000000000000..44a2e35e4ee6 --- /dev/null +++ b/jvm/jvm-analysis-kotlin-tests/testSrc/com/intellij/jvm/analysis/JvmAnalysisKtTestsUtil.java @@ -0,0 +1,6 @@ +// 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.jvm.analysis; + +public final class JvmAnalysisKtTestsUtil { + public static final String TEST_DATA_PROJECT_RELATIVE_BASE_PATH = "/community/jvm/jvm-analysis-kotlin-tests/testData"; +} diff --git a/jvm/jvm-analysis-tests-api/intellij.jvm.analysis.tests.iml b/jvm/jvm-analysis-tests-api/intellij.jvm.analysis.tests.iml new file mode 100644 index 000000000000..65b05afdd95b --- /dev/null +++ b/jvm/jvm-analysis-tests-api/intellij.jvm.analysis.tests.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/plugins/devkit/devkit-tests-api/src/org/jetbrains/idea/devkit/inspections/UnstableApiUsageInspectionTestBase.kt b/jvm/jvm-analysis-tests-api/src/com/intellij/codeInspection/UnstableApiUsageInspectionTestBase.kt similarity index 99% rename from plugins/devkit/devkit-tests-api/src/org/jetbrains/idea/devkit/inspections/UnstableApiUsageInspectionTestBase.kt rename to jvm/jvm-analysis-tests-api/src/com/intellij/codeInspection/UnstableApiUsageInspectionTestBase.kt index 3cd6ad4c3321..767385d429cc 100644 --- a/plugins/devkit/devkit-tests-api/src/org/jetbrains/idea/devkit/inspections/UnstableApiUsageInspectionTestBase.kt +++ b/jvm/jvm-analysis-tests-api/src/com/intellij/codeInspection/UnstableApiUsageInspectionTestBase.kt @@ -1,5 +1,5 @@ // 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 org.jetbrains.idea.devkit.inspections +package com.intellij.codeInspection import com.intellij.testFramework.builders.JavaModuleFixtureBuilder import com.intellij.testFramework.fixtures.JavaCodeInsightFixtureTestCase diff --git a/plugins/devkit/devkit-core/intellij.devkit.iml b/plugins/devkit/devkit-core/intellij.devkit.iml index dd40c83ef321..5b3819a7f88e 100644 --- a/plugins/devkit/devkit-core/intellij.devkit.iml +++ b/plugins/devkit/devkit-core/intellij.devkit.iml @@ -42,6 +42,7 @@ + \ No newline at end of file diff --git a/plugins/devkit/devkit-core/resources/META-INF/plugin.xml b/plugins/devkit/devkit-core/resources/META-INF/plugin.xml index 7c84a676ff22..c15e06730bbc 100644 --- a/plugins/devkit/devkit-core/resources/META-INF/plugin.xml +++ b/plugins/devkit/devkit-core/resources/META-INF/plugin.xml @@ -182,10 +182,6 @@ groupKey="inspections.group.name" enabledByDefault="true" level="ERROR" implementationClass="org.jetbrains.idea.devkit.inspections.PresentationAnnotationInspection"/> - - diff --git a/plugins/devkit/devkit-tests-api/intellij.devkit.tests.iml b/plugins/devkit/devkit-tests-api/intellij.devkit.tests.iml index b695327c9d74..9e4ae55880d8 100644 --- a/plugins/devkit/devkit-tests-api/intellij.devkit.tests.iml +++ b/plugins/devkit/devkit-tests-api/intellij.devkit.tests.iml @@ -18,5 +18,6 @@ + \ No newline at end of file diff --git a/plugins/junit/intellij.junit.iml b/plugins/junit/intellij.junit.iml index 15240a62c5b5..22841103ebd5 100644 --- a/plugins/junit/intellij.junit.iml +++ b/plugins/junit/intellij.junit.iml @@ -24,6 +24,7 @@ + diff --git a/resources/src/META-INF/JavaIdePlugin.xml b/resources/src/META-INF/JavaIdePlugin.xml index bd4a3cf8cf33..7234b5414c15 100644 --- a/resources/src/META-INF/JavaIdePlugin.xml +++ b/resources/src/META-INF/JavaIdePlugin.xml @@ -23,6 +23,7 @@ +