Unbind general FirDiagnostic from PsiFile & PsiElement

idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/IdeErrorMessages.java

@@ -20,6 +20,7 @@ import com.intellij.icons.AllIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.TestOnly;
 import org.jetbrains.kotlin.diagnostics.Diagnostic;
+import org.jetbrains.kotlin.diagnostics.UnboundDiagnostic;
 import org.jetbrains.kotlin.diagnostics.rendering.*;
 import org.jetbrains.kotlin.idea.KotlinIdeaAnalysisBundle;
 import org.jetbrains.kotlin.js.resolve.diagnostics.ErrorsJs;
@@ -42,7 +43,7 @@ public class IdeErrorMessages {
     private static final DiagnosticFactoryToRendererMap MAP = new DiagnosticFactoryToRendererMap("IDE");
 
     @NotNull
-    public static String render(@NotNull Diagnostic diagnostic) {
+    public static String render(@NotNull UnboundDiagnostic diagnostic) {
         DiagnosticRenderer renderer = MAP.get(diagnostic.getFactory());
 
         if (renderer != null) {
@@ -54,7 +55,7 @@ public class IdeErrorMessages {
     }
 
     @TestOnly
-    public static boolean hasIdeSpecificMessage(@NotNull Diagnostic diagnostic) {
+    public static boolean hasIdeSpecificMessage(@NotNull UnboundDiagnostic diagnostic) {
         return MAP.get(diagnostic.getFactory()) != null;
     }
 

idea/idea-jvm/src/org/jetbrains/kotlin/idea/internal/KotlinBytecodeToolWindow.kt

@@ -261,7 +261,7 @@ class KotlinBytecodeToolWindow(private val myProject: Project, private val toolW
                 answer.append("// ================\n")
                 for (diagnostic in diagnostics) {
                     answer.append("// Error at ")
-                        .append(diagnostic.psiFile?.name)
+                        .append(diagnostic.psiFile.name)
                         .append(join(diagnostic.textRanges, ","))
                         .append(": ")
                         .append(DefaultErrorMessages.render(diagnostic))

idea/src/org/jetbrains/kotlin/idea/quickfix/AddFunctionToSupertypeFix.kt

@@ -128,7 +128,7 @@ class AddFunctionToSupertypeFix private constructor(
             val descriptors = generateFunctionsToAdd(function)
             if (descriptors.isEmpty()) return null
 
-            val project = diagnostic.psiFile!!.project
+            val project = diagnostic.psiFile.project
             val functionData = descriptors.mapNotNull { createFunctionData(it, project) }
             if (functionData.isEmpty()) return null
 

idea/src/org/jetbrains/kotlin/idea/quickfix/AddPropertyToSupertypeFix.kt

@@ -102,7 +102,7 @@ class AddPropertyToSupertypeFix private constructor(
             val descriptors = generatePropertiesToAdd(property)
             if (descriptors.isEmpty()) return null
 
-            val project = diagnostic.psiFile!!.project
+            val project = diagnostic.psiFile.project
             val propertyData = descriptors.mapNotNull { createPropertyData(it, property.initializer, project) }
             if (propertyData.isEmpty()) return null