JS annotator improvement

dinbtechit · Jun 13, 2022 · 287d689 · 287d689
1 parent 7b8cfa2
commit 287d689
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/main/kotlin/com/github/dinbtechit/vscodetheme/annotators/JSAnnotator.kt b/src/main/kotlin/com/github/dinbtechit/vscodetheme/annotators/JSAnnotator.kt
@@ -2,7 +2,8 @@ package com.github.dinbtechit.vscodetheme.annotators
 
 import com.intellij.lang.ecmascript6.psi.ES6FromClause
 import com.intellij.lang.ecmascript6.psi.ES6ImportSpecifier
-import com.intellij.lang.ecmascript6.psi.ES6ImportSpecifierAlias
+import com.intellij.lang.javascript.psi.JSLoopStatement
+import com.intellij.lang.javascript.psi.JSStatement
 import com.intellij.openapi.editor.DefaultLanguageHighlighterColors
 import com.intellij.openapi.editor.colors.TextAttributesKey
 import com.intellij.psi.PsiElement
@@ -38,9 +39,9 @@ class JSAnnotator : BaseAnnotator() {
         var type: TextAttributesKey? = null
         when (element.text) {
             "package", "export", "import", "require", "module", "return" -> type = SECONDARY_KEYWORDS
-            "await","try", "throw", "catch", "finally", "yield", "break", "continue", "with",
+            "await", "try", "throw", "catch", "finally", "yield", "break", "continue", "with",
             "if", "else", "switch", "case", "default" -> type = SECONDARY_KEYWORDS
-            "for", "while", "do" -> type = SECONDARY_KEYWORDS
+            "for", "while", "do" -> if (element.context is JSLoopStatement) type = SECONDARY_KEYWORDS
             "from" -> if (element.parent is ES6FromClause) type = FROM_KEYWORD
             "null", "undefined" -> type = JS_NULL
             "console" -> type = JS_KEYWORD