Merge pull request #43 from dinbtechit/feature/42-Error_when_openning…

…_ide Feature/42 error when openning ide
dinbtechit · Dec 8, 2022 · 2b1122c · 2b1122c
2 parents 80148ca + c1f4bc6
commit 2b1122c
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 48 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,10 +3,15 @@
 # vscode-theme Changelog
 
 ## [Unreleased]
+### Changed
+- GoLang - Package identifier blue instead of white. Maybe slightly off. 
+
+### Fixed
+- #42 - Fix Startup errors.
 
 ## [1.7.4]
-### Changed
-- Default Annotation - Decommissioning Default Annotator due to Issue #38
+### Changed
+- Default Annotation - Decommissioning Default Annotator due to Issue #38
 - Typescript await keyword inconsistency.
 
 ## [1.7.3]
@@ -124,4 +129,4 @@
 - Added extensive syntax highlighting for Dart/Flutter.
 
 ### Fixed
-- WelcomeScreen color issues and Toolbar border
+- WelcomeScreen color issues and Toolbar border
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.7.4
+pluginVersion = 1.7.5
 
 # 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/CLionAnnotator.kt b/src/main/kotlin/com/github/dinbtechit/vscodetheme/annotators/CLionAnnotator.kt
@@ -14,9 +14,8 @@ class CLionAnnotator : BaseAnnotator() {
             "DEFAULT_SECONDARY_KEYWORD",
             DEFAULT_KEYWORD
         )
-        val SECONDARY_KEYWORD_BG: TextAttributesKey = TextAttributesKey.createTextAttributesKey(
-            "DEFAULT_SECONDARY_KEYWORD_WITH_BG",
-            DEFAULT_KEYWORD
+        val SECONDARY_KEYWORD_BG: TextAttributesKey = ObjectUtils.notNull(
+            TextAttributesKey.find("DEFAULT_SECONDARY_KEYWORD_WITH_BG"), DefaultLanguageHighlighterColors.KEYWORD
         )
     }
     override fun getKeywordType(element: PsiElement): TextAttributesKey? {

diff --git a/src/main/kotlin/com/github/dinbtechit/vscodetheme/annotators/GoAnnotator.kt b/src/main/kotlin/com/github/dinbtechit/vscodetheme/annotators/GoAnnotator.kt
@@ -14,9 +14,8 @@ class GoAnnotator : BaseAnnotator() {
             "DEFAULT_SECONDARY_KEYWORD",
             DEFAULT_KEYWORD
         )
-        val SECONDARY_KEYWORD_BG: TextAttributesKey = TextAttributesKey.createTextAttributesKey(
-            "DEFAULT_SECONDARY_KEYWORD_WITH_BG",
-            DEFAULT_KEYWORD
+        val SECONDARY_KEYWORD_BG: TextAttributesKey = ObjectUtils.notNull(
+            TextAttributesKey.find("DEFAULT_SECONDARY_KEYWORD_WITH_BG"), DefaultLanguageHighlighterColors.KEYWORD
         )
     }
 

diff --git a/src/main/kotlin/com/github/dinbtechit/vscodetheme/annotators/JSAnnotator.kt b/src/main/kotlin/com/github/dinbtechit/vscodetheme/annotators/JSAnnotator.kt
@@ -1,18 +1,12 @@
 package com.github.dinbtechit.vscodetheme.annotators
 
 import com.intellij.lang.ecmascript6.psi.ES6FromClause
-import com.intellij.lang.ecmascript6.psi.ES6ImportDeclaration
 import com.intellij.lang.ecmascript6.psi.ES6ImportSpecifier
 import com.intellij.lang.ecmascript6.psi.ES6ImportedBinding
-import com.intellij.lang.ecmascript6.types.ES6ImportDeclarationElementType
-import com.intellij.lang.javascript.JSElementType
 import com.intellij.lang.javascript.psi.JSLoopStatement
-import com.intellij.lang.javascript.psi.JSReferenceExpression
-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
-import com.intellij.psi.impl.source.tree.LeafPsiElement
 import com.intellij.util.ObjectUtils
 
 class JSAnnotator : BaseAnnotator() {
@@ -35,8 +29,8 @@ class JSAnnotator : BaseAnnotator() {
             "JS.SECONDARY_KEYWORDS", JS_KEYWORD
         )
 
-        val SECONDARY_KEYWORDS_WITH_BG: TextAttributesKey = TextAttributesKey.createTextAttributesKey(
-            "DEFAULT_SECONDARY_KEYWORD_WITH_BG", JS_KEYWORD
+        val SECONDARY_KEYWORDS_WITH_BG: TextAttributesKey = ObjectUtils.notNull(
+            TextAttributesKey.find("DEFAULT_SECONDARY_KEYWORD_WITH_BG"), JS_KEYWORD
         )
 
         val FROM_KEYWORD: TextAttributesKey = TextAttributesKey.createTextAttributesKey(

diff --git a/src/main/kotlin/com/github/dinbtechit/vscodetheme/annotators/KotlinAnnotator.kt b/src/main/kotlin/com/github/dinbtechit/vscodetheme/annotators/KotlinAnnotator.kt
@@ -1,21 +1,12 @@
 package com.github.dinbtechit.vscodetheme.annotators
 
-import com.intellij.lang.ParserDefinition
 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.impl.source.tree.LeafPsiElement
-import com.intellij.psi.util.elementType
 import com.intellij.util.ObjectUtils
-import org.jetbrains.kotlin.idea.editor.wordSelection.KotlinStringLiteralSelectioner
-import org.jetbrains.kotlin.lexer.KtKeywordToken
 import org.jetbrains.kotlin.lexer.KtTokens
-import org.jetbrains.kotlin.parsing.KotlinParserDefinition
-import org.jetbrains.kotlin.psi.KtElement
-import org.jetbrains.kotlin.psi.KtLiteralStringTemplateEntry
-import org.jetbrains.kotlin.psi.KtStringTemplateEntry
-import org.jetbrains.uast.kotlin.KotlinStringULiteralExpression
 
 class KotlinAnnotator : BaseAnnotator() {
     companion object {
@@ -31,9 +22,8 @@ class KotlinAnnotator : BaseAnnotator() {
             "JAVA.TYPE_KEYWORD",
             DEFAULT_KEYWORD
         )
-        val SECONDARY_KEYWORD_BG: TextAttributesKey = TextAttributesKey.createTextAttributesKey(
-            "DEFAULT_SECONDARY_KEYWORD_WITH_BG",
-            DEFAULT_KEYWORD
+        val SECONDARY_KEYWORD_BG: TextAttributesKey = ObjectUtils.notNull(
+            TextAttributesKey.find("DEFAULT_SECONDARY_KEYWORD_WITH_BG"), DefaultLanguageHighlighterColors.KEYWORD
         )
     }
 

diff --git a/src/main/kotlin/com/github/dinbtechit/vscodetheme/annotators/RustAnnotator.kt b/src/main/kotlin/com/github/dinbtechit/vscodetheme/annotators/RustAnnotator.kt
@@ -3,6 +3,7 @@ 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.util.ObjectUtils
 
 
 class RustAnnotator : BaseAnnotator() {
@@ -13,9 +14,8 @@ class RustAnnotator : BaseAnnotator() {
             "DEFAULT_SECONDARY_KEYWORD",
             DEFAULT_KEYWORD
         )
-        val SECONDARY_KEYWORD_BG: TextAttributesKey = TextAttributesKey.createTextAttributesKey(
-            "DEFAULT_SECONDARY_KEYWORD_WITH_BG",
-            DEFAULT_KEYWORD
+        val SECONDARY_KEYWORD_BG: TextAttributesKey = ObjectUtils.notNull(
+            TextAttributesKey.find("DEFAULT_SECONDARY_KEYWORD_WITH_BG"), DefaultLanguageHighlighterColors.KEYWORD
         )
     }
 

diff --git a/src/main/resources/themes/vscode_dark.xml b/src/main/resources/themes/vscode_dark.xml
@@ -302,7 +302,7 @@
         </option>
         <option name="DEFAULT_IDENTIFIER">
             <value>
-                <option name="FOREGROUND" value="dcdcaa"/>
+                <option name="FOREGROUND" value="94dbfd"/>
             </value>
         </option>
         <option name="DEFAULT_INSTANCE_FIELD">
@@ -478,11 +478,7 @@
             </value>
         </option>
         <option name="GO_METHOD_RECEIVER" baseAttributes="DEFAULT_LOCAL_VARIABLE"/>
-        <option name="GO_PACKAGE">
-            <value>
-                <option name="FOREGROUND" value="d4d4d4"/>
-            </value>
-        </option>
+        <option name="GO_PACKAGE" baseAttributes="DEFAULT_IDENTIFIER"/>
         <option name="GO_PACKAGE_EXPORTED_CONSTANT">
             <value>
                 <option name="FOREGROUND" value="9cdcfe"/>

diff --git a/src/main/resources/themes/vscode_dark_brighter.xml b/src/main/resources/themes/vscode_dark_brighter.xml
@@ -1,9 +1,9 @@
 <scheme name="VSCode Dark Brighter" version="142" parent_scheme="Darcula">
     <metaInfo>
-        <property name="created">2022-11-07T10:14:49</property>
+        <property name="created">2022-12-08T18:02:31</property>
         <property name="ide">idea</property>
-        <property name="ideVersion">2022.2.3.0.0</property>
-        <property name="modified">2022-11-07T10:14:58</property>
+        <property name="ideVersion">2022.1.1.0.0</property>
+        <property name="modified">2022-12-08T18:02:39</property>
         <property name="originalScheme">_@user_VSCode Dark Brighter</property>
     </metaInfo>
     <colors>
@@ -302,7 +302,7 @@
         </option>
         <option name="DEFAULT_IDENTIFIER">
             <value>
-                <option name="FOREGROUND" value="e6e6aa"/>
+                <option name="FOREGROUND" value="94dbfd"/>
             </value>
         </option>
         <option name="DEFAULT_INSTANCE_FIELD">
@@ -478,11 +478,7 @@
             </value>
         </option>
         <option name="GO_METHOD_RECEIVER" baseAttributes="DEFAULT_LOCAL_VARIABLE"/>
-        <option name="GO_PACKAGE">
-            <value>
-                <option name="FOREGROUND" value="d4d4d4"/>
-            </value>
-        </option>
+        <option name="GO_PACKAGE" baseAttributes="DEFAULT_IDENTIFIER"/>
         <option name="GO_PACKAGE_EXPORTED_CONSTANT">
             <value>
                 <option name="FOREGROUND" value="8cd7ff"/>