Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
d5c75ae7
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,发现更多精彩内容 >>
提交
d5c75ae7
编写于
12月 07, 2016
作者:
A
Alexander Udalov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Minor refactoring in frontend/resolution
Fix typos, formatting, diagnostic message
上级
921694e1
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
13 addition
and
13 deletion
+13
-13
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/NewResolutionOldInference.kt
...s/kotlin/resolve/calls/tower/NewResolutionOldInference.kt
+7
-9
compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/ErrorCandidateFactory.kt
...rains/kotlin/resolve/calls/tower/ErrorCandidateFactory.kt
+6
-4
未找到文件。
compiler/frontend/src/org/jetbrains/kotlin/resolve/calls/tower/NewResolutionOldInference.kt
浏览文件 @
d5c75ae7
...
...
@@ -261,20 +261,18 @@ class NewResolutionOldInference(
):
Boolean
{
val
reference
=
context
.
call
.
calleeExpression
as
?
KtReferenceExpression
?:
return
false
val
errorCadidates
=
when
(
kind
)
{
val
errorCa
n
didates
=
when
(
kind
)
{
ResolutionKind
.
Function
->
collectErrorCandidatesForFunction
(
scopeTower
,
name
,
detailedReceiver
)
ResolutionKind
.
Variable
->
collectErrorCandidatesForVariable
(
scopeTower
,
name
,
detailedReceiver
)
else
->
emptyList
()
}
for
(
candidate
in
errorCadidates
)
{
if
(
candidate
is
ErrorCandidate
.
Classifier
)
{
context
.
trace
.
record
(
BindingContext
.
REFERENCE_TARGET
,
reference
,
candidate
.
descriptor
)
context
.
trace
.
report
(
Errors
.
RESOLUTION_TO_CLASSIFIER
.
on
(
reference
,
candidate
.
descriptor
,
candidate
.
kind
,
candidate
.
errorMessage
))
return
true
}
}
return
false
val
candidate
=
errorCandidates
.
firstOrNull
()
as
?
ErrorCandidate
.
Classifier
?:
return
false
context
.
trace
.
record
(
BindingContext
.
REFERENCE_TARGET
,
reference
,
candidate
.
descriptor
)
context
.
trace
.
report
(
Errors
.
RESOLUTION_TO_CLASSIFIER
.
on
(
reference
,
candidate
.
descriptor
,
candidate
.
kind
,
candidate
.
errorMessage
))
return
true
}
private
class
ImplicitScopeTowerImpl
(
...
...
compiler/resolution/src/org/jetbrains/kotlin/resolve/calls/tower/ErrorCandidateFactory.kt
浏览文件 @
d5c75ae7
...
...
@@ -31,12 +31,14 @@ enum class WrongResolutionToClassifier(val message: (Name) -> String) {
INTERFACE_AS_VALUE
({
"Interface $it does not have companion object"
}),
INTERFACE_AS_FUNCTION
({
"Interface $it does not have constructors"
}),
CLASS_AS_VALUE
({
"Class $it does not have companion object"
}),
OBJECT_AS_FUNCTION
({
"
Function 'invoke()' is not found in object $it
"
})
OBJECT_AS_FUNCTION
({
"
Function 'invoke()' is not found in object $it
"
})
}
sealed
class
ErrorCandidate
<
out
D
:
DeclarationDescriptor
>(
val
descriptor
:
D
)
{
class
Classifier
(
classifierDescriptor
:
ClassifierDescriptor
,
val
kind
:
WrongResolutionToClassifier
)
:
ErrorCandidate
<
ClassifierDescriptor
>(
classifierDescriptor
)
{
class
Classifier
(
classifierDescriptor
:
ClassifierDescriptor
,
val
kind
:
WrongResolutionToClassifier
)
:
ErrorCandidate
<
ClassifierDescriptor
>(
classifierDescriptor
)
{
val
errorMessage
=
kind
.
message
(
descriptor
.
name
)
}
}
...
...
@@ -99,4 +101,4 @@ private fun ErrorCandidateContext.asClassifierCall(asFunction: Boolean) {
add
(
ErrorCandidate
.
Classifier
(
classifier
,
kind
))
}
\ No newline at end of file
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录