Merge pull request #72 from dinbtechit/bug/71-Import_and_variables_co…

…lors_Python Fix - #71 initial - fixing inconsistent python highlighting.
dinbtechit · Jun 29, 2023 · 8a5ea9e · 8a5ea9e
2 parents 3ac0586 + 8e6e4ce
commit 8a5ea9e
Show file tree

Hide file tree

Showing 6 changed files with 79 additions and 5 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,8 @@
 # vscode-theme Changelog
 
 ## Unreleased
+### Fixed
+- #71 - Python - Inconsistent - Import and variables colors (initial)
 
 ## 1.8.1 - 2023-06-25
 - #67 - Fix inactive selection color in Dark Modern theme

diff --git a/gradle.properties b/gradle.properties
@@ -3,7 +3,7 @@
 pluginGroup = com.github.dinbtechit.vscodetheme
 pluginName = VSCode Theme
 # SemVer format -> https://semver.org
-pluginVersion = 1.8.1
+pluginVersion = 1.8.2
 
 # Supported build number ranges and IntelliJ Platform versions -> https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 pluginSinceBuild = 211

diff --git a/src/main/kotlin/com/github/dinbtechit/vscodetheme/annotators/PyAnnotator.kt b/src/main/kotlin/com/github/dinbtechit/vscodetheme/annotators/PyAnnotator.kt
@@ -3,10 +3,17 @@ package com.github.dinbtechit.vscodetheme.annotators
 import com.intellij.openapi.editor.DefaultLanguageHighlighterColors
 import com.intellij.openapi.editor.colors.TextAttributesKey
 import com.intellij.psi.PsiElement
-import com.intellij.psi.PsiTypeElement
-import com.intellij.psi.util.contextOfType
+import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.psi.util.elementType
 import com.intellij.util.ObjectUtils
+import com.jetbrains.python.psi.*
+import com.jetbrains.python.psi.impl.PyImportedModule
+import com.jetbrains.python.psi.impl.references.PyImportReference
+import com.jetbrains.python.psi.impl.stubs.PyClassElementType
+import com.jetbrains.python.psi.types.PyClassType
+import com.jetbrains.python.psi.types.PyType
+import com.jetbrains.python.psi.types.TypeEvalContext
+
 
 class PyAnnotator : BaseAnnotator() {
     companion object {
@@ -22,15 +29,56 @@ class PyAnnotator : BaseAnnotator() {
             "PY.SECONDARY_KEYWORD_WITH_BG",
             DEFAULT_KEYWORD
         )
+
+        val FUNCTION_WITH_BG: TextAttributesKey = TextAttributesKey.createTextAttributesKey(
+            "PY.FUNCTION_CALL",
+            DefaultLanguageHighlighterColors.FUNCTION_CALL
+        )
+
+        val CLASS_REFERENCE_WITH_BG: TextAttributesKey = TextAttributesKey.createTextAttributesKey(
+            "PY.CLASS_REFERENCE",
+            DefaultLanguageHighlighterColors.CLASS_REFERENCE
+        )
     }
 
     override fun getKeywordType(element: PsiElement): TextAttributesKey? {
         var type: TextAttributesKey? = null
+
+        if ((element.elementType is PyElementType
+                    && (element.parent is PyTargetExpression || element.parent is PyReferenceExpression)) && (element.parent !is PyFunction)
+        ) {
+            type = DefaultLanguageHighlighterColors.LOCAL_VARIABLE
+        }
+
+        if ((element.parent is PyClass && element.nextSibling is PyArgumentList)
+            || element.parent.reference?.resolve().elementType is PyClassElementType
+        ) {
+            type = CLASS_REFERENCE_WITH_BG
+        }
+
+        if ((element.parent is PyFunction && element.text != "def")
+            || (element.parent.reference?.resolve() is PyFunction && element.text != "def")
+        ) {
+            type = FUNCTION_WITH_BG
+        }
+
+        if (element.parent is PyStringLiteralExpression) {
+            type = DefaultLanguageHighlighterColors.STRING
+        }
+
+        if (element.parent.reference is PyImportReference
+            || element.parent.reference?.resolve() is PyImportedModule
+            || element.parent.reference?.resolve() is PyFile) {
+            type = CLASS_REFERENCE_WITH_BG
+        }
+
         when (element.text) {
             "import", "as", "in",
             "continue", "del", "assert", "break", "finally", "for", "from",
             "elif", "else", "if", "except", "pass", "raise", "return", "try", "while",
             "with" -> type = SECONDARY_KEYWORD
+
+            "self" -> type = DEFAULT_KEYWORD
             "async", "await" -> type = SECONDARY_KEYWORD_WITH_BG
             else -> {}
         }

diff --git a/src/main/resources/themes/vscode_dark.xml b/src/main/resources/themes/vscode_dark.xml
@@ -974,12 +974,24 @@
                 <option name="FOREGROUND" value="4ec9b0"/>
             </value>
         </option>
-        <option name="PY.DECORATOR">
+        <option name="PY.CLASS_REFERENCE">
             <value>
                 <option name="FOREGROUND" value="4ec9b0"/>
+                <option name="BACKGROUND" value="1e1e1e"/>
+            </value>
+        </option>
+        <option name="PY.DECORATOR">
+            <value>
+                <option name="FOREGROUND" value="47ccb1"/>
                 <option name="EFFECT_TYPE" value="1"/>
             </value>
         </option>
+        <option name="PY.FUNCTION_CALL">
+            <value>
+                <option name="FOREGROUND" value="dbdbaa"/>
+                <option name="BACKGROUND" value="1e1e1e"/>
+            </value>
+        </option>
         <option name="PY.KEYWORD_ARGUMENT">
             <value>
                 <option name="FOREGROUND" value="94dbfd"/>

diff --git a/src/main/resources/themes/vscode_dark_brighter.xml b/src/main/resources/themes/vscode_dark_brighter.xml
@@ -974,12 +974,24 @@
                 <option name="FOREGROUND" value="47ccb1"/>
             </value>
         </option>
+        <option name="PY.CLASS_REFERENCE">
+            <value>
+                <option name="FOREGROUND" value="47ccb1"/>
+                <option name="BACKGROUND" value="1e1e1e"/>
+            </value>
+        </option>
         <option name="PY.DECORATOR">
             <value>
                 <option name="FOREGROUND" value="47ccb1"/>
                 <option name="EFFECT_TYPE" value="1"/>
             </value>
         </option>
+        <option name="PY.FUNCTION_CALL">
+            <value>
+                <option name="FOREGROUND" value="e6e6aa"/>
+                <option name="BACKGROUND" value="1e1e1e"/>
+            </value>
+        </option>
         <option name="PY.KEYWORD_ARGUMENT">
             <value>
                 <option name="FOREGROUND" value="94dbfd"/>