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

Maven: reorganize code: move classes across packages

Browse Source
This commit is contained in:
Sergey Mashkov
2016-04-04 15:21:32 +03:00
parent eb789304b6
commit 78d0f83f71
26 changed files with 66 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt
+1 -1
View File
@@ -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.weighers.AbstractBasicCompletionWeigherTest
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.coverage.AbstractKotlinCoverageOutputFilesTest
import org.jetbrains.kotlin.idea.debugger.AbstractBeforeExtractFunctionInsertionTest
idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/KotlinMavenArchetypesProvider.kt → idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenArchetypesProvider.kt
+1 -1
View File
@@ -14,7 +14,7 @@
* 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.JsonParser
idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/KotlinMavenImporter.kt → idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenImporter.kt
+4 -4
View File
@@ -14,7 +14,7 @@
* 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.externalSystem.service.project.IdeModifiableModelsProvider
@@ -148,15 +148,15 @@ class KotlinImporterComponent : PersistentStateComponent<KotlinImporterComponent
val addedSources = Collections.synchronizedSet(HashSet<String>())
override fun loadState(state: KotlinImporterComponent.State?) {
override fun loadState(state: State?) {
addedSources.clear()
if (state != null) {
addedSources.addAll(state.directories)
}
}
override fun getState(): KotlinImporterComponent.State {
return KotlinImporterComponent.State(addedSources.sorted())
override fun getState(): State {
return State(addedSources.sorted())
}
}
idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/MavenModulesRelationship.kt → idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/MavenModulesRelationship.kt
+1 -1
View File
@@ -14,7 +14,7 @@
* 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.project.Project
idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/PomFile.kt → idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/PomFile.kt
+2 -1
View File
@@ -14,7 +14,7 @@
* 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.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.utils.MavenArtifactScope
import org.jetbrains.jps.model.java.JavaSourceRootType
import org.jetbrains.kotlin.idea.maven.configuration.KotlinMavenConfigurator
import org.jetbrains.kotlin.psi.psiUtil.getChildrenOfType
import java.util.*
idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/MavenActionsGroup.kt → idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/actions/MavenActionsGroup.kt
+4 -1
View File
@@ -14,7 +14,7 @@
* 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.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.MavenDomProjectModel
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
class GenerateMavenCompileExecutionAction : PomFileActionBase(KotlinMavenExecutionProvider("compile", PomFile.DefaultPhases.Compile))
idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/MavenPluginSourcesSwap.kt → idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/actions/MavenPluginSourcesSwap.kt
+2 -1
View File
@@ -14,7 +14,7 @@
* 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.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.model.MavenDomBuild
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.parentsWithSelf
idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaMavenConfigurator.java → idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/configuration/KotlinJavaMavenConfigurator.java
+3 -1
View File
@@ -14,11 +14,13 @@
* limitations under the License.
*/
package org.jetbrains.kotlin.idea.configuration;
package org.jetbrains.kotlin.idea.maven.configuration;
import com.intellij.openapi.module.Module;
import org.jetbrains.annotations.NotNull;
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.jvm.platform.JvmPlatform;
idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/KotlinJavascriptMavenConfigurator.java → idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/configuration/KotlinJavascriptMavenConfigurator.java
+2 -1
View File
@@ -14,11 +14,12 @@
* limitations under the License.
*/
package org.jetbrains.kotlin.idea.configuration;
package org.jetbrains.kotlin.idea.maven.configuration;
import com.intellij.openapi.module.Module;
import org.jetbrains.annotations.NotNull;
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.resolve.TargetPlatform;
idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/KotlinMavenConfigurator.java → idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/configuration/KotlinMavenConfigurator.java
+4 -1
View File
@@ -14,7 +14,7 @@
* 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.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.utils.MavenArtifactScope;
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.maven.MavenModulesRelationshipKt;
import org.jetbrains.kotlin.idea.maven.PomFile;
import java.util.Collection;
import java.util.Collections;
idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/KotlinMavenPluginPhaseInspection.kt → idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/inspections/KotlinMavenPluginPhaseInspection.kt
+5 -1
View File
@@ -14,7 +14,7 @@
* 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.ProblemDescriptor
@@ -37,6 +37,10 @@ import org.jetbrains.idea.maven.model.MavenPlugin
import org.jetbrains.idea.maven.project.MavenProjectsManager
import org.jetbrains.idea.maven.utils.MavenArtifactScope
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.*
class KotlinMavenPluginPhaseInspection : DomElementsInspection<MavenDomProjectModel>(MavenDomProjectModel::class.java) {
idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/KotlinMavenUnresolvedReferenceQuickFixProvider.kt → idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/inspections/KotlinMavenUnresolvedReferenceQuickFixProvider.kt
+3 -2
View File
@@ -14,7 +14,7 @@
* 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.QuickFixActionRegistrar
@@ -36,6 +36,7 @@ import org.jetbrains.idea.maven.indices.MavenArtifactSearchDialog
import org.jetbrains.idea.maven.project.MavenProjectsManager
import org.jetbrains.idea.maven.utils.MavenArtifactScope
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.quickfix.IntentionActionPriority
import org.jetbrains.kotlin.idea.quickfix.KotlinIntentionActionFactoryWithDelegate
@@ -128,7 +129,7 @@ object PlatformUnresolvedProvider : KotlinIntentionActionFactoryWithDelegate<KtN
originalElementPointer.element?.references?.filterIsInstance<KtSimpleNameReference>()?.firstOrNull()?.let { reference ->
UnresolvedReferenceQuickFixProvider.registerReferenceFixes(reference, object: QuickFixActionRegistrar {
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?) {
idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/KotlinTestJUnitInspection.kt → idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/inspections/KotlinTestJUnitInspection.kt
+3 -1
View File
@@ -14,7 +14,7 @@
* 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.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.MavenDomProjectModel
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) {
override fun checkFileElement(domFileElement: DomFileElement<MavenDomProjectModel>?, holder: DomElementAnnotationHolder?) {
idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/SameVersionIDEPluginInspection.kt → idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/inspections/SameVersionIDEPluginInspection.kt
+1 -1
View File
@@ -14,7 +14,7 @@
* 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.util.xml.DomFileElement
idea/idea-maven/src/org/jetbrains/kotlin/idea/configuration/SameVersionInspection.kt → idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/inspections/SameVersionInspection.kt
+4 -1
View File
@@ -14,7 +14,7 @@
* 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.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.model.MavenId
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) {
override fun checkFileElement(domFileElement: DomFileElement<MavenDomProjectModel>?, holder: DomElementAnnotationHolder?) {
idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/AbstractKotlinMavenInspectionTest.kt
+1 -1
View File
@@ -35,7 +35,7 @@ import com.intellij.testFramework.InspectionTestUtil
import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl
import com.intellij.util.indexing.FileBasedIndex
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.util.projectStructure.allModules
import java.io.File
idea/idea-maven/test/org/jetbrains/kotlin/idea/configuration/KotlinMavenArchetypesProviderTest.kt → idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenArchetypesProviderTest.kt
+2 -1
View File
@@ -14,10 +14,11 @@
* limitations under the License.
*/
package org.jetbrains.kotlin.idea.configuration
package org.jetbrains.kotlin.idea.maven
import com.google.gson.JsonParser
import org.jetbrains.idea.maven.model.MavenArchetype
import org.jetbrains.kotlin.idea.maven.KotlinMavenArchetypesProvider
import org.junit.Test
import org.junit.Assert.*
idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/KotlinMavenImporterTest.kt
-1
View File
@@ -16,7 +16,6 @@
package org.jetbrains.kotlin.idea.maven
import org.jetbrains.kotlin.idea.configuration.KotlinImporterComponent
import java.io.File
class KotlinMavenImporterTest : MavenImportingTestCase() {
idea/idea-maven/test/org/jetbrains/kotlin/idea/configuration/AbstractMavenConfigureProjectByChangingFileTest.kt → idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/configuration/AbstractMavenConfigureProjectByChangingFileTest.kt
+6 -1
View File
@@ -14,11 +14,16 @@
* 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.psi.PsiFile
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>() {
fun doTestWithMaven(path: String) {
idea/idea-maven/test/org/jetbrains/kotlin/idea/configuration/MavenConfigureProjectByChangingFileTestGenerated.java → idea/idea-maven/test/org/jetbrains/kotlin/idea/maven/configuration/MavenConfigureProjectByChangingFileTestGenerated.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.kotlin.idea.configuration;
package org.jetbrains.kotlin.idea.maven.configuration;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.JUnit3RunnerWithInners;
idea/idea-maven/testData/maven-inspections/ideAndMavenVersions.xml
Vendored
+1 -1
View File
@@ -31,5 +31,5 @@
</build>
</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 -->
idea/idea-maven/testData/maven-inspections/kotlinTestWithJunit.fixed.1.xml
Vendored
+1 -1
View File
@@ -53,5 +53,5 @@
</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 -->
idea/idea-maven/testData/maven-inspections/kotlinTestWithJunit.xml
Vendored
+1 -1
View File
@@ -53,5 +53,5 @@
</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 -->
idea/idea-maven/testData/maven-inspections/sameVersionPluginLibrary.xml
Vendored
+1 -1
View File
@@ -32,6 +32,6 @@
</build>
</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.2}, title Plugin version (1.0.1) is not the same as library version (1.0.1-2) -->
idea/src/META-INF/maven.xml
+11 -11
View File
@@ -1,10 +1,10 @@
<idea-plugin>
<extensions defaultExtensionNs="org.jetbrains.kotlin">
<projectConfigurator implementation="org.jetbrains.kotlin.idea.configuration.KotlinJavaMavenConfigurator"/>
<projectConfigurator implementation="org.jetbrains.kotlin.idea.configuration.KotlinJavascriptMavenConfigurator"/>
<projectConfigurator implementation="org.jetbrains.kotlin.idea.maven.configuration.KotlinJavaMavenConfigurator"/>
<projectConfigurator implementation="org.jetbrains.kotlin.idea.maven.configuration.KotlinJavascriptMavenConfigurator"/>
</extensions>
<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" />
<pluginDescriptor mavenId="org.jetbrains.kotlin:kotlin-maven-plugin">
@@ -33,7 +33,7 @@
hasStaticDescription="true"
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"
groupName="Kotlin"
enabledByDefault="true"
@@ -50,20 +50,20 @@
level="WARNING" />
<intentionAction>
<className>org.jetbrains.kotlin.idea.configuration.MavenPluginSourcesMoveToBuild</className>
<className>org.jetbrains.kotlin.idea.maven.actions.MavenPluginSourcesMoveToBuild</className>
<category>Kotlin</category>
</intentionAction>
<intentionAction>
<className>org.jetbrains.kotlin.idea.configuration.MavenPluginSourcesMoveToExecutionIntention</className>
<className>org.jetbrains.kotlin.idea.maven.actions.MavenPluginSourcesMoveToExecutionIntention</className>
<category>Kotlin</category>
</intentionAction>
<codeInsight.unresolvedReferenceQuickFixProvider
implementation="org.jetbrains.kotlin.idea.configuration.KotlinMavenUnresolvedReferenceQuickFixProvider" />
implementation="org.jetbrains.kotlin.idea.maven.inspections.KotlinMavenUnresolvedReferenceQuickFixProvider" />
</extensions>
<module-components>
<component>
<implementation-class>org.jetbrains.kotlin.idea.configuration.KotlinImporterComponent</implementation-class>
<implementation-class>org.jetbrains.kotlin.idea.maven.KotlinImporterComponent</implementation-class>
</component>
</module-components>
@@ -73,17 +73,17 @@
<action id="KotlinGenerateMavenCompileExecutionAction"
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" />
<action id="KotlinGenerateMavenTestCompileExecutionAction"
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" />
<action id="KotlinGenerateMavenPluginAction"
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" />
<add-to-group group-id="GenerateGroup" anchor="last" />
idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt
+1 -1
View File
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.idea.quickfix
import com.intellij.codeInsight.intention.IntentionAction
import org.jetbrains.kotlin.diagnostics.DiagnosticFactory
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.ImplementMembersHandler
import org.jetbrains.kotlin.idea.inspections.AddModifierFixFactory