Skip to content

Commit 5aa6661

Browse files
committed
style: detekt
1 parent c6d26e0 commit 5aa6661

File tree

1 file changed

+43
-35
lines changed

1 file changed

+43
-35
lines changed

marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/presentation/JVMVariableNode.kt

+43-35
Original file line numberDiff line numberDiff line change
@@ -83,42 +83,9 @@ class JVMVariableNode(
8383
if (variable.value == null && variable.liveIdentity == null) {
8484
presentation.addText("null", REGULAR_ATTRIBUTES)
8585
} else if (variable.liveClazz != null && primitives.contains(variable.liveClazz)) {
86-
if (variable.liveClazz == "java.lang.Boolean") {
87-
presentation.addText(variable.value.toString(), REGULAR_ATTRIBUTES)
88-
} else if (variable.liveClazz == "java.lang.Character") {
89-
presentation.addText(
90-
"'" + variable.value + "' " + (variable.value as String).toCharArray()[0].toInt(),
91-
REGULAR_ATTRIBUTES
92-
)
93-
} else if (variable.liveClazz == "java.lang.String") {
94-
presentation.addText("\"" + variable.value + "\"", fromTextAttributes(scheme.getAttributes(STRING)))
95-
} else if (numerals.contains(variable.liveClazz)) {
96-
presentation.addText(variable.value.toString(), fromTextAttributes(scheme.getAttributes(NUMBER)))
97-
}
98-
presentation.setIcon(AllIcons.Debugger.Db_primitive)
86+
presentPrimitive(variable, presentation)
9987
} else if (variable.liveClazz != null) {
100-
val simpleClassName = variable.liveClazz!!.substringAfterLast(".")
101-
var identity = variable.liveIdentity ?: ""
102-
if (identity.isNotEmpty()) {
103-
identity = "@$identity"
104-
}
105-
if (variable.presentation != null) {
106-
presentation.addText("{ $simpleClassName$identity } ", GRAYED_ATTRIBUTES)
107-
presentation.addText("\"${variable.presentation}\"", REGULAR_ATTRIBUTES)
108-
} else {
109-
presentation.addText("{ $simpleClassName$identity }", GRAYED_ATTRIBUTES)
110-
}
111-
presentation.setIcon(AllIcons.Debugger.Value)
112-
113-
val varValue = variable.value
114-
if (varValue is JsonObject && varValue.getString("@skip") != null) {
115-
val skipReason = varValue.getString("@skip")
116-
if (skipReason == "EXCEPTION_OCCURRED" && varValue.getString("@toString") != null) {
117-
presentation.addText(" " + varValue.getString("@toString"), ERROR_ATTRIBUTES)
118-
} else {
119-
presentation.addText(" $skipReason", ERROR_ATTRIBUTES)
120-
}
121-
}
88+
presentLiveClazz(variable, presentation)
12289
} else {
12390
if (variable.value is LiveVariable) {
12491
val liveVar = variable.value as LiveVariable
@@ -151,4 +118,45 @@ class JVMVariableNode(
151118
}
152119
}
153120
}
121+
122+
private fun presentLiveClazz(variable: LiveVariable, presentation: PresentationData) {
123+
val simpleClassName = variable.liveClazz!!.substringAfterLast(".")
124+
var identity = variable.liveIdentity ?: ""
125+
if (identity.isNotEmpty()) {
126+
identity = "@$identity"
127+
}
128+
if (variable.presentation != null) {
129+
presentation.addText("{ $simpleClassName$identity } ", GRAYED_ATTRIBUTES)
130+
presentation.addText("\"${variable.presentation}\"", REGULAR_ATTRIBUTES)
131+
} else {
132+
presentation.addText("{ $simpleClassName$identity }", GRAYED_ATTRIBUTES)
133+
}
134+
presentation.setIcon(AllIcons.Debugger.Value)
135+
136+
val varValue = variable.value
137+
if (varValue is JsonObject && varValue.getString("@skip") != null) {
138+
val skipReason = varValue.getString("@skip")
139+
if (skipReason == "EXCEPTION_OCCURRED" && varValue.getString("@toString") != null) {
140+
presentation.addText(" " + varValue.getString("@toString"), ERROR_ATTRIBUTES)
141+
} else {
142+
presentation.addText(" $skipReason", ERROR_ATTRIBUTES)
143+
}
144+
}
145+
}
146+
147+
private fun presentPrimitive(variable: LiveVariable, presentation: PresentationData) {
148+
if (variable.liveClazz == "java.lang.Boolean") {
149+
presentation.addText(variable.value.toString(), REGULAR_ATTRIBUTES)
150+
} else if (variable.liveClazz == "java.lang.Character") {
151+
presentation.addText(
152+
"'" + variable.value + "' " + (variable.value as String).toCharArray()[0].toInt(),
153+
REGULAR_ATTRIBUTES
154+
)
155+
} else if (variable.liveClazz == "java.lang.String") {
156+
presentation.addText("\"" + variable.value + "\"", fromTextAttributes(scheme.getAttributes(STRING)))
157+
} else if (numerals.contains(variable.liveClazz)) {
158+
presentation.addText(variable.value.toString(), fromTextAttributes(scheme.getAttributes(NUMBER)))
159+
}
160+
presentation.setIcon(AllIcons.Debugger.Db_primitive)
161+
}
154162
}

0 commit comments

Comments
 (0)