Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
2cd1aefd
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,发现更多精彩内容 >>
提交
2cd1aefd
编写于
2月 10, 2021
作者:
D
Dmitriy Novozhilov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FIR-IDE] Add mapping for FirExpression in diagnostics and generate new IDE ones
上级
9b1f01ab
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
84 addition
and
1 deletion
+84
-1
idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/HLDiagnosticConverter.kt
.../idea/frontend/api/fir/generator/HLDiagnosticConverter.kt
+11
-1
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDataClassConverters.kt
.../frontend/api/fir/diagnostics/KtFirDataClassConverters.kt
+26
-0
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDiagnostics.kt
...lin/idea/frontend/api/fir/diagnostics/KtFirDiagnostics.kt
+19
-0
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDiagnosticsImpl.kt
...idea/frontend/api/fir/diagnostics/KtFirDiagnosticsImpl.kt
+28
-0
未找到文件。
idea/idea-frontend-fir/idea-frontend-fir-generator/src/org/jetbrains/kotlin/idea/frontend/api/fir/generator/HLDiagnosticConverter.kt
浏览文件 @
2cd1aefd
...
...
@@ -15,6 +15,7 @@ import org.jetbrains.kotlin.fir.checkers.generator.diagnostics.DiagnosticParamet
import
org.jetbrains.kotlin.fir.declarations.FirCallableDeclaration
import
org.jetbrains.kotlin.fir.declarations.FirClass
import
org.jetbrains.kotlin.fir.declarations.FirMemberDeclaration
import
org.jetbrains.kotlin.fir.expressions.FirExpression
import
org.jetbrains.kotlin.fir.expressions.WhenMissingCase
import
org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol
import
org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol
...
...
@@ -26,6 +27,7 @@ import org.jetbrains.kotlin.idea.frontend.api.symbols.*
import
org.jetbrains.kotlin.idea.frontend.api.types.KtType
import
org.jetbrains.kotlin.lexer.KtModifierKeywordToken
import
org.jetbrains.kotlin.name.Name
import
org.jetbrains.kotlin.psi.KtExpression
import
kotlin.reflect.KClass
import
kotlin.reflect.KType
import
kotlin.reflect.full.createType
...
...
@@ -116,6 +118,14 @@ private object FirToKtConversionCreator {
"firSymbolBuilder.buildClassLikeSymbol({0})"
,
KtClassLikeSymbol
::
class
.
createType
()
),
FirExpression
::
class
to
HLFunctionCallConversion
(
"{0}.source!!.psi as KtExpression"
,
KtExpression
::
class
.
createType
(),
importsToAdd
=
listOf
(
"org.jetbrains.kotlin.psi.KtExpression"
,
"org.jetbrains.kotlin.fir.psi"
)
),
FirClassLikeSymbol
::
class
to
HLFunctionCallConversion
(
"firSymbolBuilder.buildClassLikeSymbol({0}.fir as FirClass<*>)"
,
KtClassLikeSymbol
::
class
.
createType
(),
...
...
@@ -171,4 +181,4 @@ private object FirToKtConversionCreator {
private
val
KType
.
kClass
:
KClass
<
*
>
get
()
=
classifier
as
KClass
<
*
>
}
\ No newline at end of file
}
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDataClassConverters.kt
浏览文件 @
2cd1aefd
...
...
@@ -15,6 +15,7 @@ import org.jetbrains.kotlin.fir.declarations.FirDeclaration
import
org.jetbrains.kotlin.fir.declarations.FirProperty
import
org.jetbrains.kotlin.fir.declarations.FirTypeParameter
import
org.jetbrains.kotlin.fir.expressions.WhenMissingCase
import
org.jetbrains.kotlin.fir.psi
import
org.jetbrains.kotlin.psi.KtClassOrObject
import
org.jetbrains.kotlin.psi.KtDeclaration
import
org.jetbrains.kotlin.psi.KtDestructuringDeclaration
...
...
@@ -974,6 +975,31 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert
token
,
)
}
add
(
FirErrors
.
UNSAFE_IMPLICIT_INVOKE_CALL
)
{
firDiagnostic
->
UnsafeImplicitInvokeCallImpl
(
firSymbolBuilder
.
buildKtType
(
firDiagnostic
.
a
),
firDiagnostic
as
FirPsiDiagnostic
<
*
>,
token
,
)
}
add
(
FirErrors
.
UNSAFE_INFIX_CALL
)
{
firDiagnostic
->
UnsafeInfixCallImpl
(
firDiagnostic
.
a
.
source
!!
.
psi
as
KtExpression
,
firDiagnostic
.
b
,
firDiagnostic
.
c
.
source
!!
.
psi
as
KtExpression
,
firDiagnostic
as
FirPsiDiagnostic
<
*
>,
token
,
)
}
add
(
FirErrors
.
UNSAFE_OPERATOR_CALL
)
{
firDiagnostic
->
UnsafeOperatorCallImpl
(
firDiagnostic
.
a
.
source
!!
.
psi
as
KtExpression
,
firDiagnostic
.
b
,
firDiagnostic
.
c
.
source
!!
.
psi
as
KtExpression
,
firDiagnostic
as
FirPsiDiagnostic
<
*
>,
token
,
)
}
add
(
FirErrors
.
NO_ELSE_IN_WHEN
)
{
firDiagnostic
->
NoElseInWhenImpl
(
firDiagnostic
.
a
.
map
{
whenMissingCase
->
...
...
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDiagnostics.kt
浏览文件 @
2cd1aefd
...
...
@@ -689,6 +689,25 @@ sealed class KtFirDiagnostic<PSI: PsiElement> : KtDiagnosticWithPsi<PSI> {
abstract
val
receiverType
:
KtType
}
abstract
class
UnsafeImplicitInvokeCall
:
KtFirDiagnostic
<
PsiElement
>()
{
override
val
diagnosticClass
get
()
=
UnsafeImplicitInvokeCall
::
class
abstract
val
receiverType
:
KtType
}
abstract
class
UnsafeInfixCall
:
KtFirDiagnostic
<
KtExpression
>()
{
override
val
diagnosticClass
get
()
=
UnsafeInfixCall
::
class
abstract
val
lhs
:
KtExpression
abstract
val
operator
:
String
abstract
val
rhs
:
KtExpression
}
abstract
class
UnsafeOperatorCall
:
KtFirDiagnostic
<
KtExpression
>()
{
override
val
diagnosticClass
get
()
=
UnsafeOperatorCall
::
class
abstract
val
lhs
:
KtExpression
abstract
val
operator
:
String
abstract
val
rhs
:
KtExpression
}
abstract
class
NoElseInWhen
:
KtFirDiagnostic
<
KtWhenExpression
>()
{
override
val
diagnosticClass
get
()
=
NoElseInWhen
::
class
abstract
val
missingWhenCases
:
List
<
Any
>
...
...
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/diagnostics/KtFirDiagnosticsImpl.kt
浏览文件 @
2cd1aefd
...
...
@@ -1110,6 +1110,34 @@ internal class UnsafeCallImpl(
override
val
firDiagnostic
:
FirPsiDiagnostic
<
*
>
by
weakRef
(
firDiagnostic
)
}
internal
class
UnsafeImplicitInvokeCallImpl
(
override
val
receiverType
:
KtType
,
firDiagnostic
:
FirPsiDiagnostic
<
*
>,
override
val
token
:
ValidityToken
,
)
:
KtFirDiagnostic
.
UnsafeImplicitInvokeCall
(),
KtAbstractFirDiagnostic
<
PsiElement
>
{
override
val
firDiagnostic
:
FirPsiDiagnostic
<
*
>
by
weakRef
(
firDiagnostic
)
}
internal
class
UnsafeInfixCallImpl
(
override
val
lhs
:
KtExpression
,
override
val
operator
:
String
,
override
val
rhs
:
KtExpression
,
firDiagnostic
:
FirPsiDiagnostic
<
*
>,
override
val
token
:
ValidityToken
,
)
:
KtFirDiagnostic
.
UnsafeInfixCall
(),
KtAbstractFirDiagnostic
<
KtExpression
>
{
override
val
firDiagnostic
:
FirPsiDiagnostic
<
*
>
by
weakRef
(
firDiagnostic
)
}
internal
class
UnsafeOperatorCallImpl
(
override
val
lhs
:
KtExpression
,
override
val
operator
:
String
,
override
val
rhs
:
KtExpression
,
firDiagnostic
:
FirPsiDiagnostic
<
*
>,
override
val
token
:
ValidityToken
,
)
:
KtFirDiagnostic
.
UnsafeOperatorCall
(),
KtAbstractFirDiagnostic
<
KtExpression
>
{
override
val
firDiagnostic
:
FirPsiDiagnostic
<
*
>
by
weakRef
(
firDiagnostic
)
}
internal
class
NoElseInWhenImpl
(
override
val
missingWhenCases
:
List
<
Any
>,
firDiagnostic
:
FirPsiDiagnostic
<
*
>,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录