Maven: reorganize code: move classes across packages
This commit is contained in:
@@ -57,7 +57,7 @@ import org.jetbrains.kotlin.idea.completion.test.handlers.AbstractKeywordComplet
|
|||||||
import org.jetbrains.kotlin.idea.completion.test.handlers.AbstractSmartCompletionHandlerTest
|
import org.jetbrains.kotlin.idea.completion.test.handlers.AbstractSmartCompletionHandlerTest
|
||||||
import org.jetbrains.kotlin.idea.completion.test.weighers.AbstractBasicCompletionWeigherTest
|
import org.jetbrains.kotlin.idea.completion.test.weighers.AbstractBasicCompletionWeigherTest
|
||||||
import org.jetbrains.kotlin.idea.completion.test.weighers.AbstractSmartCompletionWeigherTest
|
import org.jetbrains.kotlin.idea.completion.test.weighers.AbstractSmartCompletionWeigherTest
|
||||||
import org.jetbrains.kotlin.idea.configuration.AbstractMavenConfigureProjectByChangingFileTest
|
import org.jetbrains.kotlin.idea.maven.configuration.AbstractMavenConfigureProjectByChangingFileTest
|
||||||
import org.jetbrains.kotlin.idea.conversion.copy.AbstractJavaToKotlinCopyPasteConversionTest
|
import org.jetbrains.kotlin.idea.conversion.copy.AbstractJavaToKotlinCopyPasteConversionTest
|
||||||
import org.jetbrains.kotlin.idea.coverage.AbstractKotlinCoverageOutputFilesTest
|
import org.jetbrains.kotlin.idea.coverage.AbstractKotlinCoverageOutputFilesTest
|
||||||
import org.jetbrains.kotlin.idea.debugger.AbstractBeforeExtractFunctionInsertionTest
|
import org.jetbrains.kotlin.idea.debugger.AbstractBeforeExtractFunctionInsertionTest
|
||||||
|
|||||||
+1
-1
@@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.jetbrains.kotlin.idea.configuration
|
package org.jetbrains.kotlin.idea.maven
|
||||||
|
|
||||||
import com.google.gson.JsonElement
|
import com.google.gson.JsonElement
|
||||||
import com.google.gson.JsonParser
|
import com.google.gson.JsonParser
|
||||||
+4
-4
@@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.jetbrains.kotlin.idea.configuration
|
package org.jetbrains.kotlin.idea.maven
|
||||||
|
|
||||||
import com.intellij.openapi.components.*
|
import com.intellij.openapi.components.*
|
||||||
import com.intellij.openapi.externalSystem.service.project.IdeModifiableModelsProvider
|
import com.intellij.openapi.externalSystem.service.project.IdeModifiableModelsProvider
|
||||||
@@ -148,15 +148,15 @@ class KotlinImporterComponent : PersistentStateComponent<KotlinImporterComponent
|
|||||||
|
|
||||||
val addedSources = Collections.synchronizedSet(HashSet<String>())
|
val addedSources = Collections.synchronizedSet(HashSet<String>())
|
||||||
|
|
||||||
override fun loadState(state: KotlinImporterComponent.State?) {
|
override fun loadState(state: State?) {
|
||||||
addedSources.clear()
|
addedSources.clear()
|
||||||
if (state != null) {
|
if (state != null) {
|
||||||
addedSources.addAll(state.directories)
|
addedSources.addAll(state.directories)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun getState(): KotlinImporterComponent.State {
|
override fun getState(): State {
|
||||||
return KotlinImporterComponent.State(addedSources.sorted())
|
return State(addedSources.sorted())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
+1
-1
@@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.jetbrains.kotlin.idea.configuration
|
package org.jetbrains.kotlin.idea.maven
|
||||||
|
|
||||||
import com.intellij.openapi.module.Module
|
import com.intellij.openapi.module.Module
|
||||||
import com.intellij.openapi.project.Project
|
import com.intellij.openapi.project.Project
|
||||||
+2
-1
@@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.jetbrains.kotlin.idea.configuration
|
package org.jetbrains.kotlin.idea.maven
|
||||||
|
|
||||||
import com.intellij.openapi.module.Module
|
import com.intellij.openapi.module.Module
|
||||||
import com.intellij.openapi.roots.ModuleRootManager
|
import com.intellij.openapi.roots.ModuleRootManager
|
||||||
@@ -34,6 +34,7 @@ import org.jetbrains.idea.maven.dom.model.*
|
|||||||
import org.jetbrains.idea.maven.model.MavenId
|
import org.jetbrains.idea.maven.model.MavenId
|
||||||
import org.jetbrains.idea.maven.utils.MavenArtifactScope
|
import org.jetbrains.idea.maven.utils.MavenArtifactScope
|
||||||
import org.jetbrains.jps.model.java.JavaSourceRootType
|
import org.jetbrains.jps.model.java.JavaSourceRootType
|
||||||
|
import org.jetbrains.kotlin.idea.maven.configuration.KotlinMavenConfigurator
|
||||||
import org.jetbrains.kotlin.psi.psiUtil.getChildrenOfType
|
import org.jetbrains.kotlin.psi.psiUtil.getChildrenOfType
|
||||||
import java.util.*
|
import java.util.*
|
||||||
|
|
||||||
+4
-1
@@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.jetbrains.kotlin.idea.configuration
|
package org.jetbrains.kotlin.idea.maven.actions
|
||||||
|
|
||||||
import com.intellij.openapi.editor.Editor
|
import com.intellij.openapi.editor.Editor
|
||||||
import com.intellij.openapi.project.Project
|
import com.intellij.openapi.project.Project
|
||||||
@@ -28,6 +28,9 @@ import org.jetbrains.idea.maven.dom.model.MavenDomDependency
|
|||||||
import org.jetbrains.idea.maven.dom.model.MavenDomPlugin
|
import org.jetbrains.idea.maven.dom.model.MavenDomPlugin
|
||||||
import org.jetbrains.idea.maven.dom.model.MavenDomProjectModel
|
import org.jetbrains.idea.maven.dom.model.MavenDomProjectModel
|
||||||
import org.jetbrains.idea.maven.model.MavenId
|
import org.jetbrains.idea.maven.model.MavenId
|
||||||
|
import org.jetbrains.kotlin.idea.maven.PomFile
|
||||||
|
import org.jetbrains.kotlin.idea.maven.configuration.KotlinJavaMavenConfigurator
|
||||||
|
import org.jetbrains.kotlin.idea.maven.configuration.KotlinMavenConfigurator
|
||||||
import org.jetbrains.kotlin.psi.psiUtil.endOffset
|
import org.jetbrains.kotlin.psi.psiUtil.endOffset
|
||||||
|
|
||||||
class GenerateMavenCompileExecutionAction : PomFileActionBase(KotlinMavenExecutionProvider("compile", PomFile.DefaultPhases.Compile))
|
class GenerateMavenCompileExecutionAction : PomFileActionBase(KotlinMavenExecutionProvider("compile", PomFile.DefaultPhases.Compile))
|
||||||
+2
-1
@@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.jetbrains.kotlin.idea.configuration
|
package org.jetbrains.kotlin.idea.maven.actions
|
||||||
|
|
||||||
import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction
|
import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction
|
||||||
import com.intellij.openapi.editor.Editor
|
import com.intellij.openapi.editor.Editor
|
||||||
@@ -28,6 +28,7 @@ import com.intellij.util.xml.GenericDomValue
|
|||||||
import org.jetbrains.idea.maven.dom.MavenDomUtil
|
import org.jetbrains.idea.maven.dom.MavenDomUtil
|
||||||
import org.jetbrains.idea.maven.dom.model.MavenDomBuild
|
import org.jetbrains.idea.maven.dom.model.MavenDomBuild
|
||||||
import org.jetbrains.idea.maven.dom.model.MavenDomPluginExecution
|
import org.jetbrains.idea.maven.dom.model.MavenDomPluginExecution
|
||||||
|
import org.jetbrains.kotlin.idea.maven.PomFile
|
||||||
import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
|
import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
|
||||||
import org.jetbrains.kotlin.psi.psiUtil.parentsWithSelf
|
import org.jetbrains.kotlin.psi.psiUtil.parentsWithSelf
|
||||||
|
|
||||||
+3
-1
@@ -14,11 +14,13 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.jetbrains.kotlin.idea.configuration;
|
package org.jetbrains.kotlin.idea.maven.configuration;
|
||||||
|
|
||||||
import com.intellij.openapi.module.Module;
|
import com.intellij.openapi.module.Module;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.idea.maven.dom.model.MavenDomPlugin;
|
import org.jetbrains.idea.maven.dom.model.MavenDomPlugin;
|
||||||
|
import org.jetbrains.kotlin.idea.configuration.ConfigureKotlinInProjectUtilsKt;
|
||||||
|
import org.jetbrains.kotlin.idea.maven.PomFile;
|
||||||
import org.jetbrains.kotlin.resolve.TargetPlatform;
|
import org.jetbrains.kotlin.resolve.TargetPlatform;
|
||||||
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
|
import org.jetbrains.kotlin.resolve.jvm.platform.JvmPlatform;
|
||||||
|
|
||||||
+2
-1
@@ -14,11 +14,12 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.jetbrains.kotlin.idea.configuration;
|
package org.jetbrains.kotlin.idea.maven.configuration;
|
||||||
|
|
||||||
import com.intellij.openapi.module.Module;
|
import com.intellij.openapi.module.Module;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jetbrains.idea.maven.dom.model.MavenDomPlugin;
|
import org.jetbrains.idea.maven.dom.model.MavenDomPlugin;
|
||||||
|
import org.jetbrains.kotlin.idea.maven.PomFile;
|
||||||
import org.jetbrains.kotlin.js.resolve.JsPlatform;
|
import org.jetbrains.kotlin.js.resolve.JsPlatform;
|
||||||
import org.jetbrains.kotlin.resolve.TargetPlatform;
|
import org.jetbrains.kotlin.resolve.TargetPlatform;
|
||||||
|
|
||||||
+4
-1
@@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.jetbrains.kotlin.idea.configuration;
|
package org.jetbrains.kotlin.idea.maven.configuration;
|
||||||
|
|
||||||
import com.intellij.codeInsight.CodeInsightUtilCore;
|
import com.intellij.codeInsight.CodeInsightUtilCore;
|
||||||
import com.intellij.ide.actions.OpenFileAction;
|
import com.intellij.ide.actions.OpenFileAction;
|
||||||
@@ -43,7 +43,10 @@ import org.jetbrains.idea.maven.project.MavenProject;
|
|||||||
import org.jetbrains.idea.maven.project.MavenProjectsManager;
|
import org.jetbrains.idea.maven.project.MavenProjectsManager;
|
||||||
import org.jetbrains.idea.maven.utils.MavenArtifactScope;
|
import org.jetbrains.idea.maven.utils.MavenArtifactScope;
|
||||||
import org.jetbrains.kotlin.idea.KotlinPluginUtil;
|
import org.jetbrains.kotlin.idea.KotlinPluginUtil;
|
||||||
|
import org.jetbrains.kotlin.idea.configuration.*;
|
||||||
import org.jetbrains.kotlin.idea.framework.ui.ConfigureDialogWithModulesAndVersion;
|
import org.jetbrains.kotlin.idea.framework.ui.ConfigureDialogWithModulesAndVersion;
|
||||||
|
import org.jetbrains.kotlin.idea.maven.MavenModulesRelationshipKt;
|
||||||
|
import org.jetbrains.kotlin.idea.maven.PomFile;
|
||||||
|
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
+5
-1
@@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.jetbrains.kotlin.idea.configuration
|
package org.jetbrains.kotlin.idea.maven.inspections
|
||||||
|
|
||||||
import com.intellij.codeInspection.LocalQuickFix
|
import com.intellij.codeInspection.LocalQuickFix
|
||||||
import com.intellij.codeInspection.ProblemDescriptor
|
import com.intellij.codeInspection.ProblemDescriptor
|
||||||
@@ -37,6 +37,10 @@ import org.jetbrains.idea.maven.model.MavenPlugin
|
|||||||
import org.jetbrains.idea.maven.project.MavenProjectsManager
|
import org.jetbrains.idea.maven.project.MavenProjectsManager
|
||||||
import org.jetbrains.idea.maven.utils.MavenArtifactScope
|
import org.jetbrains.idea.maven.utils.MavenArtifactScope
|
||||||
import org.jetbrains.kotlin.idea.KotlinFileType
|
import org.jetbrains.kotlin.idea.KotlinFileType
|
||||||
|
import org.jetbrains.kotlin.idea.maven.PomFile
|
||||||
|
import org.jetbrains.kotlin.idea.maven.configuration.KotlinJavaMavenConfigurator
|
||||||
|
import org.jetbrains.kotlin.idea.maven.configuration.KotlinJavascriptMavenConfigurator
|
||||||
|
import org.jetbrains.kotlin.idea.maven.configuration.KotlinMavenConfigurator
|
||||||
import java.util.*
|
import java.util.*
|
||||||
|
|
||||||
class KotlinMavenPluginPhaseInspection : DomElementsInspection<MavenDomProjectModel>(MavenDomProjectModel::class.java) {
|
class KotlinMavenPluginPhaseInspection : DomElementsInspection<MavenDomProjectModel>(MavenDomProjectModel::class.java) {
|
||||||
+3
-2
@@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.jetbrains.kotlin.idea.configuration
|
package org.jetbrains.kotlin.idea.maven.inspections
|
||||||
|
|
||||||
import com.intellij.codeInsight.daemon.HighlightDisplayKey
|
import com.intellij.codeInsight.daemon.HighlightDisplayKey
|
||||||
import com.intellij.codeInsight.daemon.QuickFixActionRegistrar
|
import com.intellij.codeInsight.daemon.QuickFixActionRegistrar
|
||||||
@@ -36,6 +36,7 @@ import org.jetbrains.idea.maven.indices.MavenArtifactSearchDialog
|
|||||||
import org.jetbrains.idea.maven.project.MavenProjectsManager
|
import org.jetbrains.idea.maven.project.MavenProjectsManager
|
||||||
import org.jetbrains.idea.maven.utils.MavenArtifactScope
|
import org.jetbrains.idea.maven.utils.MavenArtifactScope
|
||||||
import org.jetbrains.kotlin.diagnostics.Diagnostic
|
import org.jetbrains.kotlin.diagnostics.Diagnostic
|
||||||
|
import org.jetbrains.kotlin.idea.maven.PomFile
|
||||||
import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil
|
import org.jetbrains.kotlin.idea.core.quickfix.QuickFixUtil
|
||||||
import org.jetbrains.kotlin.idea.quickfix.IntentionActionPriority
|
import org.jetbrains.kotlin.idea.quickfix.IntentionActionPriority
|
||||||
import org.jetbrains.kotlin.idea.quickfix.KotlinIntentionActionFactoryWithDelegate
|
import org.jetbrains.kotlin.idea.quickfix.KotlinIntentionActionFactoryWithDelegate
|
||||||
@@ -128,7 +129,7 @@ object PlatformUnresolvedProvider : KotlinIntentionActionFactoryWithDelegate<KtN
|
|||||||
originalElementPointer.element?.references?.filterIsInstance<KtSimpleNameReference>()?.firstOrNull()?.let { reference ->
|
originalElementPointer.element?.references?.filterIsInstance<KtSimpleNameReference>()?.firstOrNull()?.let { reference ->
|
||||||
UnresolvedReferenceQuickFixProvider.registerReferenceFixes(reference, object: QuickFixActionRegistrar {
|
UnresolvedReferenceQuickFixProvider.registerReferenceFixes(reference, object: QuickFixActionRegistrar {
|
||||||
override fun register(action: IntentionAction) {
|
override fun register(action: IntentionAction) {
|
||||||
result.add(QuickFixWithDelegateFactory(IntentionActionPriority.LOW) { action } )
|
result.add(QuickFixWithDelegateFactory(IntentionActionPriority.LOW) { action })
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun register(fixRange: TextRange, action: IntentionAction, key: HighlightDisplayKey?) {
|
override fun register(fixRange: TextRange, action: IntentionAction, key: HighlightDisplayKey?) {
|
||||||
+3
-1
@@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.jetbrains.kotlin.idea.configuration
|
package org.jetbrains.kotlin.idea.maven.inspections
|
||||||
|
|
||||||
import com.intellij.codeInspection.LocalQuickFix
|
import com.intellij.codeInspection.LocalQuickFix
|
||||||
import com.intellij.codeInspection.ProblemDescriptor
|
import com.intellij.codeInspection.ProblemDescriptor
|
||||||
@@ -26,6 +26,8 @@ import com.intellij.util.xml.highlighting.DomElementsInspection
|
|||||||
import org.jetbrains.idea.maven.dom.model.MavenDomDependency
|
import org.jetbrains.idea.maven.dom.model.MavenDomDependency
|
||||||
import org.jetbrains.idea.maven.dom.model.MavenDomProjectModel
|
import org.jetbrains.idea.maven.dom.model.MavenDomProjectModel
|
||||||
import org.jetbrains.idea.maven.project.MavenProjectsManager
|
import org.jetbrains.idea.maven.project.MavenProjectsManager
|
||||||
|
import org.jetbrains.kotlin.idea.maven.configuration.KotlinJavaMavenConfigurator
|
||||||
|
import org.jetbrains.kotlin.idea.maven.configuration.KotlinMavenConfigurator
|
||||||
|
|
||||||
class KotlinTestJUnitInspection : DomElementsInspection<MavenDomProjectModel>(MavenDomProjectModel::class.java) {
|
class KotlinTestJUnitInspection : DomElementsInspection<MavenDomProjectModel>(MavenDomProjectModel::class.java) {
|
||||||
override fun checkFileElement(domFileElement: DomFileElement<MavenDomProjectModel>?, holder: DomElementAnnotationHolder?) {
|
override fun checkFileElement(domFileElement: DomFileElement<MavenDomProjectModel>?, holder: DomElementAnnotationHolder?) {
|
||||||
+1
-1
@@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.jetbrains.kotlin.idea.configuration
|
package org.jetbrains.kotlin.idea.maven.inspections
|
||||||
|
|
||||||
import com.intellij.lang.annotation.HighlightSeverity
|
import com.intellij.lang.annotation.HighlightSeverity
|
||||||
import com.intellij.util.xml.DomFileElement
|
import com.intellij.util.xml.DomFileElement
|
||||||
+4
-1
@@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.jetbrains.kotlin.idea.configuration
|
package org.jetbrains.kotlin.idea.maven.inspections
|
||||||
|
|
||||||
import com.intellij.lang.annotation.HighlightSeverity
|
import com.intellij.lang.annotation.HighlightSeverity
|
||||||
import com.intellij.util.xml.DomFileElement
|
import com.intellij.util.xml.DomFileElement
|
||||||
@@ -23,6 +23,9 @@ import com.intellij.util.xml.highlighting.DomElementsInspection
|
|||||||
import org.jetbrains.idea.maven.dom.model.MavenDomProjectModel
|
import org.jetbrains.idea.maven.dom.model.MavenDomProjectModel
|
||||||
import org.jetbrains.idea.maven.model.MavenId
|
import org.jetbrains.idea.maven.model.MavenId
|
||||||
import org.jetbrains.idea.maven.project.MavenProjectsManager
|
import org.jetbrains.idea.maven.project.MavenProjectsManager
|
||||||
|
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 SameVersionInspection : DomElementsInspection<MavenDomProjectModel>(MavenDomProjectModel::class.java) {
|
||||||
override fun checkFileElement(domFileElement: DomFileElement<MavenDomProjectModel>?, holder: DomElementAnnotationHolder?) {
|
override fun checkFileElement(domFileElement: DomFileElement<MavenDomProjectModel>?, holder: DomElementAnnotationHolder?) {
|
||||||
+1
-1
@@ -35,7 +35,7 @@ import com.intellij.testFramework.InspectionTestUtil
|
|||||||
import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl
|
import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl
|
||||||
import com.intellij.util.indexing.FileBasedIndex
|
import com.intellij.util.indexing.FileBasedIndex
|
||||||
import org.jetbrains.jps.model.java.JavaSourceRootType
|
import org.jetbrains.jps.model.java.JavaSourceRootType
|
||||||
import org.jetbrains.kotlin.idea.configuration.KotlinMavenPluginPhaseInspection
|
import org.jetbrains.kotlin.idea.maven.inspections.KotlinMavenPluginPhaseInspection
|
||||||
import org.jetbrains.kotlin.idea.refactoring.toPsiDirectory
|
import org.jetbrains.kotlin.idea.refactoring.toPsiDirectory
|
||||||
import org.jetbrains.kotlin.idea.util.projectStructure.allModules
|
import org.jetbrains.kotlin.idea.util.projectStructure.allModules
|
||||||
import java.io.File
|
import java.io.File
|
||||||
|
|||||||
+2
-1
@@ -14,10 +14,11 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.jetbrains.kotlin.idea.configuration
|
package org.jetbrains.kotlin.idea.maven
|
||||||
|
|
||||||
import com.google.gson.JsonParser
|
import com.google.gson.JsonParser
|
||||||
import org.jetbrains.idea.maven.model.MavenArchetype
|
import org.jetbrains.idea.maven.model.MavenArchetype
|
||||||
|
import org.jetbrains.kotlin.idea.maven.KotlinMavenArchetypesProvider
|
||||||
import org.junit.Test
|
import org.junit.Test
|
||||||
|
|
||||||
import org.junit.Assert.*
|
import org.junit.Assert.*
|
||||||
@@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
package org.jetbrains.kotlin.idea.maven
|
package org.jetbrains.kotlin.idea.maven
|
||||||
|
|
||||||
import org.jetbrains.kotlin.idea.configuration.KotlinImporterComponent
|
|
||||||
import java.io.File
|
import java.io.File
|
||||||
|
|
||||||
class KotlinMavenImporterTest : MavenImportingTestCase() {
|
class KotlinMavenImporterTest : MavenImportingTestCase() {
|
||||||
|
|||||||
+6
-1
@@ -14,11 +14,16 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.jetbrains.kotlin.idea.configuration
|
package org.jetbrains.kotlin.idea.maven.configuration
|
||||||
|
|
||||||
import com.intellij.openapi.module.Module
|
import com.intellij.openapi.module.Module
|
||||||
import com.intellij.psi.PsiFile
|
import com.intellij.psi.PsiFile
|
||||||
import org.jetbrains.idea.maven.model.MavenConstants
|
import org.jetbrains.idea.maven.model.MavenConstants
|
||||||
|
import org.jetbrains.kotlin.idea.configuration.AbstractConfigureProjectByChangingFileTest
|
||||||
|
import org.jetbrains.kotlin.idea.configuration.NotificationMessageCollector
|
||||||
|
import org.jetbrains.kotlin.idea.maven.configuration.KotlinJavaMavenConfigurator
|
||||||
|
import org.jetbrains.kotlin.idea.maven.configuration.KotlinJavascriptMavenConfigurator
|
||||||
|
import org.jetbrains.kotlin.idea.maven.configuration.KotlinMavenConfigurator
|
||||||
|
|
||||||
abstract class AbstractMavenConfigureProjectByChangingFileTest : AbstractConfigureProjectByChangingFileTest<KotlinMavenConfigurator>() {
|
abstract class AbstractMavenConfigureProjectByChangingFileTest : AbstractConfigureProjectByChangingFileTest<KotlinMavenConfigurator>() {
|
||||||
fun doTestWithMaven(path: String) {
|
fun doTestWithMaven(path: String) {
|
||||||
+1
-1
@@ -14,7 +14,7 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.jetbrains.kotlin.idea.configuration;
|
package org.jetbrains.kotlin.idea.maven.configuration;
|
||||||
|
|
||||||
import com.intellij.testFramework.TestDataPath;
|
import com.intellij.testFramework.TestDataPath;
|
||||||
import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
|
import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
|
||||||
@@ -31,5 +31,5 @@
|
|||||||
</build>
|
</build>
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
<!-- inspection: org.jetbrains.kotlin.idea.configuration.SameVersionIDEPluginInspection -->
|
<!-- inspection: org.jetbrains.kotlin.idea.maven.inspections.SameVersionIDEPluginInspection -->
|
||||||
<!-- problem: on ${kotlin.version}, title You use different IDE and Maven plugins' versions so you code's behaviour may be different -->
|
<!-- problem: on ${kotlin.version}, title You use different IDE and Maven plugins' versions so you code's behaviour may be different -->
|
||||||
@@ -53,5 +53,5 @@
|
|||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
<!-- inspection: org.jetbrains.kotlin.idea.configuration.KotlinTestJUnitInspection -->
|
<!-- inspection: org.jetbrains.kotlin.idea.maven.inspections.KotlinTestJUnitInspection -->
|
||||||
<!-- problem: on kotlin-test, title kotlin-test-junit is better with junit -->
|
<!-- problem: on kotlin-test, title kotlin-test-junit is better with junit -->
|
||||||
|
|||||||
@@ -53,5 +53,5 @@
|
|||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
<!-- inspection: org.jetbrains.kotlin.idea.configuration.KotlinTestJUnitInspection -->
|
<!-- inspection: org.jetbrains.kotlin.idea.maven.inspections.KotlinTestJUnitInspection -->
|
||||||
<!-- problem: on kotlin-test, title kotlin-test-junit is better with junit -->
|
<!-- problem: on kotlin-test, title kotlin-test-junit is better with junit -->
|
||||||
|
|||||||
@@ -32,6 +32,6 @@
|
|||||||
</build>
|
</build>
|
||||||
</project>
|
</project>
|
||||||
|
|
||||||
<!-- inspection: org.jetbrains.kotlin.idea.configuration.SameVersionInspection -->
|
<!-- inspection: org.jetbrains.kotlin.idea.maven.inspections.SameVersionInspection -->
|
||||||
<!-- 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.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) -->
|
<!-- problem: on ${kotlin.version.2}, title Plugin version (1.0.1) is not the same as library version (1.0.1-2) -->
|
||||||
+11
-11
@@ -1,10 +1,10 @@
|
|||||||
<idea-plugin>
|
<idea-plugin>
|
||||||
<extensions defaultExtensionNs="org.jetbrains.kotlin">
|
<extensions defaultExtensionNs="org.jetbrains.kotlin">
|
||||||
<projectConfigurator implementation="org.jetbrains.kotlin.idea.configuration.KotlinJavaMavenConfigurator"/>
|
<projectConfigurator implementation="org.jetbrains.kotlin.idea.maven.configuration.KotlinJavaMavenConfigurator"/>
|
||||||
<projectConfigurator implementation="org.jetbrains.kotlin.idea.configuration.KotlinJavascriptMavenConfigurator"/>
|
<projectConfigurator implementation="org.jetbrains.kotlin.idea.maven.configuration.KotlinJavascriptMavenConfigurator"/>
|
||||||
</extensions>
|
</extensions>
|
||||||
<extensions defaultExtensionNs="org.jetbrains.idea.maven">
|
<extensions defaultExtensionNs="org.jetbrains.idea.maven">
|
||||||
<importer implementation="org.jetbrains.kotlin.idea.configuration.KotlinMavenImporter" />
|
<importer implementation="org.jetbrains.kotlin.idea.maven.KotlinMavenImporter" />
|
||||||
<archetypesProvider implementation="org.jetbrains.kotlin.idea.configuration.KotlinMavenArchetypesProvider" />
|
<archetypesProvider implementation="org.jetbrains.kotlin.idea.configuration.KotlinMavenArchetypesProvider" />
|
||||||
|
|
||||||
<pluginDescriptor mavenId="org.jetbrains.kotlin:kotlin-maven-plugin">
|
<pluginDescriptor mavenId="org.jetbrains.kotlin:kotlin-maven-plugin">
|
||||||
@@ -33,7 +33,7 @@
|
|||||||
hasStaticDescription="true"
|
hasStaticDescription="true"
|
||||||
level="WARNING" />
|
level="WARNING" />
|
||||||
|
|
||||||
<localInspection implementationClass="org.jetbrains.kotlin.idea.configuration.SameVersionInspection"
|
<localInspection implementationClass="org.jetbrains.kotlin.idea.maven.inspections.SameVersionInspection"
|
||||||
displayName="Kotlin Maven: library and plugin inspection"
|
displayName="Kotlin Maven: library and plugin inspection"
|
||||||
groupName="Kotlin"
|
groupName="Kotlin"
|
||||||
enabledByDefault="true"
|
enabledByDefault="true"
|
||||||
@@ -50,20 +50,20 @@
|
|||||||
level="WARNING" />
|
level="WARNING" />
|
||||||
|
|
||||||
<intentionAction>
|
<intentionAction>
|
||||||
<className>org.jetbrains.kotlin.idea.configuration.MavenPluginSourcesMoveToBuild</className>
|
<className>org.jetbrains.kotlin.idea.maven.actions.MavenPluginSourcesMoveToBuild</className>
|
||||||
<category>Kotlin</category>
|
<category>Kotlin</category>
|
||||||
</intentionAction>
|
</intentionAction>
|
||||||
<intentionAction>
|
<intentionAction>
|
||||||
<className>org.jetbrains.kotlin.idea.configuration.MavenPluginSourcesMoveToExecutionIntention</className>
|
<className>org.jetbrains.kotlin.idea.maven.actions.MavenPluginSourcesMoveToExecutionIntention</className>
|
||||||
<category>Kotlin</category>
|
<category>Kotlin</category>
|
||||||
</intentionAction>
|
</intentionAction>
|
||||||
<codeInsight.unresolvedReferenceQuickFixProvider
|
<codeInsight.unresolvedReferenceQuickFixProvider
|
||||||
implementation="org.jetbrains.kotlin.idea.configuration.KotlinMavenUnresolvedReferenceQuickFixProvider" />
|
implementation="org.jetbrains.kotlin.idea.maven.inspections.KotlinMavenUnresolvedReferenceQuickFixProvider" />
|
||||||
</extensions>
|
</extensions>
|
||||||
|
|
||||||
<module-components>
|
<module-components>
|
||||||
<component>
|
<component>
|
||||||
<implementation-class>org.jetbrains.kotlin.idea.configuration.KotlinImporterComponent</implementation-class>
|
<implementation-class>org.jetbrains.kotlin.idea.maven.KotlinImporterComponent</implementation-class>
|
||||||
</component>
|
</component>
|
||||||
</module-components>
|
</module-components>
|
||||||
|
|
||||||
@@ -73,17 +73,17 @@
|
|||||||
|
|
||||||
<action id="KotlinGenerateMavenCompileExecutionAction"
|
<action id="KotlinGenerateMavenCompileExecutionAction"
|
||||||
icon="/org/jetbrains/kotlin/idea/icons/kotlin13.png"
|
icon="/org/jetbrains/kotlin/idea/icons/kotlin13.png"
|
||||||
class="org.jetbrains.kotlin.idea.configuration.GenerateMavenCompileExecutionAction"
|
class="org.jetbrains.kotlin.idea.maven.actions.GenerateMavenCompileExecutionAction"
|
||||||
text="Kotlin compile execution" />
|
text="Kotlin compile execution" />
|
||||||
|
|
||||||
<action id="KotlinGenerateMavenTestCompileExecutionAction"
|
<action id="KotlinGenerateMavenTestCompileExecutionAction"
|
||||||
icon="/org/jetbrains/kotlin/idea/icons/kotlin13.png"
|
icon="/org/jetbrains/kotlin/idea/icons/kotlin13.png"
|
||||||
class="org.jetbrains.kotlin.idea.configuration.GenerateMavenTestCompileExecutionAction"
|
class="org.jetbrains.kotlin.idea.maven.actions.GenerateMavenTestCompileExecutionAction"
|
||||||
text="Kotlin test-compile execution" />
|
text="Kotlin test-compile execution" />
|
||||||
|
|
||||||
<action id="KotlinGenerateMavenPluginAction"
|
<action id="KotlinGenerateMavenPluginAction"
|
||||||
icon="/org/jetbrains/kotlin/idea/icons/kotlin13.png"
|
icon="/org/jetbrains/kotlin/idea/icons/kotlin13.png"
|
||||||
class="org.jetbrains.kotlin.idea.configuration.GenerateMavenPluginAction"
|
class="org.jetbrains.kotlin.idea.maven.actions.GenerateMavenPluginAction"
|
||||||
text="Kotlin plugin" />
|
text="Kotlin plugin" />
|
||||||
|
|
||||||
<add-to-group group-id="GenerateGroup" anchor="last" />
|
<add-to-group group-id="GenerateGroup" anchor="last" />
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.quickfix
|
|||||||
import com.intellij.codeInsight.intention.IntentionAction
|
import com.intellij.codeInsight.intention.IntentionAction
|
||||||
import org.jetbrains.kotlin.diagnostics.DiagnosticFactory
|
import org.jetbrains.kotlin.diagnostics.DiagnosticFactory
|
||||||
import org.jetbrains.kotlin.diagnostics.Errors.*
|
import org.jetbrains.kotlin.diagnostics.Errors.*
|
||||||
import org.jetbrains.kotlin.idea.configuration.PlatformUnresolvedProvider
|
import org.jetbrains.kotlin.idea.maven.inspections.PlatformUnresolvedProvider
|
||||||
import org.jetbrains.kotlin.idea.core.overrideImplement.ImplementAsConstructorParameter
|
import org.jetbrains.kotlin.idea.core.overrideImplement.ImplementAsConstructorParameter
|
||||||
import org.jetbrains.kotlin.idea.core.overrideImplement.ImplementMembersHandler
|
import org.jetbrains.kotlin.idea.core.overrideImplement.ImplementMembersHandler
|
||||||
import org.jetbrains.kotlin.idea.inspections.AddModifierFixFactory
|
import org.jetbrains.kotlin.idea.inspections.AddModifierFixFactory
|
||||||
|
|||||||
Reference in New Issue
Block a user