Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
274406b7
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,发现更多精彩内容 >>
提交
274406b7
编写于
2月 15, 2012
作者:
S
Stepan Koltsov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
cleanup in JavaDescriptorResolver
上级
81cf9b36
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
6 addition
and
27 deletion
+6
-27
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
...tbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+6
-27
未找到文件。
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
浏览文件 @
274406b7
...
...
@@ -1377,7 +1377,6 @@ public class JavaDescriptorResolver {
}
ClassOrNamespaceDescriptor
classDescriptor
;
final
List
<
TypeParameterDescriptor
>
classTypeParameters
=
scopeData
.
getTypeParameters
();
if
(
scopeData
instanceof
ResolverBinaryClassData
)
{
ClassDescriptor
classClassDescriptor
=
resolveClass
(
method
.
getPsiMethod
().
getContainingClass
());
classDescriptor
=
classClassDescriptor
;
...
...
@@ -1388,6 +1387,7 @@ public class JavaDescriptorResolver {
if
(
classDescriptor
==
null
)
{
return
null
;
}
NamedFunctionDescriptorImpl
functionDescriptorImpl
=
new
NamedFunctionDescriptorImpl
(
owner
,
Collections
.<
AnnotationDescriptor
>
emptyList
(),
// TODO
...
...
@@ -1396,41 +1396,20 @@ public class JavaDescriptorResolver {
);
methodDescriptorCache
.
put
(
method
.
getPsiMethod
(),
functionDescriptorImpl
);
TypeVariableResolver
typeVariableResolverForParameters
=
TypeVariableResolvers
.
classTypeVariableResolver
(
classDescriptor
);
final
List
<
TypeParameterDescriptor
>
methodTypeParametersInitialization
=
resolveMethodTypeParameters
(
method
,
functionDescriptorImpl
,
typeVariableResolverForParameters
);
List
<
TypeParameterDescriptor
>
methodTypeParameters
=
new
ArrayList
<
TypeParameterDescriptor
>();
for
(
TypeParameterDescriptor
typeParameterDescriptorInitialization
:
methodTypeParametersInitialization
)
{
methodTypeParameters
.
add
(
typeParameterDescriptorInitialization
);
}
final
TypeVariableResolver
typeVariableResolverForParameters
=
TypeVariableResolvers
.
classTypeVariableResolver
(
classDescriptor
);
class
MethodTypeVariableResolver
implements
TypeVariableResolver
{
@NotNull
@Override
public
TypeParameterDescriptor
getTypeVariable
(
@NotNull
String
name
)
{
for
(
TypeParameterDescriptor
typeParameter
:
methodTypeParametersInitialization
)
{
if
(
typeParameter
.
getName
().
equals
(
name
))
{
return
typeParameter
;
}
}
for
(
TypeParameterDescriptor
typeParameter
:
classTypeParameters
)
{
if
(
typeParameter
.
getName
().
equals
(
name
))
{
return
typeParameter
;
}
}
throw
new
IllegalStateException
(
"unresolver variable: "
+
name
);
// TODO: report properly
}
final
List
<
TypeParameterDescriptor
>
methodTypeParameters
=
resolveMethodTypeParameters
(
method
,
functionDescriptorImpl
,
typeVariableResolverForParameters
);
}
TypeVariableResolver
methodTypeVariableResolver
=
new
TypeVariableResolverFromTypeDescriptors
(
methodTypeParameters
,
typeVariableResolverForParameters
);
ValueParameterDescriptors
valueParameterDescriptors
=
resolveParameterDescriptors
(
functionDescriptorImpl
,
method
.
getParameters
(),
new
MethodTypeVariableResolver
()
);
ValueParameterDescriptors
valueParameterDescriptors
=
resolveParameterDescriptors
(
functionDescriptorImpl
,
method
.
getParameters
(),
methodTypeVariableResolver
);
functionDescriptorImpl
.
initialize
(
valueParameterDescriptors
.
receiverType
,
DescriptorUtils
.
getExpectedThisObjectIfNeeded
(
classDescriptor
),
methodTypeParameters
,
valueParameterDescriptors
.
descriptors
,
makeReturnType
(
returnType
,
method
,
new
MethodTypeVariableResolver
()
),
makeReturnType
(
returnType
,
method
,
methodTypeVariableResolver
),
Modality
.
convertFromFlags
(
method
.
getPsiMethod
().
hasModifierProperty
(
PsiModifier
.
ABSTRACT
),
!
method
.
isFinal
()),
resolveVisibilityFromPsiModifiers
(
method
.
getPsiMethod
())
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录