Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
硅谷海盗
kotlin
提交
bf54dc54
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,发现更多精彩内容 >>
提交
bf54dc54
编写于
12月 06, 2011
作者:
S
Stepan Koltsov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
test nullable return types are read from .class files
上级
a9d1cea9
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
33 addition
and
4 deletion
+33
-4
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
...tbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+25
-1
compiler/testData/readClass/ReturnTypeNotNull.kt
compiler/testData/readClass/ReturnTypeNotNull.kt
+3
-0
compiler/testData/readClass/ReturnTypeNullable.kt
compiler/testData/readClass/ReturnTypeNullable.kt
+3
-0
compiler/tests/org/jetbrains/jet/ReadClassDataTest.java
compiler/tests/org/jetbrains/jet/ReadClassDataTest.java
+2
-3
未找到文件。
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
浏览文件 @
bf54dc54
...
...
@@ -479,7 +479,7 @@ public class JavaDescriptorResolver {
DescriptorUtils
.
getExpectedThisObjectIfNeeded
(
classDescriptor
),
typeParameters
,
semanticServices
.
getDescriptorResolver
().
resolveParameterDescriptors
(
functionDescriptorImpl
,
parameters
),
semanticServices
.
get
TypeTransformer
().
transformToType
(
returnType
),
semanticServices
.
get
DescriptorResolver
().
makeReturnType
(
returnType
,
method
),
Modality
.
convertFromFlags
(
method
.
hasModifierProperty
(
PsiModifier
.
ABSTRACT
),
!
method
.
hasModifierProperty
(
PsiModifier
.
FINAL
)),
resolveVisibilityFromPsiModifiers
(
method
)
);
...
...
@@ -491,6 +491,30 @@ public class JavaDescriptorResolver {
return
substitutedFunctionDescriptor
;
}
private
JetType
makeReturnType
(
PsiType
returnType
,
PsiMethod
method
)
{
boolean
changeNullable
=
false
;
boolean
nullable
=
true
;
for
(
PsiAnnotation
annotation
:
method
.
getModifierList
().
getAnnotations
())
{
if
(
annotation
.
getQualifiedName
().
equals
(
"jet.typeinfo.JetMethod"
))
{
PsiLiteralExpression
nullableExpression
=
(
PsiLiteralExpression
)
annotation
.
findAttributeValue
(
"nullableReturnType"
);
if
(
nullableExpression
!=
null
)
{
nullable
=
(
Boolean
)
nullableExpression
.
getValue
();
}
else
{
// default value of parameter
nullable
=
false
;
changeNullable
=
true
;
}
}
}
JetType
transformedType
=
semanticServices
.
getTypeTransformer
().
transformToType
(
returnType
);
if
(
changeNullable
)
{
return
TypeUtils
.
makeNullableAsSpecified
(
transformedType
,
nullable
);
}
else
{
return
transformedType
;
}
}
private
static
Visibility
resolveVisibilityFromPsiModifiers
(
PsiModifierListOwner
modifierListOwner
)
{
//TODO report error
return
modifierListOwner
.
hasModifierProperty
(
PsiModifier
.
PUBLIC
)
?
Visibility
.
PUBLIC
:
...
...
compiler/testData/readClass/ReturnTypeNotNull.kt
0 → 100644
浏览文件 @
bf54dc54
namespace
test
fun
ff
():
String
=
""
compiler/testData/readClass/ReturnTypeNullable.kt
0 → 100644
浏览文件 @
bf54dc54
namespace
test
fun
ff
():
String
?
=
""
compiler/tests/org/jetbrains/jet/ReadClassDataTest.java
浏览文件 @
bf54dc54
...
...
@@ -105,8 +105,6 @@ public class ReadClassDataTest extends UsefulTestCase {
@Override
public
void
runTest
()
throws
Exception
{
if
(
true
)
return
;
createMockCoreEnvironment
();
LanguageASTFactory
.
INSTANCE
.
addExplicitExtension
(
JavaLanguage
.
INSTANCE
,
new
JavaASTFactory
());
...
...
@@ -184,7 +182,8 @@ public class ReadClassDataTest extends UsefulTestCase {
for
(
int
i
=
0
;
i
<
a
.
getValueParameters
().
size
();
++
i
)
{
compareAnything
(
ValueParameterDescriptor
.
class
,
a
.
getValueParameters
().
get
(
i
),
b
.
getValueParameters
().
get
(
i
));
}
System
.
out
.
println
(
"function "
+
a
.
getName
());
Assert
.
assertEquals
(
a
.
getReturnType
(),
b
.
getReturnType
());
System
.
out
.
println
(
"fun "
+
a
.
getName
()
+
"(...): "
+
a
.
getReturnType
());
}
private
<
T
>
void
compareAnything
(
Class
<
T
>
clazz
,
T
a
,
T
b
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录