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

Renamed JetType.isNullable() to isMarkedNullable()

Browse Source
This commit is contained in:
Valentin Kipyatkov
2014-12-03 21:36:10 +03:00
parent c76e69af62
commit b8d1f115bf
53 changed files with 91 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/js.translator/src/org/jetbrains/k2js/translate/expression/PatternTranslator.java
+1 -1
View File
@@ -117,7 +117,7 @@ public final class PatternTranslator extends AbstractTranslator {
}
private boolean isNullable(JetTypeReference typeReference) {
return getTypeByReference(bindingContext(), typeReference).isNullable();
return getTypeByReference(bindingContext(), typeReference).isMarkedNullable();
}
@NotNull
js/js.translator/src/org/jetbrains/k2js/translate/expression/StringTemplateTranslator.java
+1 -1
View File
@@ -90,7 +90,7 @@ public final class StringTemplateTranslator extends AbstractTranslator {
}
JetType type = context().bindingContext().get(BindingContext.EXPRESSION_TYPE, entryExpression);
if (type == null || type.isNullable()) {
if (type == null || type.isMarkedNullable()) {
append(TopLevelFIF.TO_STRING.apply((JsExpression) null, Collections.singletonList(translatedExpression), context()));
}
else if (mustCallToString(type)) {
js/js.translator/src/org/jetbrains/k2js/translate/operation/UnaryOperationTranslator.java
+1 -1
View File
@@ -57,7 +57,7 @@ public final class UnaryOperationTranslator {
JetExpression baseExpression = getBaseExpression(expression);
JetType type = BindingContextUtils.getNotNull(context.bindingContext(), BindingContext.EXPRESSION_TYPE, baseExpression);
JsExpression translatedExpression = translateAsExpression(baseExpression, context);
return type.isNullable() ? sure(translatedExpression, context) : translatedExpression;
return type.isMarkedNullable() ? sure(translatedExpression, context) : translatedExpression;
}
if (operationToken == JetTokens.MINUS) {