初步添加了 自动清单注册和自动生成layout的功能

longforus · longforus · commit f8a9f4530cb8 · 2020-03-18T16:12:30.000+08:00
diff --git a/build.gradle b/build.gradle
@@ -1,12 +1,10 @@
 buildscript {
     ext.kotlin_version = '1.3.61'
-
     repositories {
         //        maven { url 'http://192.168.2.39:8908/repository/maven-public/' }
         maven { url 'https://maven.aliyun.com/repository/public' }
+        google()
         mavenCentral()
-        maven { url "https://www.jetbrains.com/intellij-repository/releases" }
-        maven { url "https://jetbrains.bintray.com/intellij-third-party-dependencies" }
     }
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -39,9 +37,8 @@ targetCompatibility = 1.8
 repositories {
     //    maven{ url 'http://192.168.2.39:8908/repository/maven-public/'}
     maven { url 'https://maven.aliyun.com/repository/public' }
+    google()
     mavenCentral()
-    maven { url "https://www.jetbrains.com/intellij-repository/releases" }
-    maven { url "https://jetbrains.bintray.com/intellij-third-party-dependencies" }
 }
 
 compileKotlin {
@@ -75,11 +72,12 @@ dependencies {
     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"
-//    compileOnly "com.jetbrains.intellij.java:java-impl:192.7142.36"
+    compileOnly "com.android.tools.build:gradle:3.6.1"
 //    compileOnly "com.jetbrains.intellij.java:java:192.7142.36"
     //    compile 'com.squareup:javapoet:1.11.0'
     //    testCompile group: 'junit', name: 'junit', version: '4.12'
diff --git a/src/main/kotlin/com/longforus/mvpautocodeplus/MainAction.kt b/src/main/kotlin/com/longforus/mvpautocodeplus/MainAction.kt
@@ -8,17 +8,14 @@ import com.intellij.openapi.actionSystem.*
 import com.intellij.openapi.application.WriteActionAware
 import com.intellij.openapi.fileEditor.FileEditorManager
 import com.intellij.openapi.fileEditor.TextEditor
+import com.intellij.openapi.module.ModuleUtil
 import com.intellij.openapi.project.Project
-import com.intellij.psi.PsiClass
-import com.intellij.psi.PsiDirectory
-import com.intellij.psi.PsiFile
-import com.intellij.psi.PsiJavaFile
+import com.intellij.psi.*
 import com.intellij.util.PlatformIcons
-import com.longforus.mvpautocodeplus.maker.TemplateMaker
-import com.longforus.mvpautocodeplus.maker.TemplateParamFactory
-import com.longforus.mvpautocodeplus.maker.createFileFromTemplate
-import com.longforus.mvpautocodeplus.maker.overrideOrImplementMethods
+import com.longforus.mvpautocodeplus.config.ItemConfigBean
+import com.longforus.mvpautocodeplus.maker.*
 import com.longforus.mvpautocodeplus.ui.EnterKeywordDialog
+import org.jetbrains.android.facet.AndroidFacet
 import org.jetbrains.kotlin.psi.KtFile
 import com.intellij.openapi.application.runWriteAction as runWriteAction1
 
@@ -31,30 +28,31 @@ import com.intellij.openapi.application.runWriteAction as runWriteAction1
 class MainAction : AnAction("Generate MVP Code", "auto make mvp code", PlatformIcons.CLASS_ICON), WriteActionAware {
     var project: Project? = null
     lateinit var mSelectedState: PropertiesComponent
-    fun createFile(enterName: String, templateName: String, dir: PsiDirectory, superImplName: String, contract: PsiFile? = null, fileName: String = enterName):
-        PsiFile? {
-        val template = TemplateMaker.getTemplate(templateName, project!!) ?: return null
+    fun createFile(enterName: String, templateName: String, dir: PsiDirectory, superImplName: String, contract: PsiFile? = null, fileName: String = enterName): Pair<PsiFile?,
+        PsiClass?> {
+        var clazz: PsiClass? = null
+        val template = TemplateMaker.getTemplate(templateName, project!!) ?: return null to null
         val liveTemplateDefaultValues = TemplateParamFactory.getParam4TemplateName(templateName, enterName, superImplName, contract, mSelectedState)
         val psiFile = createFileFromTemplate(fileName, template, dir, null, false, liveTemplateDefaultValues, mSelectedState.getValue(COMMENT_AUTHOR))
         if (!templateName.contains("Contract")) {
             val openFile = FileEditorManager.getInstance(project!!).openFile(psiFile!!.virtualFile, false)
             val textEditor = openFile[0] as TextEditor
-            var clazz: PsiClass? = null
+
             if (psiFile is PsiJavaFile) {
                 if (psiFile.classes.isEmpty()) {
-                    return psiFile
+                    return psiFile to null
                 }
                 clazz = psiFile.classes[0]
             } else if (psiFile is KtFile) {
                 if (psiFile.classes.isEmpty()) {
-                    return psiFile
+                    return psiFile to null
                 }
                 clazz = psiFile.classes[0]
             }
             FeatureUsageTracker.getInstance().triggerFeatureUsed(ProductivityFeatureNames.CODEASSISTS_OVERRIDE_IMPLEMENT)
             overrideOrImplementMethods(project!!, textEditor.editor, clazz!!, true)
         }
-        return psiFile
+        return psiFile to clazz
     }
 
     override fun actionPerformed(e: AnActionEvent) {
@@ -72,57 +70,74 @@ class MainAction : AnAction("Generate MVP Code", "auto make mvp code", PlatformI
 //            Messages.showErrorDialog("Super IView Interface name is null ! $GOTO_SETTING", "Error")
 //            return
 //        }
+
+        //NewAndroidComponentDialog
+
         EnterKeywordDialog.getDialog(project) {
             mSelectedState = it.state
+            val module = ModuleUtil.findModuleForFile(dir.virtualFile, project!!)
+            val facet = AndroidFacet.getInstance(module!!)
             runWriteAction1 {
                 if (it.isJava) {
-                    val contractJ = createFile(it.name, if (it.generateModel) CONTRACT_TP_NAME_JAVA else CONTRACT_TP_NO_MODEL_NAME_JAVA, getSubDir(dir, CONTRACT),
-                        "")
-                    if (!it.vImpl.isEmpty() && !it.vImpl.startsWith(IS_NOT_SET)) {
-                        val sdV = getSubDir(dir, VIEW)
-                        if (it.isActivity) {
-                            createFile(it.name, VIEW_IMPL_TP_ACTIVITY_JAVA, sdV, it.vImpl, contractJ)
-                        } else {
-                            createFile(it.name, VIEW_IMPL_TP_FRAGMENT_JAVA, sdV, it.vImpl, contractJ)
-                        }
-                    }
-                    if (!it.pImpl.isEmpty()) {
-                        val sdP = getSubDir(dir, PRESENTER)
-                        createFile(it.name, PRESENTER_IMPL_TP_JAVA, sdP, it.pImpl, contractJ)
-                    }
-                    if (!it.mImpl.isEmpty() && it.generateModel) {
-                        val sdM = getSubDir(dir, MODEL)
-                        createFile(it.name, MODEL_IMPL_TP_JAVA, sdM, it.mImpl, contractJ)
-                    }
-
+                    doJavaCreate(it, dir, facet)
                 } else {
-                    val contractK = createFile(it.name, if (it.generateModel) CONTRACT_TP_NAME_KOTLIN else CONTRACT_TP_NO_MODEL_NAME_KOTLIN, getSubDir(dir, CONTRACT), "",
-                        fileName = getContractName(it
-                            .name))
-
-                    if (!it.vImpl.isEmpty() && !it.vImpl.startsWith(IS_NOT_SET)) {
-                        val sdV = getSubDir(dir, VIEW)
-                        if (it.isActivity) {
-                            createFile(it.name, VIEW_IMPL_TP_ACTIVITY_KOTLIN, sdV, it.vImpl, contractK, "${it.name}Activity")
-                        } else {
-                            createFile(it.name, VIEW_IMPL_TP_FRAGMENT_KOTLIN, sdV, it.vImpl, contractK, "${it.name}Fragment")
-                        }
-                    }
-                    if (!it.pImpl.isEmpty()) {
-                        val sdP = getSubDir(dir, PRESENTER)
-                        createFile(it.name, PRESENTER_IMPL_TP_KOTLIN, sdP, it.pImpl, contractK, "${it.name}${TemplateParamFactory.getPresenterOrViewModel(it.pImpl)}")
-                    }
-                    if (!it.mImpl.isEmpty() && it.generateModel) {
-                        val sdM = getSubDir(dir, MODEL)
-                        createFile(it.name, MODEL_IMPL_TP_KOTLIN, sdM, it.mImpl, contractK, "${it.name}Model")
-                    }
+                    doKtCreate(it, dir, facet)
                 }
             }
+        }
+    }
 
+    private fun doKtCreate(it: ItemConfigBean, dir: PsiDirectory, facet: AndroidFacet?) {
+        val contractK = createFile(it.name, if (it.generateModel) CONTRACT_TP_NAME_KOTLIN else CONTRACT_TP_NO_MODEL_NAME_KOTLIN, getSubDir(dir, CONTRACT), "",
+            fileName = getContractName(it
+                .name))
+
+        if (it.vImpl.isNotEmpty() && !it.vImpl.startsWith(IS_NOT_SET)) {
+            val sdV = getSubDir(dir, VIEW)
+            if (it.isActivity) {
+                val activityKt = createFile(it.name, VIEW_IMPL_TP_ACTIVITY_KOTLIN, sdV, it.vImpl, contractK.first, "${it.name}Activity")
+                CompleteRegister.registerActivity(activityKt.second, JavaDirectoryService.getInstance().getPackage(dir), facet!!, "")
+                doCreateLayoutFile(activityKt.second, dir, facet, false)
+            } else {
+                val fragmentKt = createFile(it.name, VIEW_IMPL_TP_FRAGMENT_KOTLIN, sdV, it.vImpl, contractK.first, "${it.name}Fragment")
+                doCreateLayoutFile(fragmentKt.second, dir, facet!!, false)
+            }
+        }
+        if (it.pImpl.isNotEmpty()) {
+            val sdP = getSubDir(dir, PRESENTER)
+            createFile(it.name, PRESENTER_IMPL_TP_KOTLIN, sdP, it.pImpl, contractK.first, "${it.name}${TemplateParamFactory.getPresenterOrViewModel(it.pImpl)}")
         }
+        if (it.mImpl.isNotEmpty() && it.generateModel) {
+            val sdM = getSubDir(dir, MODEL)
+            createFile(it.name, MODEL_IMPL_TP_KOTLIN, sdM, it.mImpl, contractK.first, "${it.name}Model")
+        }
+    }
 
+    private fun doJavaCreate(it: ItemConfigBean, dir: PsiDirectory, facet: AndroidFacet?) {
+        val contractJ = createFile(it.name, if (it.generateModel) CONTRACT_TP_NAME_JAVA else CONTRACT_TP_NO_MODEL_NAME_JAVA, getSubDir(dir, CONTRACT),
+            "")
+        if (it.vImpl.isNotEmpty() && !it.vImpl.startsWith(IS_NOT_SET)) {
+            val sdV = getSubDir(dir, VIEW)
+            if (it.isActivity) {
+                val activityJava = createFile(it.name, VIEW_IMPL_TP_ACTIVITY_JAVA, sdV, it.vImpl, contractJ.first)
+                CompleteRegister.registerActivity(activityJava.second, JavaDirectoryService.getInstance().getPackage(dir), facet!!, "")
+                doCreateLayoutFile(activityJava.second, dir, facet, true)
+            } else {
+                val fragmentJava = createFile(it.name, VIEW_IMPL_TP_FRAGMENT_JAVA, sdV, it.vImpl, contractJ.first)
+                doCreateLayoutFile(fragmentJava.second, dir, facet!!, true)
+            }
+        }
+        if (it.pImpl.isNotEmpty()) {
+            val sdP = getSubDir(dir, PRESENTER)
+            createFile(it.name, PRESENTER_IMPL_TP_JAVA, sdP, it.pImpl, contractJ.first)
+        }
+        if (it.mImpl.isNotEmpty() && it.generateModel) {
+            val sdM = getSubDir(dir, MODEL)
+            createFile(it.name, MODEL_IMPL_TP_JAVA, sdM, it.mImpl, contractJ.first)
+        }
     }
 
+
     fun getSubDir(dir: PsiDirectory, dirName: String): PsiDirectory {
         return if (dir.name == CONTRACT) {
             if (dirName == CONTRACT) {
diff --git a/src/main/kotlin/com/longforus/mvpautocodeplus/maker/CompleteRegister.kt b/src/main/kotlin/com/longforus/mvpautocodeplus/maker/CompleteRegister.kt
@@ -0,0 +1,49 @@
+package com.longforus.mvpautocodeplus.maker
+
+import com.intellij.openapi.vfs.ReadonlyStatusHandler
+import com.intellij.psi.PsiClass
+import com.intellij.psi.PsiPackage
+import org.jetbrains.android.dom.manifest.Application
+import org.jetbrains.android.dom.manifest.ApplicationComponent
+import org.jetbrains.android.dom.manifest.Manifest
+import org.jetbrains.android.dom.resources.ResourceValue
+import org.jetbrains.android.facet.AndroidFacet
+import org.jetbrains.android.facet.AndroidRootUtil
+import org.jetbrains.android.util.AndroidUtils
+
+/**
+ * @describe
+ * @author  longforus
+ * @date 2020/3/18  15:11
+ */
+object CompleteRegister {
+
+    fun registerActivity(aClass: PsiClass?, aPackage: PsiPackage?, facet: AndroidFacet, label: String?) {
+        val manifestFile = AndroidRootUtil.getManifestFile(facet)
+        if (manifestFile != null && ReadonlyStatusHandler.ensureFilesWritable(facet.module.project, *arrayOf(manifestFile))) {
+            val manifest = AndroidUtils.loadDomElement(facet.module, manifestFile,
+                Manifest::class.java)
+            if (manifest != null) {
+                val packageName = manifest.getPackage().value
+                if (packageName == null || packageName.isEmpty()) {
+                    manifest.getPackage().setValue(aPackage?.qualifiedName)
+                }
+                val application = manifest.application
+                if (application != null) {
+                    val component = addToManifest( aClass!!, application)
+                    if (component != null && !label.isNullOrEmpty()) {
+                        component.label.setValue(ResourceValue.literal(label))
+                    }
+                }
+            }
+        }
+    }
+
+
+    fun addToManifest(aClass: PsiClass, application: Application): ApplicationComponent? {
+        val activity = application.addActivity()
+        activity.activityClass.value = aClass
+       return activity
+    }
+
+}
diff --git a/src/main/kotlin/com/longforus/mvpautocodeplus/maker/LayoutCreator.kt b/src/main/kotlin/com/longforus/mvpautocodeplus/maker/LayoutCreator.kt
@@ -0,0 +1,74 @@
+package com.longforus.mvpautocodeplus.maker
+
+import com.android.resources.ResourceFolderType
+import com.intellij.openapi.application.ApplicationManager
+import com.intellij.openapi.command.WriteCommandAction
+import com.intellij.openapi.util.io.FileUtil
+import com.intellij.psi.*
+import com.intellij.psi.codeStyle.CodeStyleManager
+import com.intellij.psi.codeStyle.JavaCodeStyleManager
+import org.jetbrains.android.actions.CreateResourceFileAction
+import org.jetbrains.android.dom.manifest.Manifest
+import org.jetbrains.android.facet.AndroidFacet
+import org.jetbrains.android.util.AndroidResourceUtil
+
+/**
+ * @describe
+ * @author  longforus
+ * @date 2020/3/18  16:07
+ */
+@Throws(Exception::class)
+fun doCreateLayoutFile(element: PsiClass?, directory: PsiDirectory, facet: AndroidFacet, isJava: Boolean): PsiElement? {
+    return if (element == null) {
+        null
+    } else {
+        val manifest = Manifest.getMainManifest(facet)
+        val appPackage = manifest?.getPackage()?.value
+        if (appPackage != null && !appPackage.isEmpty()) {
+            ApplicationManager.getApplication().invokeLater {
+                createLayoutFileForActivityOrFragment(facet, element, appPackage, directory, isJava)
+            }
+        }
+        element
+    }
+}
+
+fun createLayoutFileForActivityOrFragment(facet: AndroidFacet, activityClass: PsiClass, appPackage: String, resDirectory: PsiDirectory, isJava: Boolean) {
+    if (!facet.isDisposed && activityClass.isValid) {
+        val className = activityClass.name
+        if (className != null) {
+            val layoutFile = CreateResourceFileAction.createFileResource(facet, ResourceFolderType.LAYOUT, null, null, null, true, "Create Layout For '$className'", resDirectory, null, false)
+            val layoutFileName = layoutFile?.name
+            if (layoutFileName != null) {
+                val onCreateMethods = activityClass.findMethodsByName("getLayoutId", false)//todo 生成viewBinding
+                if (onCreateMethods.size != 1) {
+                    return
+                }
+                val onCreateMethod = onCreateMethods[0]
+                val body = onCreateMethod.body
+                if (body != null) {
+                    val fieldName = AndroidResourceUtil.getRJavaFieldName(FileUtil.getNameWithoutExtension(layoutFileName))
+                    val layoutFieldRef = "$appPackage.R.layout.$fieldName"
+                    addInflateStatement(body, layoutFieldRef, isJava)
+                }
+            }
+        }
+    }
+}
+
+
+fun addInflateStatement(body: PsiCodeBlock, layoutFieldRef: String, isJava: Boolean) {
+    val project = body.project
+    val statements = body.statements
+    if (statements.size == 1) {
+        val statement = statements[0]
+        WriteCommandAction.writeCommandAction(project, body.containingFile).run<Throwable> {
+            val newStatement = PsiElementFactory.getInstance(project).createStatementFromText(
+                "return $layoutFieldRef${if (isJava) ";" else ""}", body)
+            statement.replace(newStatement)
+            JavaCodeStyleManager.getInstance(project).shortenClassReferences(body)
+            CodeStyleManager.getInstance(project).reformat(body)
+        }
+    }
+}
+
diff --git a/src/main/kotlin/com/longforus/mvpautocodeplus/maker/MethodImpl.kt b/src/main/kotlin/com/longforus/mvpautocodeplus/maker/MethodImpl.kt
@@ -46,6 +46,7 @@ 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)
     }

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,7 @@ fun kotlinDoMultiOverrideImplement(aClass: KtLightClass, project: Project, edito`
`46`	`46`
`47`	`47`	`val chooserObjects = implementMembersHandler.collectMembersToGenerate(`
`48`	`48`	`classOrObject).sortedBy { it.descriptor.name.asString() + " in " + it.immediateSuper.containingDeclaration.name.asString() }`
	`49`	`+`
`49`	`50`	`writeCommandAction(project, aClass.containingFile).run<Throwable> {`
`50`	`51`	`OverrideImplementMembersHandler.generateMembers(editor, classOrObject, chooserObjects, false)`
`51`	`52`	`}`