Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
04017b00
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 搜索 >>
提交
04017b00
编写于
2月 05, 2021
作者:
I
Igor Yakovlev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FIR IDE] Fix TypeRef resolve to error type caused by invalid number of arguments
上级
f9e5584a
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
32 addition
and
3 deletion
+32
-3
idea/idea-fir/tests/org/jetbrains/kotlin/idea/resolve/FirReferenceResolveTestGenerated.java
...kotlin/idea/resolve/FirReferenceResolveTestGenerated.java
+5
-0
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/references/FirReferenceResolveHelper.kt
...rains/kotlin/idea/references/FirReferenceResolveHelper.kt
+13
-3
idea/testData/resolve/references/WrongNumberOfTypeArguments3.kt
...estData/resolve/references/WrongNumberOfTypeArguments3.kt
+9
-0
idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveTestGenerated.java
...ns/kotlin/idea/resolve/ReferenceResolveTestGenerated.java
+5
-0
未找到文件。
idea/idea-fir/tests/org/jetbrains/kotlin/idea/resolve/FirReferenceResolveTestGenerated.java
浏览文件 @
04017b00
...
...
@@ -429,6 +429,11 @@ public class FirReferenceResolveTestGenerated extends AbstractFirReferenceResolv
runTest
(
"idea/testData/resolve/references/WrongNumberOfTypeArguments2.kt"
);
}
@TestMetadata
(
"WrongNumberOfTypeArguments3.kt"
)
public
void
testWrongNumberOfTypeArguments3
()
throws
Exception
{
runTest
(
"idea/testData/resolve/references/WrongNumberOfTypeArguments3.kt"
);
}
@TestMetadata
(
"WrongNumberOfTypeArgumentsInSupertype.kt"
)
public
void
testWrongNumberOfTypeArgumentsInSupertype
()
throws
Exception
{
runTest
(
"idea/testData/resolve/references/WrongNumberOfTypeArgumentsInSupertype.kt"
);
...
...
idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/references/FirReferenceResolveHelper.kt
浏览文件 @
04017b00
...
...
@@ -16,14 +16,17 @@ import org.jetbrains.kotlin.fir.resolve.calls.SyntheticPropertySymbol
import
org.jetbrains.kotlin.fir.resolve.diagnostics.ConeAmbiguityError
import
org.jetbrains.kotlin.fir.resolve.diagnostics.ConeInapplicableCandidateError
import
org.jetbrains.kotlin.fir.resolve.diagnostics.ConeOperatorAmbiguityError
import
org.jetbrains.kotlin.fir.resolve.diagnostics.ConeWrongNumberOfTypeArgumentsError
import
org.jetbrains.kotlin.fir.resolve.firSymbolProvider
import
org.jetbrains.kotlin.fir.resolve.toSymbol
import
org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol
import
org.jetbrains.kotlin.fir.symbols.impl.ConeClassLikeLookupTagImpl
import
org.jetbrains.kotlin.fir.types.ConeLookupTagBasedType
import
org.jetbrains.kotlin.fir.types.FirErrorTypeRef
import
org.jetbrains.kotlin.fir.types.FirResolvedTypeRef
import
org.jetbrains.kotlin.fir.types.classId
import
org.jetbrains.kotlin.idea.fir.*
import
org.jetbrains.kotlin.idea.fir.getCandidateSymbols
import
org.jetbrains.kotlin.idea.fir.isImplicitFunctionCall
import
org.jetbrains.kotlin.idea.fir.low.level.api.api.getOrBuildFir
import
org.jetbrains.kotlin.idea.fir.low.level.api.api.getOrBuildFirSafe
import
org.jetbrains.kotlin.idea.frontend.api.fir.KtFirAnalysisSession
...
...
@@ -42,8 +45,15 @@ import org.jetbrains.kotlin.utils.addToStdlib.firstNotNullResult
internal
object
FirReferenceResolveHelper
{
fun
FirResolvedTypeRef
.
toTargetSymbol
(
session
:
FirSession
,
symbolBuilder
:
KtSymbolByFirBuilder
):
KtSymbol
?
{
val
type
=
type
as
?
ConeLookupTagBasedType
?:
return
null
val
symbol
=
type
.
lookupTag
.
toSymbol
(
session
)
as
?
AbstractFirBasedSymbol
<
*
>
val
type
=
type
as
?
ConeLookupTagBasedType
val
resolvedSymbol
=
type
?.
lookupTag
?.
toSymbol
(
session
)
as
?
AbstractFirBasedSymbol
<
*
>
val
symbol
=
resolvedSymbol
?:
run
{
val
diagnostic
=
(
this
as
?
FirErrorTypeRef
)
?.
diagnostic
(
diagnostic
as
?
ConeWrongNumberOfTypeArgumentsError
)
?.
type
}
return
symbol
?.
fir
?.
buildSymbol
(
symbolBuilder
)
}
...
...
idea/testData/resolve/references/WrongNumberOfTypeArguments3.kt
0 → 100644
浏览文件 @
04017b00
package
foo
class
CC
<
T
>
class
DD
<
T
,
T2
>
val
v1
=
D
<
caret
>
D
<
C
<
caret
>
C
>
// REF1: (foo).DD
// REF2: (foo).CC
idea/tests/org/jetbrains/kotlin/idea/resolve/ReferenceResolveTestGenerated.java
浏览文件 @
04017b00
...
...
@@ -429,6 +429,11 @@ public class ReferenceResolveTestGenerated extends AbstractReferenceResolveTest
runTest
(
"idea/testData/resolve/references/WrongNumberOfTypeArguments2.kt"
);
}
@TestMetadata
(
"WrongNumberOfTypeArguments3.kt"
)
public
void
testWrongNumberOfTypeArguments3
()
throws
Exception
{
runTest
(
"idea/testData/resolve/references/WrongNumberOfTypeArguments3.kt"
);
}
@TestMetadata
(
"WrongNumberOfTypeArgumentsInSupertype.kt"
)
public
void
testWrongNumberOfTypeArgumentsInSupertype
()
throws
Exception
{
runTest
(
"idea/testData/resolve/references/WrongNumberOfTypeArgumentsInSupertype.kt"
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录