clean code

Author: tangzx

src/main/java/com/tang/intellij/lua/codeInsight/intention/CreateFieldFromParameterIntention.kt

@@ -13,6 +13,7 @@ import com.intellij.psi.PsiElement
 import com.intellij.psi.PsiFile
 import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.util.IncorrectOperationException
+import com.tang.intellij.lua.codeInsight.template.macro.SuggestTypeMacro
 import com.tang.intellij.lua.psi.*
 import com.tang.intellij.lua.search.SearchContext
 import com.tang.intellij.lua.stubs.index.LuaClassIndex

src/main/java/com/tang/intellij/lua/codeInsight/intention/CreateFunctionDocIntention.kt

@@ -20,6 +20,7 @@ import com.intellij.codeInsight.template.TemplateManager
 import com.intellij.codeInsight.template.impl.MacroCallNode
 import com.intellij.codeInsight.template.impl.TextExpression
 import com.intellij.openapi.editor.Editor
+import com.tang.intellij.lua.codeInsight.template.macro.SuggestTypeMacro
 import com.tang.intellij.lua.psi.LuaCommentOwner
 import com.tang.intellij.lua.psi.LuaFuncBodyOwner
 import org.jetbrains.annotations.Nls

src/main/java/com/tang/intellij/lua/codeInsight/intention/CreateFunctionReturnAnnotationIntention.kt

@@ -16,12 +16,12 @@
 
 package com.tang.intellij.lua.codeInsight.intention
 
-import com.intellij.codeInsight.template.TemplateManager
 import com.intellij.codeInsight.template.impl.MacroCallNode
 import com.intellij.codeInsight.template.impl.TextExpression
 import com.intellij.openapi.editor.Editor
-import com.intellij.psi.PsiElement
 import com.intellij.psi.util.PsiTreeUtil
+import com.tang.intellij.lua.codeInsight.template.macro.SuggestTypeMacro
+import com.tang.intellij.lua.comment.LuaCommentUtil
 import com.tang.intellij.lua.comment.psi.LuaDocReturnDef
 import com.tang.intellij.lua.psi.LuaCommentOwner
 import com.tang.intellij.lua.psi.LuaFuncBodyOwner
@@ -44,24 +44,11 @@ class CreateFunctionReturnAnnotationIntention : FunctionIntention() {
 
     override fun invoke(bodyOwner: LuaFuncBodyOwner, editor: Editor) {
         if (bodyOwner is LuaCommentOwner) {
-            val comment = bodyOwner.comment
-            val funcBody = bodyOwner.funcBody
-            if (funcBody != null) {
-                val templateManager = TemplateManager.getInstance(editor.project)
-                val template = templateManager.createTemplate("", "")
-                if (comment != null) template.addTextSegment("\n")
+            LuaCommentUtil.insertTemplate(bodyOwner, editor) { _, template ->
                 template.addTextSegment("---@return ")
                 val typeSuggest = MacroCallNode(SuggestTypeMacro())
                 template.addVariable("returnType", typeSuggest, TextExpression("table"), false)
                 template.addEndVariable()
-                if (comment != null) {
-                    editor.caretModel.moveToOffset(comment.textOffset + comment.textLength)
-                } else {
-                    template.addTextSegment("\n")
-                    val e: PsiElement = bodyOwner
-                    editor.caretModel.moveToOffset(e.node.startOffset)
-                }
-                templateManager.startTemplate(editor, template)
             }
         }
     }

src/main/java/com/tang/intellij/lua/codeInsight/intention/CreateParameterAnnotationIntention.kt

@@ -17,14 +17,15 @@
 package com.tang.intellij.lua.codeInsight.intention
 
 import com.intellij.codeInsight.intention.impl.BaseIntentionAction
-import com.intellij.codeInsight.template.TemplateManager
 import com.intellij.codeInsight.template.impl.MacroCallNode
 import com.intellij.codeInsight.template.impl.TextExpression
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiFile
 import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.util.IncorrectOperationException
+import com.tang.intellij.lua.codeInsight.template.macro.SuggestTypeMacro
+import com.tang.intellij.lua.comment.LuaCommentUtil
 import com.tang.intellij.lua.psi.LuaCommentOwner
 import com.tang.intellij.lua.psi.LuaParamNameDef
 import org.jetbrains.annotations.Nls
@@ -62,25 +63,12 @@ class CreateParameterAnnotationIntention : BaseIntentionAction() {
 
         val owner = PsiTreeUtil.getParentOfType(parDef, LuaCommentOwner::class.java)
         if (owner != null) {
-            val comment = owner.comment
-
-            val templateManager = TemplateManager.getInstance(project)
-            val template = templateManager.createTemplate("", "")
-            if (comment != null)
-                template.addTextSegment("\n")
-            template.addTextSegment(String.format("---@param %s ", parDef.name))
-            val name = MacroCallNode(SuggestTypeMacro())
-            template.addVariable("type", name, TextExpression("table"), true)
-            template.addEndVariable()
-
-            if (comment != null) {
-                editor.caretModel.moveToOffset(comment.textOffset + comment.textLength)
-            } else {
-                editor.caretModel.moveToOffset(owner.node.startOffset)
-                template.addTextSegment("\n")
+            LuaCommentUtil.insertTemplate(owner, editor) { _, template ->
+                template.addTextSegment(String.format("---@param %s ", parDef.name))
+                val name = MacroCallNode(SuggestTypeMacro())
+                template.addVariable("type", name, TextExpression("table"), true)
+                template.addEndVariable()
             }
-
-            templateManager.startTemplate(editor, template)
         }
     }
 }

src/main/java/com/tang/intellij/lua/codeInsight/intention/CreateTypeAnnotationIntention.java

@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2017. tangzx([email protected])
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.tang.intellij.lua.codeInsight.intention
+
+import com.intellij.codeInsight.intention.impl.BaseIntentionAction
+import com.intellij.codeInsight.template.impl.MacroCallNode
+import com.intellij.codeInsight.template.impl.TextExpression
+import com.intellij.openapi.editor.Editor
+import com.intellij.openapi.project.Project
+import com.intellij.psi.PsiFile
+import com.tang.intellij.lua.codeInsight.template.macro.SuggestTypeMacro
+import com.tang.intellij.lua.comment.LuaCommentUtil
+import com.tang.intellij.lua.psi.LuaLocalDef
+import com.tang.intellij.lua.psi.LuaPsiTreeUtil
+
+/**
+ *
+ * Created by TangZX on 2016/12/16.
+ */
+class CreateTypeAnnotationIntention : BaseIntentionAction() {
+
+    override fun getFamilyName(): String {
+        return text
+    }
+
+    override fun getText(): String {
+        return "Create type annotation"
+    }
+
+    override fun isAvailable(project: Project, editor: Editor, psiFile: PsiFile): Boolean {
+        val localDef = LuaPsiTreeUtil.findElementOfClassAtOffset(psiFile, editor.caretModel.offset, LuaLocalDef::class.java, false)
+        if (localDef != null) {
+            val comment = localDef.comment
+            return comment?.typeDef == null
+        }
+        return false
+    }
+
+    override fun invoke(project: Project, editor: Editor, psiFile: PsiFile) {
+        val localDef = LuaPsiTreeUtil.findElementOfClassAtOffset(psiFile, editor.caretModel.offset, LuaLocalDef::class.java, false)
+        if (localDef != null) {
+            LuaCommentUtil.insertTemplate(localDef, editor) { _, template ->
+                template.addTextSegment("---@type ")
+                val name = MacroCallNode(SuggestTypeMacro())
+                template.addVariable("type", name, TextExpression("table"), true)
+                template.addEndVariable()
+            }
+        }
+    }
+}

src/main/java/com/tang/intellij/lua/codeInsight/intention/CreateTypeAnnotationIntention.kt

@@ -21,6 +21,7 @@ import com.intellij.codeInsight.template.impl.MacroCallNode
 import com.intellij.codeInsight.template.impl.TextExpression
 import com.intellij.openapi.editor.Editor
 import com.intellij.psi.PsiElement
+import com.tang.intellij.lua.codeInsight.template.macro.NamesMacro
 import com.tang.intellij.lua.comment.psi.LuaDocAccessModifier
 import com.tang.intellij.lua.psi.LuaClassMethodDef
 import com.tang.intellij.lua.psi.LuaCommentOwner

src/main/java/com/tang/intellij/lua/codeInsight/intention/SetVisibilityIntention.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.tang.intellij.lua.codeInsight.intention
+package com.tang.intellij.lua.codeInsight.template.macro
 
 import com.intellij.codeInsight.lookup.LookupElement
 import com.intellij.codeInsight.lookup.LookupElementBuilder