From 60c7062dbfb614fd63984203f84a86c5ba895193 Mon Sep 17 00:00:00 2001
From: zxj5470 <zxj5470@foxmail.com>
Date: Sun, 27 May 2018 21:53:45 +0800
Subject: [PATCH] [v0.2.4] fix #7

---
 changeNotes.html                                 |  5 +++++
 readme.md                                        | 16 ++++++++--------
 .../bugktdoc/BugKtDocEditorTypedHandler.kt       |  5 +++--
 .../bugktdoc/BugKtDocumentationProvider.kt       |  6 ++++--
 .../com/github/zxj5470/bugktdoc/util/dsl.kt      |  8 --------
 .../zxj5470/bugktdoc/samples/functions-lambda.kt |  2 +-
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/changeNotes.html b/changeNotes.html
index 59e1e3c..24f769c 100644
--- a/changeNotes.html
+++ b/changeNotes.html
@@ -1,3 +1,8 @@
+v0.2.4<br/>
+<ul>
+	<li>Fix doc in function params with lambda</li>
+</ul>
+
 v0.2.3<br/>
 <ul>
 	<li>Fix fatal bug!</li>
diff --git a/readme.md b/readme.md
index bfa86f3..1a64a8e 100644
--- a/readme.md
+++ b/readme.md
@@ -1,16 +1,16 @@
 # BugKotlinDocument
-Plugin for **IntelliJ IDEA** / **Android Studio** / **CLion**.
-And now **AppCode** is available!
-
-- Generate document comments for Kotlin file.
-- Just generate it as Java do.
 
 [![JetBrains plugins](https://img.shields.io/jetbrains/plugin/v/9781-bugkotlindocument.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/9781-bugkotlindocument)
 [![JetBrains plugins](https://img.shields.io/jetbrains/plugin/d/9781-bugkotlindocument.svg?style=flat-square)](https://plugins.jetbrains.com/plugin/9781-bugkotlindocument)
 
+Plugin for **IntelliJ IDEA** / **Android Studio** / **CLion**, and **AppCode** is available now!
+
+- Generate document comments for Kotlin file.
+- Just generate it as Java do.
+
 # Usage 
 
-**Just press Enter key like in Java File !!!**
+**Just press Enter key after `/**`, just like in Java File !!!**
 
 ![gif](images/pic01.gif) 
 
@@ -18,7 +18,7 @@ And now **AppCode** is available!
 ![png](images/pic02.png) 
 
 ## AppCode and CLion support!
- ![png](images/pic04.png) 
+![png](images/pic04.png) 
 
 ## Settings
 
@@ -53,4 +53,4 @@ A DevCpp-like cross-platform Kotlin IDE features in lightweight.
 - [ice1000/julia-intellij](https://github.com/ice1000/julia-intellij)
 Julia Plugin for IntelliJ IDEA
 - [zxj5470/ktlext](https://github.com/zxj5470/ktlext)
-A useless library for Kotlin extensions. 
+A **useless** library for Kotlin extensions. 
diff --git a/src/main/kotlin/com/github/zxj5470/bugktdoc/BugKtDocEditorTypedHandler.kt b/src/main/kotlin/com/github/zxj5470/bugktdoc/BugKtDocEditorTypedHandler.kt
index f14be99..6df6570 100644
--- a/src/main/kotlin/com/github/zxj5470/bugktdoc/BugKtDocEditorTypedHandler.kt
+++ b/src/main/kotlin/com/github/zxj5470/bugktdoc/BugKtDocEditorTypedHandler.kt
@@ -8,11 +8,12 @@ import com.intellij.notification.Notifications
 import com.intellij.openapi.editor.Editor
 import com.intellij.openapi.project.Project
 import com.intellij.psi.PsiFile
-import org.jetbrains.kotlin.psi.KtFile
 
 class BugKtDocEditorTypedHandler : TypedHandlerDelegate() {
 	override fun charTyped(c: Char, project: Project, editor: Editor, file: PsiFile): Result {
-		if (file !is KtFile) return super.charTyped(c, project, editor, file)
+		// avoid NoClassDef if no Kotlin plugin
+		if (file.language.toString() != "Kotlin") return super.charTyped(c, project, editor, file)
+
 		if (isTheFirstTime && c == '*' && getCurrentLineToCurrentChar(editor).endsWith("/**")) {
 			Notifications.Bus.notify(Notification("com.github.zxj5470.bugktdoc.notification",
 				BugKtDocBundle.message("bugktdoc.notation.title"),
diff --git a/src/main/kotlin/com/github/zxj5470/bugktdoc/BugKtDocumentationProvider.kt b/src/main/kotlin/com/github/zxj5470/bugktdoc/BugKtDocumentationProvider.kt
index 6d584c0..935d67b 100644
--- a/src/main/kotlin/com/github/zxj5470/bugktdoc/BugKtDocumentationProvider.kt
+++ b/src/main/kotlin/com/github/zxj5470/bugktdoc/BugKtDocumentationProvider.kt
@@ -60,8 +60,10 @@ class BugKtDocumentationProvider : DocumentationProviderEx(), CodeDocumentationP
 
 			// @param
 			owner.valueParameters.forEach {
-				val param = it.nameIdentifier?.text
-				val type = it.itsType
+				val param = it.nameIdentifier?.text ?: ""
+				val type =
+					if (it.isVarArg) it.itsType
+					else it.text.substringAfter(param).substringBefore('=').trim(':', ' ')
 				appendDecorate(PARAM)
 				// add a space before `param` and after is no used
 				append("$param $type")
diff --git a/src/main/kotlin/com/github/zxj5470/bugktdoc/util/dsl.kt b/src/main/kotlin/com/github/zxj5470/bugktdoc/util/dsl.kt
index 9f1ae5d..64bf71e 100644
--- a/src/main/kotlin/com/github/zxj5470/bugktdoc/util/dsl.kt
+++ b/src/main/kotlin/com/github/zxj5470/bugktdoc/util/dsl.kt
@@ -1,13 +1,5 @@
 package com.github.zxj5470.bugktdoc.util
 
-fun StringBuilder.clear() = this.setLength(0)
-
-fun String.log(tag: String = "") {
-	println("------$tag--------")
-	println(this)
-	println("--------------")
-}
-
 operator fun Boolean.invoke(block: () -> Unit): Boolean {
 	if (this) block()
 	return this
diff --git a/src/test/kotlin/com/github/zxj5470/bugktdoc/samples/functions-lambda.kt b/src/test/kotlin/com/github/zxj5470/bugktdoc/samples/functions-lambda.kt
index 2845909..a90de88 100644
--- a/src/test/kotlin/com/github/zxj5470/bugktdoc/samples/functions-lambda.kt
+++ b/src/test/kotlin/com/github/zxj5470/bugktdoc/samples/functions-lambda.kt
@@ -25,7 +25,7 @@ fun lambda(block: String.() -> Unit) {
  *
  * @param block [@kotlin.ExtensionFunctionType] Function1<Pair<String, Int>, Unit>
  */
-fun lambda2(block: Pair<String, Int>.() -> Unit) {
+fun lambda2(block: Pair<String, Int>.() -> Unit = {}) {
 
 }