Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
5ab05e6e
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,发现更多精彩内容 >>
提交
5ab05e6e
编写于
6月 10, 2020
作者:
D
Denis Zharkov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
FIR: Fix incorrect resolution to synthetic property by implicit receiver
When there's an explicit one ^KT-39028 Fixed
上级
293f78ef
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
67 addition
and
3 deletion
+67
-3
compiler/fir/analysis-tests/testData/resolve/callResolution/syntheticPropertiesWrongImplicitReceiver.kt
...allResolution/syntheticPropertiesWrongImplicitReceiver.kt
+21
-0
compiler/fir/analysis-tests/testData/resolve/callResolution/syntheticPropertiesWrongImplicitReceiver.txt
...llResolution/syntheticPropertiesWrongImplicitReceiver.txt
+33
-0
compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java
...org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java
+5
-0
compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithLightTreeTestGenerated.java
.../kotlin/fir/FirDiagnosticsWithLightTreeTestGenerated.java
+5
-0
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/TowerLevels.kt
...g/jetbrains/kotlin/fir/resolve/calls/tower/TowerLevels.kt
+3
-3
未找到文件。
compiler/fir/analysis-tests/testData/resolve/callResolution/syntheticPropertiesWrongImplicitReceiver.kt
0 → 100644
浏览文件 @
5ab05e6e
// !CHECK_TYPE
// FILE: JavaClass.java
public
class
JavaClass
{
public
String
getFoo
()
{
return
""
;
}
}
// FILE: main.kt
interface
A
val
A
.
foo
:
Int
get
()
=
1
fun
bar
(
a
:
A
)
{
a
.
foo
checkType
{
_
<
Int
>()
}
// OK, resolved to extension property
}
fun
JavaClass
.
bar
(
a
:
A
)
{
a
.
foo
checkType
{
_
<
Int
>()
}
}
compiler/fir/analysis-tests/testData/resolve/callResolution/syntheticPropertiesWrongImplicitReceiver.txt
0 → 100644
浏览文件 @
5ab05e6e
FILE: main.kt
public abstract interface A : R|kotlin/Any| {
}
public final val R|A|.foo: R|kotlin/Int|
public get(): R|kotlin/Int| {
^ Int(1)
}
public final fun bar(a: R|A|): R|kotlin/Unit| {
R|<local>/a|.R|/foo|.R|tests/_checkType/checkType|<R|kotlin/Int|>(checkType@fun R|tests/_checkType/Inv<kotlin/Int>|.<anonymous>(): R|kotlin/Unit| {
this@R|special/anonymous|.R|tests/_checkType/_|<R|kotlin/Int|>()
}
)
}
public final fun R|JavaClass|.bar(a: R|A|): R|kotlin/Unit| {
R|<local>/a|.R|/foo|.R|tests/_checkType/checkType|<R|kotlin/Int|>(checkType@fun R|tests/_checkType/Inv<kotlin/Int>|.<anonymous>(): R|kotlin/Unit| {
this@R|special/anonymous|.R|tests/_checkType/_|<R|kotlin/Int|>()
}
)
}
FILE: CHECK_TYPE.kt
public final fun <T> checkSubtype(t: R|T|): R|T| {
^checkSubtype R|<local>/t|
}
public final class Inv<T> : R|kotlin/Any| {
public constructor<T>(): R|tests/_checkType/Inv<T>| {
super<R|kotlin/Any|>()
}
}
public final fun <E> R|tests/_checkType/Inv<E>|._(): R|kotlin/Unit| {
}
public final infix fun <T> R|T|.checkType(f: R|tests/_checkType/Inv<T>.() -> kotlin/Unit|): R|kotlin/Unit| {
}
compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsTestGenerated.java
浏览文件 @
5ab05e6e
...
...
@@ -634,6 +634,11 @@ public class FirDiagnosticsTestGenerated extends AbstractFirDiagnosticsTest {
runTest
(
"compiler/fir/analysis-tests/testData/resolve/callResolution/safeCallOnTypeAlias.kt"
);
}
@TestMetadata
(
"syntheticPropertiesWrongImplicitReceiver.kt"
)
public
void
testSyntheticPropertiesWrongImplicitReceiver
()
throws
Exception
{
runTest
(
"compiler/fir/analysis-tests/testData/resolve/callResolution/syntheticPropertiesWrongImplicitReceiver.kt"
);
}
@TestMetadata
(
"typeAliasWithNotNullBound.kt"
)
public
void
testTypeAliasWithNotNullBound
()
throws
Exception
{
runTest
(
"compiler/fir/analysis-tests/testData/resolve/callResolution/typeAliasWithNotNullBound.kt"
);
...
...
compiler/fir/analysis-tests/tests/org/jetbrains/kotlin/fir/FirDiagnosticsWithLightTreeTestGenerated.java
浏览文件 @
5ab05e6e
...
...
@@ -634,6 +634,11 @@ public class FirDiagnosticsWithLightTreeTestGenerated extends AbstractFirDiagnos
runTest
(
"compiler/fir/analysis-tests/testData/resolve/callResolution/safeCallOnTypeAlias.kt"
);
}
@TestMetadata
(
"syntheticPropertiesWrongImplicitReceiver.kt"
)
public
void
testSyntheticPropertiesWrongImplicitReceiver
()
throws
Exception
{
runTest
(
"compiler/fir/analysis-tests/testData/resolve/callResolution/syntheticPropertiesWrongImplicitReceiver.kt"
);
}
@TestMetadata
(
"typeAliasWithNotNullBound.kt"
)
public
void
testTypeAliasWithNotNullBound
()
throws
Exception
{
runTest
(
"compiler/fir/analysis-tests/testData/resolve/callResolution/typeAliasWithNotNullBound.kt"
);
...
...
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/tower/TowerLevels.kt
浏览文件 @
5ab05e6e
...
...
@@ -26,9 +26,9 @@ import org.jetbrains.kotlin.fir.scopes.impl.FirExplicitSimpleImportingScope
import
org.jetbrains.kotlin.fir.scopes.processClassifiersByName
import
org.jetbrains.kotlin.fir.symbols.AbstractFirBasedSymbol
import
org.jetbrains.kotlin.fir.symbols.impl.*
import
org.jetbrains.kotlin.fir.types.classId
import
org.jetbrains.kotlin.fir.types.ConeKotlinType
import
org.jetbrains.kotlin.fir.types.ConeNullability
import
org.jetbrains.kotlin.fir.types.classId
import
org.jetbrains.kotlin.fir.types.withNullability
import
org.jetbrains.kotlin.name.Name
import
org.jetbrains.kotlin.util.OperatorNameConventions
...
...
@@ -117,11 +117,11 @@ class MemberScopeTowerLevel(
}
}
if
(!
forInnerConstructorDelegationCalls
)
{
if
(!
forInnerConstructorDelegationCalls
&&
extensionReceiver
==
null
)
{
val
withSynthetic
=
FirSyntheticPropertiesScope
(
session
,
scope
)
withSynthetic
.
processScopeMembers
{
symbol
->
empty
=
false
output
.
consumeCandidate
(
symbol
,
NotNullableReceiverValue
(
dispatchReceiver
),
extensionReceiver
as
?
ImplicitReceiverValue
<
*
>
)
output
.
consumeCandidate
(
symbol
,
NotNullableReceiverValue
(
dispatchReceiver
),
null
)
}
}
return
if
(
empty
)
ProcessorAction
.
NONE
else
ProcessorAction
.
NEXT
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录