Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
dfdd5959
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,发现更多精彩内容 >>
提交
dfdd5959
编写于
12月 19, 2011
作者:
S
Stepan Koltsov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
working on type type from class importer, properly initialize TypeParameterDescriptor
上级
d88cd775
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
16 addition
and
7 deletion
+16
-7
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
...tbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+16
-7
未找到文件。
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
浏览文件 @
dfdd5959
...
...
@@ -145,11 +145,8 @@ public class JavaDescriptorResolver {
classDescriptorCache
.
put
(
psiClass
.
getQualifiedName
(),
classDescriptor
);
classDescriptor
.
setUnsubstitutedMemberScope
(
new
JavaClassMembersScope
(
classDescriptor
,
psiClass
,
semanticServices
,
false
));
// TODO: initialize
if
(
psiClass
.
getModifierList
().
findAnnotation
(
StdlibNames
.
JET_CLASS
.
getFqName
())
==
null
)
{
// UGLY HACK (Andrey Breslav is not sure what did he mean)
initializeTypeParameters
(
psiClass
);
}
// UGLY HACK (Andrey Breslav is not sure what did he mean)
initializeTypeParameters
(
psiClass
);
supertypes
.
addAll
(
getSupertypes
(
psiClass
));
if
(
psiClass
.
isInterface
())
{
...
...
@@ -208,7 +205,7 @@ public class JavaDescriptorResolver {
if
(
attributeValue
!=
null
)
{
String
typeParametersString
=
(
String
)
attributeValue
.
getValue
();
if
(
typeParametersString
!=
null
)
{
return
resolveClassTypeParametersFromJetSignature
(
typeParametersString
,
classDescriptor
);
return
resolveClassTypeParametersFromJetSignature
(
typeParametersString
,
psiClass
,
classDescriptor
);
}
}
}
...
...
@@ -216,10 +213,20 @@ public class JavaDescriptorResolver {
return
makeUninitializedTypeParameters
(
classDescriptor
,
psiClass
.
getTypeParameters
());
}
@NotNull
private
PsiTypeParameter
getPsiTypeParameterByName
(
PsiTypeParameterListOwner
clazz
,
String
ownerName
,
String
name
)
{
for
(
PsiTypeParameter
typeParameter
:
clazz
.
getTypeParameters
())
{
if
(
typeParameter
.
getName
().
equals
(
name
))
{
return
typeParameter
;
}
}
throw
new
IllegalStateException
(
"PsiTypeParameter '"
+
name
+
"' is not found in '"
+
ownerName
+
"'"
);
}
/**
* @see #resolveMethodTypeParametersFromJetSignature(String, FunctionDescriptor)
*/
private
List
<
TypeParameterDescriptor
>
resolveClassTypeParametersFromJetSignature
(
String
jetSignature
,
final
JavaClassDescriptor
classDescriptor
)
{
private
List
<
TypeParameterDescriptor
>
resolveClassTypeParametersFromJetSignature
(
String
jetSignature
,
final
PsiClass
clazz
,
final
JavaClassDescriptor
classDescriptor
)
{
final
List
<
TypeParameterDescriptor
>
r
=
new
ArrayList
<
TypeParameterDescriptor
>();
new
JetSignatureReader
(
jetSignature
).
accept
(
new
JetSignatureExceptionsAdapter
()
{
@Override
...
...
@@ -256,6 +263,8 @@ public class JavaDescriptorResolver {
JetSignatureUtils
.
translateVariance
(
variance
),
name
,
++
index
);
PsiTypeParameter
psiTypeParameter
=
getPsiTypeParameterByName
(
clazz
,
clazz
.
getQualifiedName
(),
name
);
typeParameterDescriptorCache
.
put
(
psiTypeParameter
,
typeParameter
);
r
.
add
(
typeParameter
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录