Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
ad795d95
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,发现更多精彩内容 >>
提交
ad795d95
编写于
12月 21, 2011
作者:
S
Stepan Koltsov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
check $$TImpl class is not visible through JavaDescriptorResolver
上级
6aca83b7
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
29 addition
and
3 deletion
+29
-3
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassMembersScope.java
...etbrains/jet/lang/resolve/java/JavaClassMembersScope.java
+4
-1
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
...tbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+15
-1
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaPackageScope.java
...org/jetbrains/jet/lang/resolve/java/JavaPackageScope.java
+4
-1
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaTypeTransformer.java
.../jetbrains/jet/lang/resolve/java/JavaTypeTransformer.java
+3
-0
compiler/tests/org/jetbrains/jet/ReadClassDataTest.java
compiler/tests/org/jetbrains/jet/ReadClassDataTest.java
+3
-0
未找到文件。
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassMembersScope.java
浏览文件 @
ad795d95
...
...
@@ -106,7 +106,10 @@ public class JavaClassMembersScope implements JetScope {
for
(
PsiClass
innerClass
:
psiClass
.
getAllInnerClasses
())
{
if
(
name
.
equals
(
innerClass
.
getName
()))
{
if
(
innerClass
.
hasModifierProperty
(
PsiModifier
.
STATIC
)
!=
staticMembers
)
return
null
;
return
semanticServices
.
getDescriptorResolver
().
resolveClass
(
innerClass
);
ClassDescriptor
classDescriptor
=
semanticServices
.
getDescriptorResolver
().
resolveClass
(
innerClass
);
if
(
classDescriptor
!=
null
)
{
return
classDescriptor
;
}
}
}
return
null
;
...
...
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
浏览文件 @
ad795d95
...
...
@@ -106,9 +106,14 @@ public class JavaDescriptorResolver {
this
.
semanticServices
=
semanticServices
;
}
@N
otNull
@N
ullable
public
ClassDescriptor
resolveClass
(
@NotNull
PsiClass
psiClass
)
{
String
qualifiedName
=
psiClass
.
getQualifiedName
();
if
(
qualifiedName
.
endsWith
(
JvmAbi
.
TRAIT_IMPL_SUFFIX
))
{
// TODO: only if -$$TImpl class is created by Kotlin
return
null
;
}
// First, let's check that this is a real Java class, not a Java's view on a Kotlin class:
ClassDescriptor
kotlinClassDescriptor
=
semanticServices
.
getKotlinClassDescriptor
(
qualifiedName
);
...
...
@@ -127,6 +132,12 @@ public class JavaDescriptorResolver {
@Nullable
public
ClassDescriptor
resolveClass
(
@NotNull
String
qualifiedName
)
{
if
(
qualifiedName
.
endsWith
(
JvmAbi
.
TRAIT_IMPL_SUFFIX
))
{
// TODO: only if -$$TImpl class is created by Kotlin
return
null
;
}
// First, let's check that this is a real Java class, not a Java's view on a Kotlin class:
ClassDescriptor
kotlinClassDescriptor
=
semanticServices
.
getKotlinClassDescriptor
(
qualifiedName
);
if
(
kotlinClassDescriptor
!=
null
)
{
...
...
@@ -753,6 +764,9 @@ public class JavaDescriptorResolver {
return
functionDescriptor
;
}
DeclarationDescriptor
classDescriptor
=
method
.
hasModifierProperty
(
PsiModifier
.
STATIC
)
?
resolveNamespace
(
method
.
getContainingClass
())
:
resolveClass
(
method
.
getContainingClass
());
if
(
classDescriptor
==
null
)
{
return
null
;
}
PsiParameter
[]
parameters
=
method
.
getParameterList
().
getParameters
();
FunctionDescriptorImpl
functionDescriptorImpl
=
new
FunctionDescriptorImpl
(
owner
,
...
...
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaPackageScope.java
浏览文件 @
ad795d95
...
...
@@ -94,7 +94,10 @@ public class JavaPackageScope extends JetScopeImpl {
}
if
(
psiClass
.
hasModifierProperty
(
PsiModifier
.
PUBLIC
))
{
allDescriptors
.
add
(
descriptorResolver
.
resolveClass
(
psiClass
));
ClassDescriptor
classDescriptor
=
descriptorResolver
.
resolveClass
(
psiClass
);
if
(
classDescriptor
!=
null
)
{
allDescriptors
.
add
(
classDescriptor
);
}
}
}
}
...
...
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaTypeTransformer.java
浏览文件 @
ad795d95
...
...
@@ -94,6 +94,9 @@ public class JavaTypeTransformer {
}
ClassDescriptor
descriptor
=
resolver
.
resolveClass
(
psiClass
);
if
(
descriptor
==
null
)
{
return
ErrorUtils
.
createErrorType
(
"Unresolve java class: "
+
classType
.
getPresentableText
());
}
List
<
TypeProjection
>
arguments
=
Lists
.
newArrayList
();
if
(
classType
.
isRaw
())
{
...
...
compiler/tests/org/jetbrains/jet/ReadClassDataTest.java
浏览文件 @
ad795d95
...
...
@@ -22,6 +22,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext;
import
org.jetbrains.jet.lang.resolve.BindingTraceContext
;
import
org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver
;
import
org.jetbrains.jet.lang.resolve.java.JavaSemanticServices
;
import
org.jetbrains.jet.lang.resolve.java.JvmAbi
;
import
org.jetbrains.jet.lang.resolve.scopes.JetScope
;
import
org.jetbrains.jet.lang.resolve.scopes.receivers.ExtensionReceiver
;
import
org.jetbrains.jet.lang.types.JetType
;
...
...
@@ -123,6 +124,8 @@ public class ReadClassDataTest extends UsefulTestCase {
if
(
ad
instanceof
ClassifierDescriptor
)
{
ClassifierDescriptor
bd
=
nsb
.
getMemberScope
().
getClassifier
(
ad
.
getName
());
compareClassifiers
((
ClassifierDescriptor
)
ad
,
bd
);
Assert
.
assertNull
(
nsb
.
getMemberScope
().
getClassifier
(
ad
.
getName
()
+
JvmAbi
.
TRAIT_IMPL_SUFFIX
));
}
else
if
(
ad
instanceof
FunctionDescriptor
)
{
Set
<
FunctionDescriptor
>
functions
=
nsb
.
getMemberScope
().
getFunctions
(
ad
.
getName
());
Assert
.
assertTrue
(
functions
.
size
()
>=
1
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录