Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
9cc11adf
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,发现更多精彩内容 >>
提交
9cc11adf
编写于
4月 19, 2012
作者:
S
Stepan Koltsov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
replace lazy type with explicit deferred task list
上级
cd8e275c
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
29 addition
and
14 deletion
+29
-14
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
...tbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+29
-14
未找到文件。
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
浏览文件 @
9cc11adf
...
...
@@ -333,7 +333,15 @@ public class JavaDescriptorResolver {
@Nullable
public
ClassDescriptor
resolveClass
(
@NotNull
FqName
qualifiedName
,
@NotNull
DescriptorSearchRule
searchRule
)
{
List
<
Runnable
>
tasks
=
Lists
.
newArrayList
();
ClassDescriptor
clazz
=
resolveClass
(
qualifiedName
,
searchRule
,
tasks
);
for
(
Runnable
task
:
tasks
)
{
task
.
run
();
}
return
clazz
;
}
private
ClassDescriptor
resolveClass
(
@NotNull
FqName
qualifiedName
,
@NotNull
DescriptorSearchRule
searchRule
,
@NotNull
List
<
Runnable
>
tasks
)
{
if
(
qualifiedName
.
getFqName
().
endsWith
(
JvmAbi
.
TRAIT_IMPL_SUFFIX
))
{
// TODO: only if -$$TImpl class is created by Kotlin
return
null
;
...
...
@@ -368,12 +376,12 @@ public class JavaDescriptorResolver {
if
(
psiClass
==
null
)
{
return
null
;
}
classData
=
createJavaClassDescriptor
(
psiClass
);
classData
=
createJavaClassDescriptor
(
psiClass
,
tasks
);
}
return
classData
.
getClassDescriptor
();
}
private
ResolverBinaryClassData
createJavaClassDescriptor
(
@NotNull
final
PsiClass
psiClass
)
{
private
ResolverBinaryClassData
createJavaClassDescriptor
(
@NotNull
final
PsiClass
psiClass
,
List
<
Runnable
>
taskList
)
{
FqName
fqName
=
new
FqName
(
psiClass
.
getQualifiedName
());
if
(
classDescriptorCache
.
containsKey
(
fqName
))
{
throw
new
IllegalStateException
(
psiClass
.
getQualifiedName
());
...
...
@@ -387,7 +395,7 @@ public class JavaDescriptorResolver {
ResolverBinaryClassData
classData
=
new
ResolverBinaryClassData
(
psiClass
,
fqName
,
new
MutableClassDescriptorLite
(
containingDeclaration
,
kind
));
classDescriptorCache
.
put
(
fqName
,
classData
);
classData
.
classDescriptor
.
setName
(
name
);
classData
.
classDescriptor
.
setAnnotations
(
resolveAnnotations
(
psiClass
));
classData
.
classDescriptor
.
setAnnotations
(
resolveAnnotations
(
psiClass
,
taskList
));
List
<
JetType
>
supertypes
=
new
ArrayList
<
JetType
>();
...
...
@@ -1599,11 +1607,11 @@ public class JavaDescriptorResolver {
return
(
FunctionDescriptorImpl
)
substitutedFunctionDescriptor
;
}
private
List
<
AnnotationDescriptor
>
resolveAnnotations
(
PsiModifierListOwner
owner
)
{
private
List
<
AnnotationDescriptor
>
resolveAnnotations
(
PsiModifierListOwner
owner
,
@NotNull
List
<
Runnable
>
tasks
)
{
PsiAnnotation
[]
psiAnnotations
=
owner
.
getModifierList
().
getAnnotations
();
List
<
AnnotationDescriptor
>
r
=
Lists
.
newArrayListWithCapacity
(
psiAnnotations
.
length
);
for
(
PsiAnnotation
psiAnnotation
:
psiAnnotations
)
{
AnnotationDescriptor
annotation
=
resolveAnnotation
(
psiAnnotation
);
AnnotationDescriptor
annotation
=
resolveAnnotation
(
psiAnnotation
,
tasks
);
if
(
annotation
!=
null
)
{
r
.
add
(
annotation
);
}
...
...
@@ -1611,9 +1619,18 @@ public class JavaDescriptorResolver {
return
r
;
}
private
List
<
AnnotationDescriptor
>
resolveAnnotations
(
PsiModifierListOwner
owner
)
{
List
<
Runnable
>
tasks
=
Lists
.
newArrayList
();
List
<
AnnotationDescriptor
>
annotations
=
resolveAnnotations
(
owner
,
tasks
);
for
(
Runnable
task
:
tasks
)
{
task
.
run
();
}
return
annotations
;
}
@Nullable
private
AnnotationDescriptor
resolveAnnotation
(
PsiAnnotation
psiAnnotation
)
{
AnnotationDescriptor
annotation
=
new
AnnotationDescriptor
();
private
AnnotationDescriptor
resolveAnnotation
(
PsiAnnotation
psiAnnotation
,
@NotNull
List
<
Runnable
>
taskList
)
{
final
AnnotationDescriptor
annotation
=
new
AnnotationDescriptor
();
String
qname
=
psiAnnotation
.
getQualifiedName
();
if
(
qname
.
startsWith
(
"java.lang.annotation."
)
||
qname
.
startsWith
(
"jet.runtime.typeinfo."
)
||
qname
.
equals
(
JvmAbi
.
JETBRAINS_NOT_NULL_ANNOTATION
.
getFqName
().
getFqName
()))
{
...
...
@@ -1621,18 +1638,16 @@ public class JavaDescriptorResolver {
return
null
;
}
final
ClassDescriptor
clazz
=
resolveClass
(
new
FqName
(
psiAnnotation
.
getQualifiedName
()),
DescriptorSearchRule
.
INCLUDE_KOTLIN
);
final
ClassDescriptor
clazz
=
resolveClass
(
new
FqName
(
psiAnnotation
.
getQualifiedName
()),
DescriptorSearchRule
.
INCLUDE_KOTLIN
,
taskList
);
if
(
clazz
==
null
)
{
return
null
;
}
// TODO: no lazy types
//annotation.setAnnotationType(clazz.getDefaultType());
annotation
.
setAnnotationType
(
DeferredType
.
create
(
new
BindingTraceContext
(),
new
LazyValue
<
JetType
>()
{
taskList
.
add
(
new
Runnable
()
{
@Override
p
rotected
JetType
compute
()
{
return
clazz
.
getDefaultType
(
);
p
ublic
void
run
()
{
annotation
.
setAnnotationType
(
clazz
.
getDefaultType
()
);
}
})
)
;
});
ArrayList
<
CompileTimeConstant
<?>>
valueArguments
=
new
ArrayList
<
CompileTimeConstant
<?>>();
PsiAnnotationParameterList
parameterList
=
psiAnnotation
.
getParameterList
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录