From 8cf983974f2762789c7c89603353f95c80dac1d1 Mon Sep 17 00:00:00 2001
From: Phodal Huang <h@phodal.com>
Date: Tue, 18 Jul 2023 11:45:05 +0800
Subject: [PATCH] fix: remove some librs to idea only #7

---
 build.gradle.kts                                   |  4 ++++
 .../contributor/AutoDevFeatureMarkerContributor.kt |  2 +-
 .../contributor/CodeCommentsMarkerContributor.kt   |  4 ++--
 .../idea}/contributor/FindBugMarkerContributor.kt  |  4 ++--
 idea/src/main/resources/cc.unitmesh.idea.xml       | 14 +++++++++++++-
 .../cc/unitmesh/devti/context/DtAnalysisModel.kt   |  1 +
 .../intentions/editor/AbstractChatIntention.kt     |  2 +-
 src/main/resources/META-INF/autodev-core.xml       |  8 --------
 8 files changed, 24 insertions(+), 15 deletions(-)
 rename {src/main/kotlin/cc/unitmesh/devti/language => idea/src/main/kotlin/cc/unitmesh/ide/idea}/contributor/AutoDevFeatureMarkerContributor.kt (95%)
 rename {src/main/kotlin/cc/unitmesh/devti/language => idea/src/main/kotlin/cc/unitmesh/ide/idea}/contributor/CodeCommentsMarkerContributor.kt (87%)
 rename {src/main/kotlin/cc/unitmesh/devti/language => idea/src/main/kotlin/cc/unitmesh/ide/idea}/contributor/FindBugMarkerContributor.kt (90%)

diff --git a/build.gradle.kts b/build.gradle.kts
index c24455bf44..bc7885166c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -282,6 +282,10 @@ project(":plugin") {
 }
 
 project(":") {
+    intellij {
+        version.set(ideaVersion)
+        plugins.set(ideaPlugins)
+    }
     dependencies {
         implementation(libs.github.api)
         implementation(libs.dotenv)
diff --git a/src/main/kotlin/cc/unitmesh/devti/language/contributor/AutoDevFeatureMarkerContributor.kt b/idea/src/main/kotlin/cc/unitmesh/ide/idea/contributor/AutoDevFeatureMarkerContributor.kt
similarity index 95%
rename from src/main/kotlin/cc/unitmesh/devti/language/contributor/AutoDevFeatureMarkerContributor.kt
rename to idea/src/main/kotlin/cc/unitmesh/ide/idea/contributor/AutoDevFeatureMarkerContributor.kt
index 39f9c3fc0d..ee60da6b45 100644
--- a/src/main/kotlin/cc/unitmesh/devti/language/contributor/AutoDevFeatureMarkerContributor.kt
+++ b/idea/src/main/kotlin/cc/unitmesh/ide/idea/contributor/AutoDevFeatureMarkerContributor.kt
@@ -1,4 +1,4 @@
-package cc.unitmesh.devti.language.contributor
+package cc.unitmesh.ide.idea.contributor
 
 import cc.unitmesh.devti.AutoDevIcons
 import cc.unitmesh.devti.language.DevtiAnnotator
diff --git a/src/main/kotlin/cc/unitmesh/devti/language/contributor/CodeCommentsMarkerContributor.kt b/idea/src/main/kotlin/cc/unitmesh/ide/idea/contributor/CodeCommentsMarkerContributor.kt
similarity index 87%
rename from src/main/kotlin/cc/unitmesh/devti/language/contributor/CodeCommentsMarkerContributor.kt
rename to idea/src/main/kotlin/cc/unitmesh/ide/idea/contributor/CodeCommentsMarkerContributor.kt
index 40e48babf2..384f1ed138 100644
--- a/src/main/kotlin/cc/unitmesh/devti/language/contributor/CodeCommentsMarkerContributor.kt
+++ b/idea/src/main/kotlin/cc/unitmesh/ide/idea/contributor/CodeCommentsMarkerContributor.kt
@@ -1,7 +1,7 @@
-package cc.unitmesh.devti.language.contributor
+package cc.unitmesh.ide.idea.contributor
 
 import cc.unitmesh.devti.AutoDevIcons
-import cc.unitmesh.devti.actions.AutoCommentAction
+import cc.unitmesh.ide.idea.action.AutoCommentAction
 import com.intellij.execution.lineMarker.RunLineMarkerContributor
 import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiIdentifier
diff --git a/src/main/kotlin/cc/unitmesh/devti/language/contributor/FindBugMarkerContributor.kt b/idea/src/main/kotlin/cc/unitmesh/ide/idea/contributor/FindBugMarkerContributor.kt
similarity index 90%
rename from src/main/kotlin/cc/unitmesh/devti/language/contributor/FindBugMarkerContributor.kt
rename to idea/src/main/kotlin/cc/unitmesh/ide/idea/contributor/FindBugMarkerContributor.kt
index 368c5c6139..ed1eafa079 100644
--- a/src/main/kotlin/cc/unitmesh/devti/language/contributor/FindBugMarkerContributor.kt
+++ b/idea/src/main/kotlin/cc/unitmesh/ide/idea/contributor/FindBugMarkerContributor.kt
@@ -1,8 +1,8 @@
-package cc.unitmesh.devti.language.contributor
+package cc.unitmesh.ide.idea.contributor
 
 import cc.unitmesh.devti.AutoDevIcons
-import cc.unitmesh.devti.actions.FindBugAction
 import cc.unitmesh.devti.runconfig.AutoDevRunProfileState
+import cc.unitmesh.ide.idea.action.FindBugAction
 import com.intellij.execution.lineMarker.RunLineMarkerContributor
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.diagnostic.logger
diff --git a/idea/src/main/resources/cc.unitmesh.idea.xml b/idea/src/main/resources/cc.unitmesh.idea.xml
index 0ce29ea8d4..272be6d8fe 100644
--- a/idea/src/main/resources/cc.unitmesh.idea.xml
+++ b/idea/src/main/resources/cc.unitmesh.idea.xml
@@ -14,6 +14,18 @@
         <variableContextBuilder language="JAVA"
                                 implementationClass="cc.unitmesh.ide.idea.context.JavaVariableContextBuilder"/>
         <prompterFormatterProvider
-                            implementationClass="cc.unitmesh.devti.java.JavaPromptFormatterProvider"/>
+                implementationClass="cc.unitmesh.devti.java.JavaPromptFormatterProvider"/>
+    </extensions>
+
+    <extensions defaultExtensionNs="com.intellij">
+        <!-- show find bug -->
+        <runLineMarkerContributor language="JAVA"
+                                  implementationClass="cc.unitmesh.ide.idea.contributor.CodeCommentsMarkerContributor"/>
+        <runLineMarkerContributor language="JAVA"
+                                  implementationClass="cc.unitmesh.ide.idea.contributor.FindBugMarkerContributor"/>
+
+        <runLineMarkerContributor language="JAVA"
+                                  implementationClass="cc.unitmesh.ide.idea.contributor.AutoDevFeatureMarkerContributor"/>
+
     </extensions>
 </idea-plugin>
diff --git a/src/main/kotlin/cc/unitmesh/devti/context/DtAnalysisModel.kt b/src/main/kotlin/cc/unitmesh/devti/context/DtAnalysisModel.kt
index e7d0b3dd29..d651127fb5 100644
--- a/src/main/kotlin/cc/unitmesh/devti/context/DtAnalysisModel.kt
+++ b/src/main/kotlin/cc/unitmesh/devti/context/DtAnalysisModel.kt
@@ -1,5 +1,6 @@
 package cc.unitmesh.devti.context
 
+import cc.unitmesh.devti.java.fromJavaFile
 import com.intellij.openapi.application.runReadAction
 import com.intellij.psi.PsiClass
 import com.intellij.psi.PsiFile
diff --git a/src/main/kotlin/cc/unitmesh/devti/intentions/editor/AbstractChatIntention.kt b/src/main/kotlin/cc/unitmesh/devti/intentions/editor/AbstractChatIntention.kt
index 708e779bac..db6255e35a 100644
--- a/src/main/kotlin/cc/unitmesh/devti/intentions/editor/AbstractChatIntention.kt
+++ b/src/main/kotlin/cc/unitmesh/devti/intentions/editor/AbstractChatIntention.kt
@@ -2,7 +2,7 @@ package cc.unitmesh.devti.intentions.editor
 
 import cc.unitmesh.devti.gui.DevtiFlowToolWindowFactory
 import cc.unitmesh.devti.gui.chat.*
-import cc.unitmesh.devti.java.prompt.JavaPromptFormatterProvider
+import cc.unitmesh.devti.java.JavaPromptFormatterProvider
 import com.intellij.codeInsight.intention.IntentionAction
 import com.intellij.lang.injection.InjectedLanguageManager
 import com.intellij.openapi.editor.Editor
diff --git a/src/main/resources/META-INF/autodev-core.xml b/src/main/resources/META-INF/autodev-core.xml
index 966dfcaf39..70be1c59b7 100644
--- a/src/main/resources/META-INF/autodev-core.xml
+++ b/src/main/resources/META-INF/autodev-core.xml
@@ -12,14 +12,6 @@
                                  displayName="AutoDev"/>
 
         <applicationService serviceImplementation="cc.unitmesh.devti.settings.AutoDevSettingsState"/>
-        <!-- show find bug -->
-        <runLineMarkerContributor language="JAVA"
-                                  implementationClass="cc.unitmesh.devti.language.contributor.CodeCommentsMarkerContributor"/>
-        <runLineMarkerContributor language="JAVA"
-                                  implementationClass="cc.unitmesh.devti.language.contributor.FindBugMarkerContributor"/>
-
-        <runLineMarkerContributor language="JAVA"
-                                  implementationClass="cc.unitmesh.devti.language.contributor.AutoDevFeatureMarkerContributor"/>
 
         <runConfigurationProducer
                 implementation="cc.unitmesh.devti.runconfig.command.AutoDevFeatureConfigurationProducer"/>