feat(typescript): simplify insert logic #2

unit-mesh · Apr 10, 2024 · 8083b51 · 8083b51
1 parent 5231b70
commit 8083b51
Showing 1 changed file with 13 additions and 21 deletions.
diff --git a/...ript/src/main/kotlin/cc/unitmesh/ide/javascript/provider/JavaScriptLivingDocumentation.kt b/...ript/src/main/kotlin/cc/unitmesh/ide/javascript/provider/JavaScriptLivingDocumentation.kt
@@ -50,18 +50,22 @@ class JavaScriptLivingDocumentation : LivingDocumentation {
                 LivingDocumentationType.COMMENT -> {
                     val existingComment = JSDocumentationUtils.findOwnDocComment(target)
                         ?: findDocFallback(target)
+                    val fromSuggestion = LivingDocumentation.buildDocFromSuggestion(newDoc, "/**", "*/")
 
                     try {
-                        didInsertComment(newDoc, target, existingComment)
-                    } catch (e: Exception) {
-                        // second attempt
-                        val fromSuggestion = LivingDocumentation.buildDocFromSuggestion(newDoc, "/**", "*/")
-                        try {
-                            didInsertComment(fromSuggestion, target, existingComment)
-                        } catch (e: Exception) {
-                            editor.document.insertString(startOffset, newDoc)
-                            codeStyleManager.reformatText(target.containingFile, startOffset, newEndOffset)
+                        val createJSDocComment: PsiElement =
+                            JSPsiElementFactory.createJSDocComment(fromSuggestion, target)
+
+                        if (existingComment != null) {
+                            existingComment.replace(createJSDocComment)
+                        } else {
+                            val parent = target.parent
+                            parent.addBefore(createJSDocComment, target)
+                            JSChangeUtil.addWs(parent.node, target.node, "\n")
                         }
+                    } catch (e: Exception) {
+                        editor.document.insertString(startOffset, newDoc)
+                        codeStyleManager.reformatText(target.containingFile, startOffset, newEndOffset)
                     }
                 }
 
@@ -78,18 +82,6 @@ class JavaScriptLivingDocumentation : LivingDocumentation {
         })
     }
 
-    private fun didInsertComment(newDoc: String, target: PsiElement, existingComment: JSDocComment?) {
-        val createJSDocComment: PsiElement = JSPsiElementFactory.createJSDocComment(newDoc, target)
-
-        if (existingComment != null) {
-            existingComment.replace(createJSDocComment)
-        } else {
-            val parent = target.parent
-            parent.addBefore(createJSDocComment, target)
-            JSChangeUtil.addWs(parent.node, target.node, "\n")
-        }
-    }
-
     private fun findDocFallback(documentationTarget: PsiElement): JSDocComment? {
         val parentOfDestructuring: PsiElement? by lazy {
             var context = documentationTarget.context