azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JS/RTTI: fix nullability check

Browse Source
This commit is contained in:
Alexey Tsvetkov
2015-06-23 19:37:48 +03:00
committed by Alexey Andreev
parent 7a5b4650ad
commit 87659bd95b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/kotlin/js/translate/expression/PatternTranslator.java
+2 -2
View File
@@ -105,7 +105,7 @@ public final class PatternTranslator extends AbstractTranslator {
@NotNull @NotNull
public JsExpression translateIsCheck(@NotNull JsExpression subject, @NotNull KtTypeReference typeReference) { public JsExpression translateIsCheck(@NotNull JsExpression subject, @NotNull KtTypeReference typeReference) {
KotlinType type = BindingUtils.getTypeByReference(bindingContext(), typeReference); KotlinType type = BindingUtils.getTypeByReference(bindingContext(), typeReference);
JsExpression checkFunReference = getIsTypeCheckCallable(type); JsExpression checkFunReference = doGetIsTypeCheckCallable(type);
if (isReifiedTypeParameter(type) && findChildByType(typeReference, KtNodeTypes.NULLABLE_TYPE) != null) { if (isReifiedTypeParameter(type) && findChildByType(typeReference, KtNodeTypes.NULLABLE_TYPE) != null) {
checkFunReference = namer().orNull(checkFunReference); checkFunReference = namer().orNull(checkFunReference);
@@ -118,7 +118,7 @@ public final class PatternTranslator extends AbstractTranslator {
public JsExpression getIsTypeCheckCallable(@NotNull KotlinType type) { public JsExpression getIsTypeCheckCallable(@NotNull KotlinType type) {
JsExpression callable = doGetIsTypeCheckCallable(type); JsExpression callable = doGetIsTypeCheckCallable(type);
if (isNullableType(type) && !isReifiedTypeParameter(type)) { if (isNullableType(type)) {
return namer().orNull(callable); return namer().orNull(callable);
} }