update

Former-commit-id: 68ed8fa

Author: BFergerson

gradle.properties

@@ -4,7 +4,7 @@ kotlin.code.style=official
 
 pluginGroup = spp.jetbrains
 pluginName = Source++
-pluginVersion = 0.2.1
+pluginVersion = 0.2.2
 pluginSinceBuild = 202.4357
 # Plugin Verifier integration -> https://github.com/JetBrains/gradle-intellij-plugin#plugin-verifier-dsl
 # See https://jb.gg/intellij-platform-builds-list for available build versions

marker/py-marker/src/main/kotlin/spp/jetbrains/marker/py/PythonVariableSimpleNode.kt

@@ -22,7 +22,10 @@ class PythonVariableSimpleNode(private val variable: LiveVariable) : SimpleNode(
 
     override fun getChildren(): Array<SimpleNode> {
         if (variable.liveClazz == "<class 'dict'>") {
-            val dict = JsonObject((variable.value as String).replace("'", "\""))
+            val dict = JsonObject(
+                (variable.value as String).replace("'", "\"")
+                    .replace(": True", ": true").replace(": False", ": false")
+            )
             val children = mutableListOf<SimpleNode>()
             dict.map.forEach {
                 children.add(PythonVariableSimpleNode(LiveVariable("'" + it.key + "'", it.value)))
@@ -46,29 +49,29 @@ class PythonVariableSimpleNode(private val variable: LiveVariable) : SimpleNode(
             )
         }
 
-        when (variable.liveClazz) {
-            "<class 'dict'>" -> {
+        when {
+            variable.liveClazz == "<class 'int'>" || variable.value is Number -> {
                 presentation.addText(
                     variable.value.toString(),
-                    SimpleTextAttributes.fromTextAttributes(scheme.getAttributes(DefaultLanguageHighlighterColors.IDENTIFIER))
+                    SimpleTextAttributes.fromTextAttributes(
+                        scheme.getAttributes(DefaultLanguageHighlighterColors.NUMBER)
+                    )
                 )
             }
-            "<class 'str'>" -> {
+            variable.liveClazz == "<class 'str'>" -> {
                 presentation.addText(
                     "\"" + variable.value + "\"",
-                    SimpleTextAttributes.fromTextAttributes(scheme.getAttributes(DefaultLanguageHighlighterColors.STRING))
-                )
-            }
-            "<class 'NoneType'>" -> {
-                presentation.addText(
-                    variable.value.toString(),
-                    SimpleTextAttributes.fromTextAttributes(scheme.getAttributes(DefaultLanguageHighlighterColors.IDENTIFIER))
+                    SimpleTextAttributes.fromTextAttributes(
+                        scheme.getAttributes(DefaultLanguageHighlighterColors.STRING)
+                    )
                 )
             }
             else -> {
                 presentation.addText(
                     variable.value.toString(),
-                    SimpleTextAttributes.fromTextAttributes(scheme.getAttributes(DefaultLanguageHighlighterColors.CONSTANT))
+                    SimpleTextAttributes.fromTextAttributes(
+                        scheme.getAttributes(DefaultLanguageHighlighterColors.IDENTIFIER)
+                    )
                 )
             }
         }

plugin/CHANGELOG.md

@@ -4,7 +4,7 @@
 
 ## [Unreleased]
 
-## [0.2.1] - 2021-11-22
+## [0.2.2] - 2021-11-23
 - Improved Python live breakpoint display
 
 ## [0.2.0] - 2021-11-20