Skip to content

Commit 7be340c

Browse files
authored
Merge pull request #3 from QiuShui1012/master
修复生成错误
2 parents 909a155 + e8ba4c1 commit 7be340c

2 files changed

Lines changed: 7 additions & 5 deletions

File tree

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ plugins {
55
}
66

77
group = "io.github.tt432"
8-
version = "1.2-SNAPSHOT"
8+
version = "1.2.1-SNAPSHOT"
99

1010
repositories {
1111
mavenCentral()

src/main/kotlin/io/github/tt432/k9tools/GenerateStreamCodecAction.kt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,13 @@ class GenerateStreamCodecAction : AnAction() {
122122

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

125-
val fields = psiClass.allFields
125+
val className = psiClass.name!!
126+
127+
var fields = psiClass.allFields
126128

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

129-
val className = psiClass.name!!
131+
fields = fields.filter { !it.hasModifier(JvmModifier.STATIC) }.toTypedArray()
130132

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

144-
fields.filter { !it.hasModifier(JvmModifier.STATIC) }.forEach {
146+
fields.forEach {
145147
fieldsStr.append(
146148
" ${getCodecRef(it.typeElement)},\n" +
147149
" ${getGetterName(className, it, getFieldAndGetterMethod(psiClass))},\n"
@@ -171,7 +173,7 @@ class GenerateStreamCodecAction : AnAction() {
171173
val decodeConstructStrBuilder = StringBuilder()
172174
val encodeStr = StringBuilder()
173175

174-
fields.filter { !it.hasModifier(JvmModifier.STATIC) }.forEach {
176+
fields.forEach {
175177
decodeStr.append(
176178
" ${getTypeName(it)} ${it.name} = ${getCodecRef(it.typeElement)}.decode(buf);\n"
177179
)

0 commit comments

Comments
 (0)