[FE] Introduce diagnostic markers
This is needed to move diagnostic renderers and positioning strategies to common modules for both frontends
This commit is contained in:
committed by
TeamCityServer
parent
793209e72f
commit
7536dadb65
@@ -0,0 +1,35 @@
|
||||
/*
|
||||
* Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
|
||||
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
|
||||
*/
|
||||
|
||||
package org.jetbrains.kotlin.diagnostics
|
||||
|
||||
import com.intellij.psi.PsiElement
|
||||
|
||||
interface DiagnosticMarker {
|
||||
val psiElement: PsiElement
|
||||
val factoryName: String
|
||||
}
|
||||
|
||||
interface DiagnosticWithParameters1Marker<A> : DiagnosticMarker {
|
||||
val a: A
|
||||
}
|
||||
|
||||
interface DiagnosticWithParameters2Marker<A, B> : DiagnosticMarker {
|
||||
val a: A
|
||||
val b: B
|
||||
}
|
||||
|
||||
interface DiagnosticWithParameters3Marker<A, B, C> : DiagnosticMarker {
|
||||
val a: A
|
||||
val b: B
|
||||
val c: C
|
||||
}
|
||||
|
||||
interface DiagnosticWithParameters4Marker<A, B, C, D> : DiagnosticMarker {
|
||||
val a: A
|
||||
val b: B
|
||||
val c: C
|
||||
val d: D
|
||||
}
|
||||
@@ -18,7 +18,10 @@ package org.jetbrains.kotlin.diagnostics
|
||||
import com.intellij.psi.PsiElement
|
||||
import com.intellij.psi.PsiFile
|
||||
|
||||
interface Diagnostic : UnboundDiagnostic {
|
||||
val psiElement: PsiElement
|
||||
interface Diagnostic : UnboundDiagnostic, DiagnosticMarker {
|
||||
override val psiElement: PsiElement
|
||||
val psiFile: PsiFile
|
||||
}
|
||||
|
||||
override val factoryName: String
|
||||
get() = factory.name
|
||||
}
|
||||
|
||||
+2
-1
@@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
public class DiagnosticWithParameters1<E extends PsiElement, A> extends AbstractDiagnostic<E> {
|
||||
public class DiagnosticWithParameters1<E extends PsiElement, A> extends AbstractDiagnostic<E> implements DiagnosticWithParameters1Marker<A> {
|
||||
private final A a;
|
||||
|
||||
public DiagnosticWithParameters1(
|
||||
@@ -42,6 +42,7 @@ public class DiagnosticWithParameters1<E extends PsiElement, A> extends Abstract
|
||||
}
|
||||
|
||||
@NotNull
|
||||
@Override
|
||||
public A getA() {
|
||||
return a;
|
||||
}
|
||||
|
||||
+3
-1
@@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
public class DiagnosticWithParameters2<E extends PsiElement, A, B> extends AbstractDiagnostic<E> {
|
||||
public class DiagnosticWithParameters2<E extends PsiElement, A, B> extends AbstractDiagnostic<E> implements DiagnosticWithParameters2Marker<A, B>{
|
||||
private final A a;
|
||||
private final B b;
|
||||
|
||||
@@ -45,11 +45,13 @@ public class DiagnosticWithParameters2<E extends PsiElement, A, B> extends Abstr
|
||||
}
|
||||
|
||||
@NotNull
|
||||
@Override
|
||||
public A getA() {
|
||||
return a;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
@Override
|
||||
public B getB() {
|
||||
return b;
|
||||
}
|
||||
|
||||
+9
-6
@@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
public class DiagnosticWithParameters3<E extends PsiElement, A, B, C> extends AbstractDiagnostic<E> {
|
||||
public class DiagnosticWithParameters3<E extends PsiElement, A, B, C> extends AbstractDiagnostic<E> implements DiagnosticWithParameters3Marker<A, B, C> {
|
||||
private final A a;
|
||||
private final B b;
|
||||
private final C c;
|
||||
@@ -48,16 +48,19 @@ public class DiagnosticWithParameters3<E extends PsiElement, A, B, C> extends Ab
|
||||
}
|
||||
|
||||
@NotNull
|
||||
public A getA() {
|
||||
return a;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
@Override
|
||||
public B getB() {
|
||||
return b;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
@Override
|
||||
public A getA() {
|
||||
return a;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
@Override
|
||||
public C getC() {
|
||||
return c;
|
||||
}
|
||||
|
||||
+5
-1
@@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
public class DiagnosticWithParameters4<E extends PsiElement, A, B, C, D> extends AbstractDiagnostic<E> {
|
||||
public class DiagnosticWithParameters4<E extends PsiElement, A, B, C, D> extends AbstractDiagnostic<E> implements DiagnosticWithParameters4Marker<A, B, C, D> {
|
||||
private final A a;
|
||||
private final B b;
|
||||
private final C c;
|
||||
@@ -51,21 +51,25 @@ public class DiagnosticWithParameters4<E extends PsiElement, A, B, C, D> extends
|
||||
}
|
||||
|
||||
@NotNull
|
||||
@Override
|
||||
public A getA() {
|
||||
return a;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
@Override
|
||||
public B getB() {
|
||||
return b;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
@Override
|
||||
public C getC() {
|
||||
return c;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
@Override
|
||||
public D getD() {
|
||||
return d;
|
||||
}
|
||||
|
||||
@@ -23,4 +23,10 @@ public interface ParametrizedDiagnostic<E extends PsiElement> extends Diagnostic
|
||||
@NotNull
|
||||
@Override
|
||||
E getPsiElement();
|
||||
|
||||
@NotNull
|
||||
@Override
|
||||
default String getFactoryName() {
|
||||
return getFactory().getName();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user