Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
4443f912
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,发现更多精彩内容 >>
提交
4443f912
编写于
3月 11, 2012
作者:
S
Stepan Koltsov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix PackageScope.getAllDescriptors
http://youtrack.jetbrains.com/issue/KT-1553
上级
0c2b91aa
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
14 addition
and
15 deletion
+14
-15
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassMembersScope.java
...etbrains/jet/lang/resolve/java/JavaClassMembersScope.java
+3
-0
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
...tbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+1
-1
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaPackageScope.java
...org/jetbrains/jet/lang/resolve/java/JavaPackageScope.java
+10
-14
未找到文件。
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassMembersScope.java
浏览文件 @
4443f912
...
...
@@ -80,6 +80,9 @@ public class JavaClassMembersScope extends JavaClassOrPackageScope {
return
Collections
.
emptySet
();
}
/**
* @see JavaPackageScope#getAllDescriptors()
*/
@NotNull
@Override
public
Collection
<
DeclarationDescriptor
>
getAllDescriptors
()
{
...
...
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
浏览文件 @
4443f912
...
...
@@ -1530,7 +1530,7 @@ public class JavaDescriptorResolver {
return
annotation
;
}
public
List
<
FunctionDescriptor
>
resolveMethods
(
PsiClass
psiClass
,
ClassOrNamespaceDescriptor
containingDeclaration
)
{
public
List
<
FunctionDescriptor
>
resolveMethods
(
@NotNull
PsiClass
psiClass
,
@NotNull
ClassOrNamespaceDescriptor
containingDeclaration
)
{
ResolverScopeData
scopeData
=
getResolverScopeData
(
containingDeclaration
,
new
PsiClassWrapper
(
psiClass
));
TypeSubstitutor
substitutorForGenericSupertypes
=
typeSubstitutorForGenericSupertypes
(
scopeData
);
...
...
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaPackageScope.java
浏览文件 @
4443f912
...
...
@@ -87,12 +87,21 @@ public class JavaPackageScope extends JavaClassOrPackageScope {
return
true
;
}
/**
* @see JavaClassMembersScope#getAllDescriptors()
*/
@NotNull
@Override
public
Collection
<
DeclarationDescriptor
>
getAllDescriptors
()
{
if
(
allDescriptors
==
null
)
{
allDescriptors
=
Sets
.
newHashSet
();
if
(
psiClass
!=
null
)
{
allDescriptors
.
addAll
(
semanticServices
.
getDescriptorResolver
().
resolveMethods
(
psiClass
,
descriptor
));
allDescriptors
.
addAll
(
semanticServices
.
getDescriptorResolver
().
resolveFieldGroup
(
descriptor
,
psiClass
,
staticMembers
()));
}
final
PsiPackage
javaPackage
=
semanticServices
.
getDescriptorResolver
().
findPackage
(
packageFQN
);
if
(
javaPackage
!=
null
)
{
...
...
@@ -118,20 +127,7 @@ public class JavaPackageScope extends JavaClassOrPackageScope {
// TODO: Temp hack for collection function descriptors from java
if
(
JvmAbi
.
PACKAGE_CLASS
.
equals
(
psiClass
.
getName
()))
{
HashSet
<
String
>
methodNames
=
new
HashSet
<
String
>();
for
(
PsiMethod
psiMethod
:
psiClass
.
getMethods
())
{
methodNames
.
add
(
psiMethod
.
getName
());
}
for
(
String
methodName
:
methodNames
)
{
try
{
allDescriptors
.
addAll
(
getFunctions
(
methodName
));
}
catch
(
ProcessCanceledException
cancelException
)
{
throw
cancelException
;
}
catch
(
RuntimeException
ex
)
{
LOG
.
error
(
ex
);
}
}
continue
;
}
if
(
psiClass
.
hasModifierProperty
(
PsiModifier
.
PUBLIC
))
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录