Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
7af5282a
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,发现更多精彩内容 >>
提交
7af5282a
编写于
4月 28, 2012
作者:
S
Stepan Koltsov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
resolve generic constructor
上级
00739592
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
55 addition
and
0 deletion
+55
-0
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaTypeTransformer.java
.../jetbrains/jet/lang/resolve/java/JavaTypeTransformer.java
+16
-0
compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericDeep.java
...adJavaBinaryClass/constructor/ConstructorGenericDeep.java
+5
-0
compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericDeep.kt
...readJavaBinaryClass/constructor/ConstructorGenericDeep.kt
+3
-0
compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericDeep.txt
...eadJavaBinaryClass/constructor/ConstructorGenericDeep.txt
+5
-0
compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericSimple.java
...JavaBinaryClass/constructor/ConstructorGenericSimple.java
+5
-0
compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericSimple.kt
...adJavaBinaryClass/constructor/ConstructorGenericSimple.kt
+3
-0
compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericSimple.txt
...dJavaBinaryClass/constructor/ConstructorGenericSimple.txt
+5
-0
compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericUpperBound.java
...BinaryClass/constructor/ConstructorGenericUpperBound.java
+5
-0
compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericUpperBound.kt
...vaBinaryClass/constructor/ConstructorGenericUpperBound.kt
+3
-0
compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericUpperBound.txt
...aBinaryClass/constructor/ConstructorGenericUpperBound.txt
+5
-0
未找到文件。
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaTypeTransformer.java
浏览文件 @
7af5282a
...
...
@@ -17,6 +17,7 @@
package
org.jetbrains.jet.lang.resolve.java
;
import
com.google.common.collect.Lists
;
import
com.google.common.collect.Sets
;
import
com.intellij.psi.*
;
import
org.jetbrains.annotations.NotNull
;
import
org.jetbrains.annotations.Nullable
;
...
...
@@ -25,6 +26,7 @@ import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor;
import
org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor
;
import
org.jetbrains.jet.lang.resolve.FqName
;
import
org.jetbrains.jet.lang.types.*
;
import
org.jetbrains.jet.lang.types.checker.JetTypeChecker
;
import
org.jetbrains.jet.lang.types.lang.JetStandardClasses
;
import
org.jetbrains.jet.lang.types.lang.JetStandardLibrary
;
import
org.jetbrains.jet.lang.types.lang.PrimitiveType
;
...
...
@@ -35,6 +37,7 @@ import java.util.Collections;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Set
;
/**
* @author abreslav
...
...
@@ -126,6 +129,19 @@ public class JavaTypeTransformer {
if
(
psiClass
instanceof
PsiTypeParameter
)
{
PsiTypeParameter
typeParameter
=
(
PsiTypeParameter
)
psiClass
;
PsiTypeParameterListOwner
typeParameterListOwner
=
typeParameter
.
getOwner
();
if
(
typeParameterListOwner
instanceof
PsiMethod
)
{
PsiMethod
psiMethod
=
(
PsiMethod
)
typeParameterListOwner
;
if
(
psiMethod
.
isConstructor
())
{
Set
<
JetType
>
supertypesJet
=
Sets
.
newHashSet
();
for
(
PsiClassType
supertype
:
typeParameter
.
getExtendsListTypes
())
{
supertypesJet
.
add
(
transformToType
(
supertype
,
TypeUsage
.
UPPER_BOUND
,
typeVariableResolver
));
}
return
TypeUtils
.
intersect
(
JetTypeChecker
.
INSTANCE
,
supertypesJet
);
}
}
TypeParameterDescriptor
typeParameterDescriptor
=
typeVariableResolver
.
getTypeVariable
(
typeParameter
.
getName
());
if
(
howThisTypeIsUsed
==
TypeUsage
.
TYPE_ARGUMENT
||
howThisTypeIsUsed
==
TypeUsage
.
UPPER_BOUND
)
{
...
...
compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericDeep.java
0 → 100644
浏览文件 @
7af5282a
package
test
;
class
ConstructorGenericDeep
{
<
P
>
ConstructorGenericDeep
(
java
.
lang
.
Class
<
P
>
cl
)
{}
}
compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericDeep.kt
0 → 100644
浏览文件 @
7af5282a
package
test
open
class
ConstructorGenericDeep
(
p0
:
java
.
lang
.
Class
<
Any
?
>?)
:
java
.
lang
.
Object
()
compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericDeep.txt
0 → 100644
浏览文件 @
7af5282a
namespace test
open class test.ConstructorGenericDeep : java.lang.Object {
final /*constructor*/ fun <init>(/*0*/ p0: java.lang.Class<jet.Any?>?): test.ConstructorGenericDeep
}
compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericSimple.java
0 → 100644
浏览文件 @
7af5282a
package
test
;
class
ConstructorGenericSimple
{
<
P
>
ConstructorGenericSimple
(
P
p
)
{}
}
compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericSimple.kt
0 → 100644
浏览文件 @
7af5282a
package
test
open
class
ConstructorGenericSimple
(
p0
:
Any
?)
:
java
.
lang
.
Object
()
compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericSimple.txt
0 → 100644
浏览文件 @
7af5282a
namespace test
open class test.ConstructorGenericSimple : java.lang.Object {
final /*constructor*/ fun <init>(/*0*/ p0: jet.Any?): test.ConstructorGenericSimple
}
compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericUpperBound.java
0 → 100644
浏览文件 @
7af5282a
package
test
;
class
ConstructorGenericUpperBound
{
<
P
extends
java
.
util
.
RandomAccess
>
ConstructorGenericUpperBound
(
P
p
)
{}
}
compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericUpperBound.kt
0 → 100644
浏览文件 @
7af5282a
package
test
open
class
ConstructorGenericUpperBound
(
p0
:
java
.
util
.
RandomAccess
?)
:
java
.
lang
.
Object
()
compiler/testData/readJavaBinaryClass/constructor/ConstructorGenericUpperBound.txt
0 → 100644
浏览文件 @
7af5282a
namespace test
open class test.ConstructorGenericUpperBound : java.lang.Object {
final /*constructor*/ fun <init>(/*0*/ p0: java.util.RandomAccess?): test.ConstructorGenericUpperBound
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录