Merge branch '2020.2' into 2020.3

# Conflicts:
#	src/main/kotlin/insight/ColorLineMarkerProvider.kt

Author: RedNesto

readme.md

@@ -12,21 +12,25 @@ Minecraft Development for IntelliJ
         <td colspan="2"><a href="https://ci.demonwav.com/viewType.html?buildTypeId=MinecraftDev_Build"><img src="https://tc.demonwav.com/app/rest/builds/buildType:(id:MinecraftDev_Build)/statusIcon.svg" alt="Teamcity Build Status" /></a></td>
     </tr>
     <tr>
-        <td align="right" rowspan="4" ><b>Nightly Builds</b></td>
+        <td align="right" rowspan="5" ><b>Nightly Builds</b></td>
         <td align="left">2020.1</td>
-        <td align="left"><a href="https://ci.demonwav.com/viewType.html?buildTypeId=MinecraftDev_Nightly_20201"><img src="https://tc.demonwav.com/app/rest/builds/buildType:(id:MinecraftDev_Nightly_20201)/statusIcon.svg" alt="2020.1 Nightly Status" /></a></td>
+        <td align="left"><a href="https://ci.denwav.dev/viewType.html?buildTypeId=MinecraftDev_Nightly_20201"><img src="https://ci.denwav.dev/app/rest/builds/buildType:(id:MinecraftDev_Nightly_20201)/statusIcon.svg" alt="2020.1 Nightly Status" /></a></td>
     </tr>
     <tr>
         <td align="left">2020.2</td>
-        <td align="left"><a href="https://ci.demonwav.com/viewType.html?buildTypeId=MinecraftDev_Nightly_20202"><img src="https://tc.demonwav.com/app/rest/builds/buildType:(id:MinecraftDev_Nightly_20202)/statusIcon.svg" alt="2020.2 Nightly Status" /></a></td>
+        <td align="left"><a href="https://ci.denwav.dev/viewType.html?buildTypeId=MinecraftDev_Nightly_20202"><img src="https://ci.denwav.dev/app/rest/builds/buildType:(id:MinecraftDev_Nightly_20202)/statusIcon.svg" alt="2020.2 Nightly Status" /></a></td>
     </tr>
     <tr>
         <td align="left">2020.3</td>
-        <td align="left"><a href="https://ci.demonwav.com/viewType.html?buildTypeId=MinecraftDev_Nightly_20203"><img src="https://tc.demonwav.com/app/rest/builds/buildType:(id:MinecraftDev_Nightly_20203)/statusIcon.svg" alt="2020.3 Nightly Status" /></a></td>
+        <td align="left"><a href="https://ci.denwav.dev/viewType.html?buildTypeId=MinecraftDev_Nightly_20203"><img src="https://ci.denwav.dev/app/rest/builds/buildType:(id:MinecraftDev_Nightly_20203)/statusIcon.svg" alt="2020.3 Nightly Status" /></a></td>
     </tr>
     <tr>
         <td align="left">2021.1</td>
-        <td align="left"><a href="https://ci.demonwav.com/viewType.html?buildTypeId=MinecraftDev_Nightly_20211"><img src="https://tc.demonwav.com/app/rest/builds/buildType:(id:MinecraftDev_Nightly_20211)/statusIcon.svg" alt="2021.1 EAP Nightly Status" /></a></td>
+        <td align="left"><a href="https://ci.denwav.dev/viewType.html?buildTypeId=MinecraftDev_Nightly_20211"><img src="https://ci.denwav.dev/app/rest/builds/buildType:(id:MinecraftDev_Nightly_20211)/statusIcon.svg" alt="2021.1 Nightly Status" /></a></td>
+    </tr>
+    <tr>
+        <td align="left">2021.2 EAP</td>
+        <td align="left"><a href="https://ci.denwav.dev/viewType.html?buildTypeId=MinecraftDev_Nightly_20212"><img src="https://ci.denwav.dev/app/rest/builds/buildType:(id:MinecraftDev_Nightly_20212)/statusIcon.svg" alt="2021.2 EAP Nightly Status" /></a></td>
     </tr>
     <tr>
         <td align="right"><b>OS Tests</b></td>

src/main/kotlin/insight/ColorLineMarkerProvider.kt

@@ -65,11 +65,11 @@ class ColorLineMarkerProvider : LineMarkerProvider {
             ColorIcon(12, color),
             FunctionUtil.nullConstant<Any, String>(),
             GutterIconNavigationHandler handler@{ _, psiElement ->
-                if (!psiElement.isWritable || !element.isValid) {
+                if (psiElement == null || !psiElement.isWritable || !psiElement.isValid || !workElement.isPsiValid) {
                     return@handler
                 }
 
-                val editor = PsiEditorUtil.findEditor(element) ?: return@handler
+                val editor = PsiEditorUtil.findEditor(psiElement) ?: return@handler
 
                 val picker = ColorPicker(map, editor.component)
                 val newColor = picker.showDialog()
@@ -117,18 +117,20 @@ class ColorLineMarkerProvider : LineMarkerProvider {
     ) : ColorLineMarkerProvider.ColorInfo(
         element,
         color,
-        GutterIconNavigationHandler handler@{ _, _ ->
-            if (!element.isWritable || !element.isValid) {
+        GutterIconNavigationHandler handler@{ _, psiElement ->
+            if (psiElement == null || !psiElement.isValid ||
+                !workElement.isPsiValid || workElement.sourcePsi?.isWritable != true
+            ) {
                 return@handler
             }
 
-            val editor = PsiEditorUtil.findEditor(element) ?: return@handler
-            if (JVMElementFactories.getFactory(element.language, element.project) == null) {
+            val editor = PsiEditorUtil.findEditor(psiElement) ?: return@handler
+            if (JVMElementFactories.getFactory(psiElement.language, psiElement.project) == null) {
                 // The setColor methods used here require a JVMElementFactory. Unfortunately the Kotlin plugin does not
                 // implement it yet. It is better to not display the color chooser at all than deceiving users after
                 // after they chose a color
                 HintManager.getInstance()
-                    .showErrorHint(editor, "Can't change colors in " + element.language.displayName)
+                    .showErrorHint(editor, "Can't change colors in " + psiElement.language.displayName)
                 return@handler
             }