User: rednesto
Date: 02 Jul 23 22:05
Revision: 8c0b81df7c01167bbc1b697c6948e02a4355e023
Summary:
Merge branch '2023.1' into 2023.2


TeamCity URL: https://ci.mcdev.io/viewModification.html?tab=vcsModificationFiles&modId=8569&personal=false

Index: gradle.properties
===================================================================
--- gradle.properties	(revision 9fe419c236a7fb1b8be768e73055142b27664782)
+++ gradle.properties	(revision 8c0b81df7c01167bbc1b697c6948e02a4355e023)
@@ -24,7 +24,7 @@
 ideaVersion = 232.8453.116-EAP-SNAPSHOT
 ideaVersionName = 2023.2
 
-coreVersion = 1.6.6
+coreVersion = 1.6.7
 downloadIdeaSources = true
 
 pluginTomlVersion = 232.8453.111
Index: src/main/kotlin/insight/ColorLineMarkerProvider.kt
===================================================================
--- src/main/kotlin/insight/ColorLineMarkerProvider.kt	(revision 9fe419c236a7fb1b8be768e73055142b27664782)
+++ src/main/kotlin/insight/ColorLineMarkerProvider.kt	(revision 8c0b81df7c01167bbc1b697c6948e02a4355e023)
@@ -21,6 +21,7 @@
 package com.demonwav.mcdev.insight
 
 import com.demonwav.mcdev.MinecraftSettings
+import com.demonwav.mcdev.util.runCatchingKtIdeaExceptions
 import com.intellij.codeInsight.daemon.GutterIconNavigationHandler
 import com.intellij.codeInsight.daemon.LineMarkerInfo
 import com.intellij.codeInsight.daemon.LineMarkerProvider
@@ -52,7 +53,9 @@
         }
 
         val identifier = element.toUElementOfType<UIdentifier>() ?: return null
-        val info = identifier.findColor { map, chosen -> ColorInfo(element, chosen.value, map, chosen.key, identifier) }
+        val info = runCatchingKtIdeaExceptions {
+            identifier.findColor { map, chosen -> ColorInfo(element, chosen.value, map, chosen.key, identifier) }
+        }
         if (info != null) {
             NavigateAction.setNavigateAction(info, "Change Color", null)
         }
@@ -164,6 +167,7 @@
                         }
                     }
                 }
+
                 is UCallExpression -> {
                     if (workElement.methodName == "hsvLike") {
                         val (h, s, v) = Color.RGBtoHSB(c.red, c.green, c.blue, null)