fix java lib dependencies

Author: longforus

build.gradle

@@ -2,7 +2,7 @@ buildscript {
     ext.kotlin_version = '1.3.61'
 
     repositories {
-//        maven { url 'http://192.168.2.39:8908/repository/maven-public/' }
+        //        maven { url 'http://192.168.2.39:8908/repository/maven-public/' }
         maven { url 'https://maven.aliyun.com/repository/public' }
         mavenCentral()
         maven { url "https://www.jetbrains.com/intellij-repository/releases" }
@@ -44,8 +44,6 @@ repositories {
     maven { url "https://jetbrains.bintray.com/intellij-third-party-dependencies" }
 }
 
-
-
 compileKotlin {
     kotlinOptions.jvmTarget = "1.8"
 }
@@ -60,8 +58,8 @@ if (!hasProperty('StudioCompilePath')) {
 intellij {
     version '2019.2'
     plugins 'java'
-        plugins 'org.jetbrains.kotlin:1.3.61-release-IJ2019.2-1' //here
-//        plugins 'org.jetbrains.kotlin:1.3.21-release-IJ2018.2-1' //here
+    plugins 'org.jetbrains.kotlin:1.3.61-release-IJ2019.2-1' //here
+    //        plugins 'org.jetbrains.kotlin:1.3.21-release-IJ2018.2-1' //here
     //    version '2018.2'
     //    plugins 'org.jetbrains.kotlin:1.2.61-release-IJ2018.2-1' //here
     //    version '2018.1'
@@ -72,14 +70,17 @@ intellij {
     intellij.localPath = project.hasProperty("StudioRunPath") ? StudioRunPath : StudioCompilePath
 }
 
-
 dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     compileOnly fileTree(dir: "$StudioCompilePath/plugins/android/lib", include: ['*.jar'])
+    compileOnly fileTree(dir: "$StudioCompilePath/plugins/java/lib", include: ['*.jar'])
     compileOnly fileTree(dir: "$StudioCompilePath/lib", include: ['*.jar'])
     testCompile fileTree(dir: "$StudioCompilePath/plugins/android/lib", include: ['*.jar'])
+    testCompile fileTree(dir: "$StudioCompilePath/plugins/java/lib", include: ['*.jar'])
     testCompile fileTree(dir: "$StudioCompilePath/lib", include: ['*.jar'])
-    compile "com.jetbrains.intellij.java:java-psi:192.7142.36"
+//    compile "com.jetbrains.intellij.java:java-psi:192.7142.36"
+//    compileOnly "com.jetbrains.intellij.java:java-impl:192.7142.36"
+//    compileOnly "com.jetbrains.intellij.java:java:192.7142.36"
     //    compile 'com.squareup:javapoet:1.11.0'
     //    testCompile group: 'junit', name: 'junit', version: '4.12'
 }
@@ -109,5 +110,4 @@ task verifySetup() {
     }
 }
 
-
 compileJava.dependsOn verifySetup

src/main/kotlin/com/longforus/mvpautocodeplus/maker/MethodImpl.kt

@@ -6,8 +6,7 @@ import com.intellij.codeInsight.generation.OverrideImplementUtil.*
 import com.intellij.codeInsight.generation.PsiGenerationInfo
 import com.intellij.codeInsight.generation.PsiMethodMember
 import com.intellij.openapi.application.ApplicationManager
-import com.intellij.openapi.application.Result
-import com.intellij.openapi.command.WriteCommandAction
+import com.intellij.openapi.command.WriteCommandAction.writeCommandAction
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.project.Project
 import com.intellij.psi.JavaPsiFacade
@@ -47,16 +46,9 @@ fun kotlinDoMultiOverrideImplement(aClass: KtLightClass, project: Project, edito
 
     val chooserObjects = implementMembersHandler.collectMembersToGenerate(
         classOrObject).sortedBy { it.descriptor.name.asString() + " in " + it.immediateSuper.containingDeclaration.name.asString() }
-//    writeCommandAction(project, aClass.containingFile).run<Throwable> {
-//        OverrideImplementMembersHandler.generateMembers(editor, classOrObject, chooserObjects, false)
-//    }
-//    <182
-    object : WriteCommandAction<Any?>(project, aClass.containingFile) {
-        @Throws()
-        override fun run(result: Result<Any?>) {
-            OverrideImplementMembersHandler.generateMembers(editor, classOrObject, chooserObjects, false)
-        }
-    }.executeSilently()
+    writeCommandAction(project, aClass.containingFile).run<Throwable> {
+        OverrideImplementMembersHandler.generateMembers(editor, classOrObject, chooserObjects, false)
+    }
 }
 
 
@@ -92,16 +84,9 @@ fun javaOverrideOrImplementMethods(project: Project,
     for (member in onlyPrimary) {
         allList.add(member)
     }
-//    writeCommandAction(project, aClass.containingFile).run<Throwable> {
-//        overrideOrImplementMethodsInRightPlace(editor, aClass, allList, false, true)
-//    }
-//    <182
-    object : WriteCommandAction<Any?>(project, aClass.containingFile) {
-        @Throws()
-        override fun run(result: Result<Any?>) {
-            overrideOrImplementMethodsInRightPlace(editor, aClass, allList, false, true)
-        }
-    }.executeSilently()
+    writeCommandAction(project, aClass.containingFile).run<Throwable> {
+        overrideOrImplementMethodsInRightPlace(editor, aClass, allList, false, true)
+    }
 }