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

Made parameter of renderType() @NotNull.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-12-26 23:50:13 +04:00
parent 8659d14ba0
commit c0ce15ddfb
5 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRenderer.java
+1 -1
View File
@@ -45,7 +45,7 @@ public interface DescriptorRenderer extends Renderer<DeclarationDescriptor> {
DescriptorRenderer HTML = new DescriptorRendererBuilder().setTextFormat(TextFormat.HTML).build();
@NotNull
String renderType(@Nullable JetType type);
String renderType(@NotNull JetType type);
@NotNull
@Override
compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java
+5 -8
View File
@@ -21,7 +21,6 @@ import com.google.common.collect.Sets;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.psi.tree.IElementType;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.descriptors.annotations.Annotated;
import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
@@ -180,15 +179,12 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
/* TYPES RENDERING */
@NotNull
@Override
public String renderType(@Nullable JetType type) {
public String renderType(@NotNull JetType type) {
return escape(renderTypeWithoutEscape(type));
}
private String renderTypeWithoutEscape(@Nullable JetType type) {
if (type == null) {
return "[NULL]";
}
else if (type == CallResolverUtil.DONT_CARE || type == CallResolverUtil.CANT_INFER) {
private String renderTypeWithoutEscape(@NotNull JetType type) {
if (type == CallResolverUtil.DONT_CARE || type == CallResolverUtil.CANT_INFER) {
return "???";
}
else if (type == CallResolverUtil.PLACEHOLDER_FUNCTION_TYPE) {
@@ -432,7 +428,8 @@ public class DescriptorRendererImpl implements DescriptorRenderer {
renderName(function, builder);
renderValueParameters(function, builder);
builder.append(" : ").append(escape(renderType(function.getReturnType())));
JetType returnType = function.getReturnType();
builder.append(" : ").append(returnType == null ? "[NULL]" : escape(renderType(returnType)));
renderWhereSuffix(function.getTypeParameters(), builder);
}