Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
9333e5c1
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,发现更多精彩内容 >>
提交
9333e5c1
编写于
3月 19, 2012
作者:
S
Stepan Koltsov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
do not enforce order of members in JavaPackageScope and JavaClassMemberScope
上级
9557507b
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
29 addition
and
16 deletion
+29
-16
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassMembersScope.java
...etbrains/jet/lang/resolve/java/JavaClassMembersScope.java
+1
-1
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
...tbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+2
-2
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolverHelper.java
...s/jet/lang/resolve/java/JavaDescriptorResolverHelper.java
+5
-2
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaPackageScope.java
...org/jetbrains/jet/lang/resolve/java/JavaPackageScope.java
+1
-1
idea/src/org/jetbrains/jet/plugin/libraries/DecompiledDataFactory.java
...jetbrains/jet/plugin/libraries/DecompiledDataFactory.java
+14
-4
idea/testData/libraries/ClassWithAbstractAndOpenMembers.kt
idea/testData/libraries/ClassWithAbstractAndOpenMembers.kt
+4
-4
idea/testData/libraries/namespace.kt
idea/testData/libraries/namespace.kt
+2
-2
未找到文件。
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaClassMembersScope.java
浏览文件 @
9333e5c1
...
...
@@ -87,7 +87,7 @@ public class JavaClassMembersScope extends JavaClassOrPackageScope {
@Override
public
Collection
<
DeclarationDescriptor
>
getAllDescriptors
()
{
if
(
allDescriptors
==
null
)
{
allDescriptors
=
Sets
.
new
Linked
HashSet
();
allDescriptors
=
Sets
.
newHashSet
();
allDescriptors
.
addAll
(
semanticServices
.
getDescriptorResolver
().
resolveMethods
(
psiClass
,
descriptor
));
...
...
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
浏览文件 @
9333e5c1
...
...
@@ -1024,7 +1024,7 @@ public class JavaDescriptorResolver {
ResolverScopeData
scopeData
=
getResolverScopeData
(
owner
,
new
PsiClassWrapper
(
psiClass
));
Set
<
VariableDescriptor
>
descriptors
=
Sets
.
new
Linked
HashSet
();
Set
<
VariableDescriptor
>
descriptors
=
Sets
.
newHashSet
();
Map
<
String
,
NamedMembers
>
membersForProperties
=
scopeData
.
namedMembersMap
;
for
(
Map
.
Entry
<
String
,
NamedMembers
>
entry
:
membersForProperties
.
entrySet
())
{
NamedMembers
namedMembers
=
entry
.
getValue
();
...
...
@@ -1284,7 +1284,7 @@ public class JavaDescriptorResolver {
final
Set
<
FunctionDescriptor
>
functions
=
new
HashSet
<
FunctionDescriptor
>();
Set
<
SimpleFunctionDescriptor
>
functionsFromCurrent
=
Sets
.
new
Linked
HashSet
();
Set
<
SimpleFunctionDescriptor
>
functionsFromCurrent
=
Sets
.
newHashSet
();
for
(
PsiMethodWrapper
method
:
namedMembers
.
methods
)
{
FunctionDescriptorImpl
function
=
resolveMethodToFunctionDescriptor
(
owner
,
psiClass
,
method
);
...
...
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolverHelper.java
浏览文件 @
9333e5c1
...
...
@@ -18,11 +18,14 @@ package org.jetbrains.jet.lang.resolve.java;
import
com.intellij.openapi.util.text.StringUtil
;
import
com.intellij.psi.PsiField
;
import
com.intellij.psi.PsiMember
;
import
com.intellij.psi.PsiMethod
;
import
com.intellij.psi.PsiParameter
;
import
org.jetbrains.annotations.NotNull
;
import
java.util.LinkedHashMap
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
/**
...
...
@@ -37,7 +40,7 @@ class JavaDescriptorResolverHelper {
private
final
boolean
staticMembers
;
private
final
boolean
kotlin
;
private
Map
<
String
,
NamedMembers
>
namedMembersMap
=
new
Linked
HashMap
<
String
,
NamedMembers
>();
private
Map
<
String
,
NamedMembers
>
namedMembersMap
=
new
HashMap
<
String
,
NamedMembers
>();
private
Builder
(
PsiClassWrapper
psiClass
,
boolean
staticMembers
,
boolean
kotlin
)
{
this
.
psiClass
=
psiClass
;
...
...
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaPackageScope.java
浏览文件 @
9333e5c1
...
...
@@ -99,7 +99,7 @@ public class JavaPackageScope extends JavaClassOrPackageScope {
@Override
public
Collection
<
DeclarationDescriptor
>
getAllDescriptors
()
{
if
(
allDescriptors
==
null
)
{
allDescriptors
=
Sets
.
new
Linked
HashSet
();
allDescriptors
=
Sets
.
newHashSet
();
if
(
psiClass
!=
null
)
{
allDescriptors
.
addAll
(
semanticServices
.
getDescriptorResolver
().
resolveMethods
(
psiClass
,
descriptor
));
...
...
idea/src/org/jetbrains/jet/plugin/libraries/DecompiledDataFactory.java
浏览文件 @
9333e5c1
...
...
@@ -37,8 +37,7 @@ import org.jetbrains.jet.lang.resolve.java.JavaSemanticServices;
import
org.jetbrains.jet.lang.resolve.java.JvmAbi
;
import
org.jetbrains.jet.resolve.DescriptorRenderer
;
import
java.util.HashMap
;
import
java.util.Map
;
import
java.util.*
;
/**
* @author Evgeny Gerashchenko
...
...
@@ -85,7 +84,7 @@ class DecompiledDataFactory {
NamespaceDescriptor
nd
=
myJavaDescriptorResolver
.
resolveNamespace
(
new
FqName
(
packageName
));
if
(
nd
!=
null
)
{
for
(
DeclarationDescriptor
member
:
nd
.
getMemberScope
().
getAllDescriptors
(
))
{
for
(
DeclarationDescriptor
member
:
sortDeclarations
(
nd
.
getMemberScope
().
getAllDescriptors
()
))
{
if
(
member
instanceof
ClassDescriptor
||
member
instanceof
NamespaceDescriptor
)
{
continue
;
}
...
...
@@ -114,6 +113,17 @@ class DecompiledDataFactory {
return
new
JetDecompiledData
(
jetFile
,
myClsElementsToJetElements
);
}
private
List
<
DeclarationDescriptor
>
sortDeclarations
(
Collection
<
DeclarationDescriptor
>
input
)
{
ArrayList
<
DeclarationDescriptor
>
r
=
new
ArrayList
<
DeclarationDescriptor
>(
input
);
Collections
.
sort
(
r
,
new
Comparator
<
DeclarationDescriptor
>()
{
@Override
public
int
compare
(
DeclarationDescriptor
o1
,
DeclarationDescriptor
o2
)
{
return
o1
.
getName
().
compareTo
(
o2
.
getName
());
}
});
return
r
;
}
private
void
appendDescriptor
(
DeclarationDescriptor
descriptor
,
String
indent
)
{
int
startOffset
=
myBuilder
.
length
();
myBuilder
.
append
(
DescriptorRenderer
.
COMPACT
.
render
(
descriptor
));
...
...
@@ -140,7 +150,7 @@ class DecompiledDataFactory {
myBuilder
.
append
(
subindent
).
append
(
"class "
);
appendDescriptor
(
classDescriptor
.
getClassObjectDescriptor
(),
subindent
);
}
for
(
DeclarationDescriptor
member
:
classDescriptor
.
getDefaultType
().
getMemberScope
().
getAllDescriptors
(
))
{
for
(
DeclarationDescriptor
member
:
sortDeclarations
(
classDescriptor
.
getDefaultType
().
getMemberScope
().
getAllDescriptors
()
))
{
if
(
member
.
getContainingDeclaration
()
==
descriptor
)
{
if
(
firstPassed
)
{
myBuilder
.
append
(
"\n"
);
...
...
idea/testData/libraries/ClassWithAbstractAndOpenMembers.kt
浏览文件 @
9333e5c1
...
...
@@ -6,16 +6,16 @@ package testData.libraries
[
abstract
class
ClassWithAbstractAndOpenMembers
{
[abstract fun abstractFun() : Unit]
[open fun openFun() : Unit { /* compiled code */ }]
[abstract val abstractVal : jet.String]
[abstract var abstractVar : jet.String]
[open fun openFun() : Unit { /* compiled code */ }]
[open val openVal : jet.String]
/* compiled code */
[open val openValWithGetter : jet.String]
/* compiled code */
[abstract var abstractVar : jet.String]
[open var openVar : jet.String]
/* compiled code */
[open var openVarWithGetter : jet.String]
/* compiled code */
...
...
idea/testData/libraries/namespace.kt
浏览文件 @
9333e5c1
...
...
@@ -3,8 +3,8 @@
package
testData.libraries
[final fun main(val args : jet.Array<jet.String>) : Unit { /* compiled code */ }]
[final val globalVal : #(jet.Int, jet.String)]
/* compiled code */
[final val globalValWithGetter : jet.Long]
/* compiled code */
[final fun main(val args : jet.Array<jet.String>) : Unit { /* compiled code */ }]
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录