Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
221b6bd1
K
kotlin
项目概览
硅谷海盗
/
kotlin
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
kotlin
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
221b6bd1
编写于
3月 26, 2021
作者:
M
Mikhail Glukhikh
提交者:
TeamCityServer
3月 26, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Drop usages of FirErrors.TYPE_PARAMETER_AS_SUPERTYPE
上级
c74f471a
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
0 addition
and
23 deletion
+0
-23
compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirDiagnosticsList.kt
.../fir/checkers/generator/diagnostics/FirDiagnosticsList.kt
+0
-1
compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt
...rg/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt
+0
-1
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDefaultErrorMessages.kt
...otlin/fir/analysis/diagnostics/FirDefaultErrorMessages.kt
+0
-2
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/coneDiagnosticToFirDiagnostic.kt
...fir/analysis/diagnostics/coneDiagnosticToFirDiagnostic.kt
+0
-1
compiler/fir/tree/src/org/jetbrains/kotlin/fir/diagnostics/ConeSimpleDiagnostic.kt
.../jetbrains/kotlin/fir/diagnostics/ConeSimpleDiagnostic.kt
+0
-1
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDataClassConverters.kt
.../frontend/api/fir/diagnostics/KtFirDataClassConverters.kt
+0
-6
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDiagnostics.kt
...lin/idea/frontend/api/fir/diagnostics/KtFirDiagnostics.kt
+0
-4
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDiagnosticsImpl.kt
...idea/frontend/api/fir/diagnostics/KtFirDiagnosticsImpl.kt
+0
-7
未找到文件。
compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/diagnostics/FirDiagnosticsList.kt
浏览文件 @
221b6bd1
...
...
@@ -88,7 +88,6 @@ object DIAGNOSTICS_LIST : DiagnosticList() {
}
val
SUPERTYPES
by
object
:
DiagnosticGroup
(
"Supertypes"
)
{
val
TYPE_PARAMETER_AS_SUPERTYPE
by
error
<
FirSourceElement
,
PsiElement
>()
val
ENUM_AS_SUPERTYPE
by
error
<
FirSourceElement
,
PsiElement
>()
val
RECURSION_IN_SUPERTYPES
by
error
<
FirSourceElement
,
PsiElement
>()
val
NOT_A_SUPERTYPE
by
error
<
FirSourceElement
,
PsiElement
>()
...
...
compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/diagnostics/FirErrors.kt
浏览文件 @
221b6bd1
...
...
@@ -92,7 +92,6 @@ object FirErrors {
val
INSTANCE_ACCESS_BEFORE_SUPER_CALL
by
error1
<
FirSourceElement
,
PsiElement
,
String
>()
// Supertypes
val
TYPE_PARAMETER_AS_SUPERTYPE
by
error0
<
FirSourceElement
,
PsiElement
>()
val
ENUM_AS_SUPERTYPE
by
error0
<
FirSourceElement
,
PsiElement
>()
val
RECURSION_IN_SUPERTYPES
by
error0
<
FirSourceElement
,
PsiElement
>()
val
NOT_A_SUPERTYPE
by
error0
<
FirSourceElement
,
PsiElement
>()
...
...
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/FirDefaultErrorMessages.kt
浏览文件 @
221b6bd1
...
...
@@ -198,7 +198,6 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.TYPE_MISMATCH
import
org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.TYPE_PARAMETERS_IN_ENUM
import
org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.TYPE_PARAMETERS_IN_OBJECT
import
org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.TYPE_PARAMETER_AS_REIFIED
import
org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.TYPE_PARAMETER_AS_SUPERTYPE
import
org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.TYPE_PARAMETER_IN_CATCH_CLAUSE
import
org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.TYPE_PARAMETER_IS_NOT_AN_EXPRESSION
import
org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.TYPE_PARAMETER_ON_LHS_OF_DOT
...
...
@@ -290,7 +289,6 @@ class FirDefaultErrorMessages : DefaultErrorMessages.Extension {
)
// Supertypes
map
.
put
(
TYPE_PARAMETER_AS_SUPERTYPE
,
"Type parameter as supertype"
)
map
.
put
(
ENUM_AS_SUPERTYPE
,
"Enum as supertype"
)
map
.
put
(
RECURSION_IN_SUPERTYPES
,
"Recursion in supertypes"
)
map
.
put
(
NOT_A_SUPERTYPE
,
"Not an immediate supertype"
)
...
...
compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/diagnostics/coneDiagnosticToFirDiagnostic.kt
浏览文件 @
221b6bd1
...
...
@@ -136,7 +136,6 @@ private fun ConeSimpleDiagnostic.getFactory(): FirDiagnosticFactory0<FirSourceEl
DiagnosticKind
.
IllegalUnderscore
->
FirErrors
.
ILLEGAL_UNDERSCORE
DiagnosticKind
.
DeserializationError
->
FirErrors
.
DESERIALIZATION_ERROR
DiagnosticKind
.
InferenceError
->
FirErrors
.
INFERENCE_ERROR
DiagnosticKind
.
TypeParameterAsSupertype
->
FirErrors
.
TYPE_PARAMETER_AS_SUPERTYPE
DiagnosticKind
.
EnumAsSupertype
->
FirErrors
.
ENUM_AS_SUPERTYPE
DiagnosticKind
.
RecursionInSupertypes
->
FirErrors
.
RECURSION_IN_SUPERTYPES
DiagnosticKind
.
RecursionInImplicitTypes
->
FirErrors
.
RECURSION_IN_IMPLICIT_TYPES
...
...
compiler/fir/tree/src/org/jetbrains/kotlin/fir/diagnostics/ConeSimpleDiagnostic.kt
浏览文件 @
221b6bd1
...
...
@@ -21,7 +21,6 @@ enum class DiagnosticKind {
IllegalUnderscore
,
DeserializationError
,
InferenceError
,
TypeParameterAsSupertype
,
EnumAsSupertype
,
RecursionInSupertypes
,
RecursionInImplicitTypes
,
...
...
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDataClassConverters.kt
浏览文件 @
221b6bd1
...
...
@@ -200,12 +200,6 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert
token
,
)
}
add
(
FirErrors
.
TYPE_PARAMETER_AS_SUPERTYPE
)
{
firDiagnostic
->
TypeParameterAsSupertypeImpl
(
firDiagnostic
as
FirPsiDiagnostic
<
*
>,
token
,
)
}
add
(
FirErrors
.
ENUM_AS_SUPERTYPE
)
{
firDiagnostic
->
EnumAsSupertypeImpl
(
firDiagnostic
as
FirPsiDiagnostic
<
*
>,
...
...
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDiagnostics.kt
浏览文件 @
221b6bd1
...
...
@@ -157,10 +157,6 @@ sealed class KtFirDiagnostic<PSI: PsiElement> : KtDiagnosticWithPsi<PSI> {
abstract
val
target
:
String
}
abstract
class
TypeParameterAsSupertype
:
KtFirDiagnostic
<
PsiElement
>()
{
override
val
diagnosticClass
get
()
=
TypeParameterAsSupertype
::
class
}
abstract
class
EnumAsSupertype
:
KtFirDiagnostic
<
PsiElement
>()
{
override
val
diagnosticClass
get
()
=
EnumAsSupertype
::
class
}
...
...
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDiagnosticsImpl.kt
浏览文件 @
221b6bd1
...
...
@@ -233,13 +233,6 @@ internal class InstanceAccessBeforeSuperCallImpl(
override
val
firDiagnostic
:
FirPsiDiagnostic
<
*
>
by
weakRef
(
firDiagnostic
)
}
internal
class
TypeParameterAsSupertypeImpl
(
firDiagnostic
:
FirPsiDiagnostic
<
*
>,
override
val
token
:
ValidityToken
,
)
:
KtFirDiagnostic
.
TypeParameterAsSupertype
(),
KtAbstractFirDiagnostic
<
PsiElement
>
{
override
val
firDiagnostic
:
FirPsiDiagnostic
<
*
>
by
weakRef
(
firDiagnostic
)
}
internal
class
EnumAsSupertypeImpl
(
firDiagnostic
:
FirPsiDiagnostic
<
*
>,
override
val
token
:
ValidityToken
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录