feat: When theme is not selected. Popup will be displayed to apply theme.

Author: dinbtechit

.gitignore

@@ -2,4 +2,4 @@
 .idea
 .qodana
 build
-/.idea/**
+.idea/**

CHANGELOG.md

@@ -3,6 +3,8 @@
 # vscode-theme Changelog
 
 ## [Unreleased]
+### Fixed
+- [Bug] - Kotlin - Removing incorrect highlighting for catch 
 
 ## [1.5.2]
 - When theme is not selected. Popup will be displayed to apply theme.
@@ -74,4 +76,4 @@
 - Added extensive syntax highlighting for Dart/Flutter.
 
 ### Fixed
-- WelcomeScreen color issues and Toolbar border
+- WelcomeScreen color issues and Toolbar border

gradle.properties

@@ -4,7 +4,7 @@
 pluginGroup = com.github.dinbtechit.vscodetheme
 pluginName = VSCode Theme
 # SemVer format -> https://semver.org
-pluginVersion = 1.5.2
+pluginVersion = 1.5.3
 
 # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html
 # for insight into build numbers and IntelliJ Platform versions.

src/main/kotlin/com/github/dinbtechit/vscodetheme/VSCodeThemeManager.kt

@@ -20,20 +20,26 @@ class VSCodeThemeManager {
 
     private fun getPlugin(): IdeaPluginDescriptor? = PluginManagerCore.getPlugin(PluginId.getId(pluginId))
     fun isVSCodeThemeReady(): Boolean {
-        val vscodeTheme = LafManager.getInstance().installedLookAndFeels.first { it.name == "VSCode Dark" }
-        if (vscodeTheme != null && getPlugin()?.isEnabled != null) {
-            return true
+        try {
+
+            if (getPlugin()?.isEnabled != null) {
+                val vscodeTheme = LafManager.getInstance().installedLookAndFeels.first { it.name == "VSCode Dark" }
+                return vscodeTheme != null
+            }
+            return false
+        } catch (e: Exception) {
+            return false;
         }
-        return false
     }
 
     fun switchToVSCodeTheme(always: Boolean = false) {
-        val vscodeTheme = LafManager.getInstance().installedLookAndFeels.first { it.name == "VSCode Dark" }
-        LafManager.getInstance().currentLookAndFeel = vscodeTheme
-        if (always) {
-            val settings = VSCodeThemeSettingsStore.instance
-            settings.alwaysApply = true
-            settings.showNotificationOnUpdate = false
+        if (isVSCodeThemeReady()) {
+            val vscodeTheme = LafManager.getInstance().installedLookAndFeels.first { it.name == "VSCode Dark" }
+            LafManager.getInstance().currentLookAndFeel = vscodeTheme
+            if (always) {
+                val settings = VSCodeThemeSettingsStore.instance
+                settings.alwaysApply = true
+            }
         }
     }
 }

src/main/kotlin/com/github/dinbtechit/vscodetheme/actions/AlwaysApplyThemeAction.kt

@@ -6,7 +6,7 @@ import com.intellij.notification.impl.NotificationsManagerImpl
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.project.DumbAwareAction
 
-class AlwaysApplyThemeAction: DumbAwareAction("Always") {
+class AlwaysApplyThemeAction: DumbAwareAction("Set as Default") {
 
     override fun actionPerformed(e: AnActionEvent) {
         VSCodeThemeManager.getInstance().switchToVSCodeTheme(true)

src/main/kotlin/com/github/dinbtechit/vscodetheme/annotators/KotlinAnnotator.kt

@@ -22,15 +22,20 @@ class KotlinAnnotator : BaseAnnotator() {
             "JAVA.TYPE_KEYWORD",
             DEFAULT_KEYWORD
         )
+        val SECONDARY_KEYWORD_BG: TextAttributesKey = TextAttributesKey.createTextAttributesKey(
+            "DEFAULT_SECONDARY_KEYWORD_WITH_BG",
+            DEFAULT_KEYWORD
+        )
     }
 
     override fun getKeywordType(element: PsiElement): TextAttributesKey? {
         var type: TextAttributesKey? = null
-        if (element.elementType is KtKeywordToken || element.text == "catch" ) {
+        if (element.elementType is KtKeywordToken) {
             when (element.text) {
                 "return", "as" -> type = SECONDARY_KEYWORD
                 "if", "else", "when", "default", "break", "continue" -> type = SECONDARY_KEYWORD
-                "try", "catch", "finally", "throw" -> type = SECONDARY_KEYWORD
+                "try", "finally", "throw" -> type = SECONDARY_KEYWORD
+                "catch" -> type = SECONDARY_KEYWORD_BG
                 "for", "while", "do" -> type = SECONDARY_KEYWORD
                 else -> {}
             }

src/main/kotlin/com/github/dinbtechit/vscodetheme/startup/VSCodeStartupNotifyActivity.kt

@@ -5,17 +5,21 @@ import com.github.dinbtechit.vscodetheme.actions.AlwaysApplyThemeAction
 import com.github.dinbtechit.vscodetheme.actions.ApplyThemeAction
 import com.github.dinbtechit.vscodetheme.actions.DonateAction
 import com.github.dinbtechit.vscodetheme.icons.VSCodeIcons
+import com.github.dinbtechit.vscodetheme.services.ApplicationService
 import com.github.dinbtechit.vscodetheme.settings.VSCodeThemeSettingsStore
 import com.intellij.ide.plugins.IdeaPluginDescriptor
 import com.intellij.ide.plugins.PluginManagerCore
 import com.intellij.ide.ui.LafManager
 import com.intellij.notification.Notification
 import com.intellij.notification.NotificationGroupManager
 import com.intellij.notification.NotificationType
+import com.intellij.notification.impl.NotificationsManagerImpl
 import com.intellij.openapi.extensions.PluginId
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.startup.StartupActivity
+import com.intellij.openapi.ui.popup.Balloon
 import com.intellij.openapi.wm.WindowManager
+import com.intellij.ui.BalloonLayoutData
 import com.intellij.ui.awt.RelativePoint
 import java.awt.Point
 
@@ -95,22 +99,25 @@ class VSCodeStartupNotifyActivity : StartupActivity {
     }
 
     private fun showFullNotification(project: Project, notification: Notification) {
-        val frame = WindowManager.getInstance().getIdeFrame(project)
-        if (frame == null) {
+        try {
+//            val frame = WindowManager.getInstance().getIdeFrame(project)
+//            if (frame == null) {
+//                notification.notify(project)
+//                return
+//            }
+//            val bounds = frame.component.bounds
+//            val target = RelativePoint(frame.component, Point(bounds.x + bounds.width, 20))
+//            NotificationsManagerImpl.createBalloon(
+//                frame,
+//                notification,
+//                true, // showCallout
+//                false, // hideOnClickOutside
+//                BalloonLayoutData.fullContent(),
+//                ApplicationService.INSTANCE
+//            ).show(target, Balloon.Position.atLeft)
+            notification.notify(project)
+        } catch(e: Exception) {
             notification.notify(project)
-            return
         }
-        val bounds = frame.component.bounds
-        val target = RelativePoint(frame.component, Point(bounds.x + bounds.width, 20))
-        /*NotificationsManagerImpl.createBalloon(
-            frame,
-            notification,
-            true, // showCallout
-            false, // hideOnClickOutside
-            BalloonLayoutData.fullContent(),
-            ApplicationService.INSTANCE
-        ).show(target, Balloon.Position.atLeft)*/
-
-        notification.notify(project)
     }
 }

src/main/resources/META-INF/plugin.xml

@@ -1,5 +1,5 @@
 <!-- Plugin Configuration File. Read more: https://plugins.jetbrains.com/docs/intellij/plugin-configuration-file.html -->
-<idea-plugin>
+<idea-plugin require-restart="true">
     <id>com.github.dinbtechit.vscodetheme</id>
     <name>VSCode Theme</name>
     <vendor>dinbtechit</vendor>