From a7f6d37566b84a23be6dc6e3b81b9e62e775d51a Mon Sep 17 00:00:00 2001 From: Phodal Huang Date: Thu, 20 Jul 2023 19:16:42 +0800 Subject: [PATCH] feat: update for comment usages --- .../devti/context/model/DtAnalysisModel.kt | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/main/kotlin/cc/unitmesh/devti/context/model/DtAnalysisModel.kt b/src/main/kotlin/cc/unitmesh/devti/context/model/DtAnalysisModel.kt index 8811884098..688858af03 100644 --- a/src/main/kotlin/cc/unitmesh/devti/context/model/DtAnalysisModel.kt +++ b/src/main/kotlin/cc/unitmesh/devti/context/model/DtAnalysisModel.kt @@ -33,10 +33,10 @@ class DtClass( // val commentPrefix = commenter?.lineCommentPrefix fun commentFormat(): String { val output = StringBuilder() - output.append("// package: $packageName\n") - output.append("// class $name {\n") + output.append("package: $packageName\n") + output.append("class $name {\n") output.append(fields.joinToString("\n") { field -> - "// ${field.name}: ${field.type}" + " ${field.name}: ${field.type}" }) // remove getter and setter, and add them to getterSetter @@ -54,14 +54,14 @@ class DtClass( } if (getterSetter.isNotEmpty()) { - output.append("\n// 'getter/setter: ${getterSetter.joinToString(", ")}\n") + output.append("\n 'getter/setter: ${getterSetter.joinToString(", ")}\n") } val methodCodes = methodsWithoutGetterSetter .filter { it.name != this.name } .joinToString("\n") { method -> val params = method.parameters.joinToString("") { parameter -> "${parameter.name}: ${parameter.type}" } - "// + ${method.name}($params)" + if (method.returnType.isNotBlank()) ": ${method.returnType}" else "" + " + ${method.name}($params)" + if (method.returnType.isNotBlank()) ": ${method.returnType}" else "" } if (methodCodes.isNotBlank()) { @@ -69,11 +69,13 @@ class DtClass( output.append(methodCodes) } - output.append("\n// ' some getters and setters\n") - output.append("// }\n") + output.append("\n ' some getters and setters\n") + output.append(" }\n") // TODO: split output and add comments line - return output.toString() + return output.split("\n").joinToString("\n") { + "// $it" + } } fun formatDto(): String {