Skip to content

修复生成错误 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TT432 merged 2 commits into from
May 22, 2025
Merged

修复生成错误 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d43c6cc
🐛 修复生成错误
QiuShui1012 May 21, 2025
e8ba4c1
Merge branch 'TT432:master' into master
QiuShui1012 May 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
}

group = "io.github.tt432"
version = "1.2-SNAPSHOT"
version = "1.2.1-SNAPSHOT"

repositories {
mavenCentral()
Expand Down
10 changes: 6 additions & 4 deletions src/main/kotlin/io/github/tt432/k9tools/GenerateStreamCodecAction.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,13 @@ class GenerateStreamCodecAction : AnAction() {

if (editor == null || psiClass == null) return@runWriteCommandAction

val fields = psiClass.allFields
val className = psiClass.name!!

var fields = psiClass.allFields

if (fields.any { it.name == "STREAM_CODEC" }) return@runWriteCommandAction

val className = psiClass.name!!
fields = fields.filter { !it.hasModifier(JvmModifier.STATIC) }.toTypedArray()

if (fields.size <= 6) { serializeWithinSixFields(fields, className, psiClass, project) }
else serializeMoreThanSixFields(fields, className, psiClass, project)
Expand All @@ -141,7 +143,7 @@ class GenerateStreamCodecAction : AnAction() {
) {
val fieldsStr = StringBuilder()

fields.filter { !it.hasModifier(JvmModifier.STATIC) }.forEach {
fields.forEach {
fieldsStr.append(
" ${getCodecRef(it.typeElement)},\n" +
" ${getGetterName(className, it, getFieldAndGetterMethod(psiClass))},\n"
Expand Down Expand Up @@ -171,7 +173,7 @@ class GenerateStreamCodecAction : AnAction() {
val decodeConstructStrBuilder = StringBuilder()
val encodeStr = StringBuilder()

fields.filter { !it.hasModifier(JvmModifier.STATIC) }.forEach {
fields.forEach {
decodeStr.append(
" ${getTypeName(it)} ${it.name} = ${getCodecRef(it.typeElement)}.decode(buf);\n"
)
Expand Down
Loading