fix: remove some librs to idea only #7

unit-mesh · Jul 18, 2023 · 8cf9839 · 8cf9839
1 parent ae5b1bb
commit 8cf9839
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 15 deletions.
diff --git 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/...ibutor/AutoDevFeatureMarkerContributor.kt → ...ibutor/AutoDevFeatureMarkerContributor.kt b/...ibutor/AutoDevFeatureMarkerContributor.kt → ...ibutor/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/...tributor/CodeCommentsMarkerContributor.kt → ...tributor/CodeCommentsMarkerContributor.kt b/...tributor/CodeCommentsMarkerContributor.kt → ...tributor/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/...e/contributor/FindBugMarkerContributor.kt → ...a/contributor/FindBugMarkerContributor.kt b/...e/contributor/FindBugMarkerContributor.kt → ...a/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
@@ -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
@@ -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
@@ -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
@@ -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"/>