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

Extracted DescriptorRenderer interface.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-12-13 21:48:18 +04:00
parent b73ba148b6
commit 1cfc5f366e
45 changed files with 188 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/ExpressionCodegen.java
+3 -3
View File
@@ -59,7 +59,7 @@ import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import java.util.*;
@@ -3290,9 +3290,9 @@ The "returned" value of try expression with no finally is either the last expres
v.dup();
Label nonnull = new Label();
v.ifnonnull(nonnull);
throwNewException(CLASS_TYPE_CAST_EXCEPTION, DescriptorRendererImpl.TEXT.renderType(leftType) +
throwNewException(CLASS_TYPE_CAST_EXCEPTION, DescriptorRenderer.TEXT.renderType(leftType) +
" cannot be cast to " +
DescriptorRendererImpl.TEXT.renderType(rightType));
DescriptorRenderer.TEXT.renderType(rightType));
v.mark(nonnull);
}
}
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaToKotlinMethodMap.java
+2 -2
View File
@@ -28,7 +28,7 @@ import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.TypeUtils;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import java.util.Collection;
import java.util.List;
@@ -94,7 +94,7 @@ public class JavaToKotlinMethodMap {
@NotNull
public static String serializeFunction(@NotNull FunctionDescriptor fun) {
return DescriptorRendererImpl.TEXT.render(fun);
return DescriptorRenderer.TEXT.render(fun);
}
// used in generated code
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/ElementAlternativeSignatureData.java
+2 -2
View File
@@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.psi.JetTypeReference;
import org.jetbrains.jet.lang.resolve.AnalyzingUtils;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import java.util.List;
import java.util.Map;
@@ -97,7 +97,7 @@ public abstract class ElementAlternativeSignatureData {
else {
throw new AlternativeSignatureMismatchException(
"Return type in alternative signature is missing, while in real signature it is '%s'",
DescriptorRendererImpl.TEXT.renderType(originalType));
DescriptorRenderer.TEXT.renderType(originalType));
}
}
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java
+3 -3
View File
@@ -29,7 +29,7 @@ import org.jetbrains.jet.lang.resolve.java.*;
import org.jetbrains.jet.lang.resolve.scopes.JetScope;
import org.jetbrains.jet.lang.types.*;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import java.util.*;
@@ -67,7 +67,7 @@ class TypeTransformingVisitor extends JetVisitor<JetType, Void> {
public JetType visitNullableType(JetNullableType nullableType, Void aVoid) {
if (!originalType.isNullable() && typeUsage != TYPE_ARGUMENT) {
throw new AlternativeSignatureMismatchException("Auto type '%s' is not-null, while type in alternative signature is nullable: '%s'",
DescriptorRendererImpl.TEXT.renderType(originalType), nullableType.getText());
DescriptorRenderer.TEXT.renderType(originalType), nullableType.getText());
}
return TypeUtils.makeNullable(computeType(nullableType.getInnerType(), originalType, originalToAltTypeParameters, typeUsage));
}
@@ -117,7 +117,7 @@ class TypeTransformingVisitor extends JetVisitor<JetType, Void> {
if (arguments.size() != type.getTypeArgumentsAsTypes().size()) {
throw new AlternativeSignatureMismatchException("'%s' type in method signature has %d type arguments, while '%s' in alternative signature has %d of them",
DescriptorRendererImpl.TEXT.renderType(originalType), arguments.size(), type.getText(),
DescriptorRenderer.TEXT.renderType(originalType), arguments.size(), type.getText(),
type.getTypeArgumentsAsTypes().size());
}
compiler/frontend/src/org/jetbrains/jet/lang/descriptors/DeclarationDescriptorImpl.java
+2 -2
View File
@@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.descriptors.annotations.AnnotatedImpl;
import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import java.util.List;
@@ -57,7 +57,7 @@ public abstract class DeclarationDescriptorImpl extends AnnotatedImpl implements
@Override
public String toString() {
try {
return DescriptorRendererImpl.DEBUG_TEXT.render(this) + "[" + getClass().getSimpleName() + "@" + Integer.toHexString(System.identityHashCode(this)) + "]";
return DescriptorRenderer.DEBUG_TEXT.render(this) + "[" + getClass().getSimpleName() + "@" + Integer.toHexString(System.identityHashCode(this)) + "]";
} catch (Throwable e) {
// DescriptionRenderer may throw if this is not yet completely initialized
// It is very inconvenient while debugging
compiler/frontend/src/org/jetbrains/jet/lang/descriptors/MutableClassDescriptorLite.java
+2 -2
View File
@@ -26,7 +26,7 @@ import org.jetbrains.jet.lang.resolve.scopes.InnerClassesScopeWrapper;
import org.jetbrains.jet.lang.resolve.scopes.JetScope;
import org.jetbrains.jet.lang.resolve.scopes.WritableScope;
import org.jetbrains.jet.lang.types.*;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import java.util.ArrayList;
import java.util.Collection;
@@ -240,7 +240,7 @@ public abstract class MutableClassDescriptorLite extends ClassDescriptorBase {
@Override
public String toString() {
try {
return DescriptorRendererImpl.TEXT.render(this) + "[" + getClass().getCanonicalName() + "@" + System.identityHashCode(this) + "]";
return DescriptorRenderer.TEXT.render(this) + "[" + getClass().getCanonicalName() + "@" + System.identityHashCode(this) + "]";
} catch (Throwable e) {
return super.toString();
}
compiler/frontend/src/org/jetbrains/jet/lang/descriptors/TypeParameterDescriptorImpl.java
+2 -2
View File
@@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.resolve.scopes.LazyScopeAdapter;
import org.jetbrains.jet.lang.types.*;
import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import org.jetbrains.jet.util.lazy.LazyValue;
import java.util.Collections;
@@ -192,7 +192,7 @@ public class TypeParameterDescriptorImpl extends DeclarationDescriptorNonRootImp
@Override
public String toString() {
try {
return DescriptorRendererImpl.TEXT.render(this);
return DescriptorRenderer.TEXT.render(this);
} catch (Exception e) {
return this.getClass().getName() + "@" + System.identityHashCode(this);
}
compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/DefaultErrorMessages.java
+9 -9
View File
@@ -26,7 +26,7 @@ import org.jetbrains.jet.lang.psi.JetTypeConstraint;
import org.jetbrains.jet.lang.types.ErrorUtils;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lexer.JetKeywordToken;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
@@ -160,7 +160,7 @@ public class DefaultErrorMessages {
MAP.put(DATA_CLASS_OVERRIDE_CONFLICT, "Function ''{0}'' generated for the data class conflicts with member of supertype ''{1}''", NAME, NAME);
MAP.put(CANNOT_OVERRIDE_INVISIBLE_MEMBER, "''{0}'' cannot has no access to ''{1}'' in class {2}, so it cannot override it",
DescriptorRendererImpl.TEXT, DescriptorRendererImpl.TEXT, DescriptorRendererImpl.TEXT);
DescriptorRenderer.TEXT, DescriptorRenderer.TEXT, DescriptorRenderer.TEXT);
MAP.put(CANNOT_INFER_VISIBILITY, "Cannot infer visibility. Please specify it explicitly");
MAP.put(ENUM_ENTRY_SHOULD_BE_INITIALIZED, "Missing delegation specifier ''{0}''", NAME);
@@ -273,7 +273,7 @@ public class DefaultErrorMessages {
MAP.put(CONFLICTING_UPPER_BOUNDS, "Upper bounds of {0} have empty intersection", NAME);
MAP.put(CONFLICTING_CLASS_OBJECT_UPPER_BOUNDS, "Class object upper bounds of {0} have empty intersection", NAME);
MAP.put(TOO_MANY_ARGUMENTS, "Too many arguments for {0}", DescriptorRendererImpl.TEXT);
MAP.put(TOO_MANY_ARGUMENTS, "Too many arguments for {0}", DescriptorRenderer.TEXT);
MAP.put(ERROR_COMPILE_TIME_VALUE, "{0}", TO_STRING);
MAP.put(ELSE_MISPLACED_IN_WHEN, "'else' entry must be the last one in a when-expression");
@@ -366,18 +366,18 @@ public class DefaultErrorMessages {
MAP.put(CANNOT_CHANGE_ACCESS_PRIVILEGE, "Cannot change access privilege ''{0}'' for ''{1}'' in ''{2}''", TO_STRING, NAME, NAME);
MAP.put(RETURN_TYPE_MISMATCH_ON_OVERRIDE, "Return type of ''{0}'' is not a subtype of the return type of overridden member {1}",
NAME, DescriptorRendererImpl.TEXT);
NAME, DescriptorRenderer.TEXT);
MAP.put(VAR_OVERRIDDEN_BY_VAL, "Var-property {0} cannot be overridden by val-property {1}", DescriptorRendererImpl.TEXT,
DescriptorRendererImpl.TEXT);
MAP.put(VAR_OVERRIDDEN_BY_VAL, "Var-property {0} cannot be overridden by val-property {1}", DescriptorRenderer.TEXT,
DescriptorRenderer.TEXT);
MAP.put(ABSTRACT_MEMBER_NOT_IMPLEMENTED, "{0} must be declared abstract or implement abstract member {1}", RENDER_CLASS_OR_OBJECT,
DescriptorRendererImpl.TEXT);
DescriptorRenderer.TEXT);
MAP.put(MANY_IMPL_MEMBER_NOT_IMPLEMENTED, "{0} must override {1} because it inherits many implementations of it",
RENDER_CLASS_OR_OBJECT, DescriptorRendererImpl.TEXT);
RENDER_CLASS_OR_OBJECT, DescriptorRenderer.TEXT);
MAP.put(CONFLICTING_OVERLOADS, "{1} is already defined in ''{0}''", DescriptorRendererImpl.TEXT, TO_STRING);
MAP.put(CONFLICTING_OVERLOADS, "{1} is already defined in ''{0}''", DescriptorRenderer.TEXT, TO_STRING);
MAP.put(FUNCTION_EXPECTED, "Expression ''{0}''{1} cannot be invoked as a function", ELEMENT_TEXT, new Renderer<JetType>() {
@NotNull
compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/Renderers.java
+3 -3
View File
@@ -34,7 +34,7 @@ import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.TypeSubstitutor;
import org.jetbrains.jet.lang.types.Variance;
import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import java.util.Collection;
import java.util.Iterator;
@@ -96,7 +96,7 @@ public class Renderers {
@NotNull
@Override
public String render(@NotNull JetType type) {
return DescriptorRendererImpl.TEXT.renderType(type);
return DescriptorRenderer.TEXT.renderType(type);
}
};
@@ -107,7 +107,7 @@ public class Renderers {
public String render(@NotNull Collection<? extends ResolvedCall<? extends CallableDescriptor>> argument) {
StringBuilder stringBuilder = new StringBuilder("\n");
for (ResolvedCall<? extends CallableDescriptor> call : argument) {
stringBuilder.append(DescriptorRendererImpl.TEXT.render(call.getResultingDescriptor())).append("\n");
stringBuilder.append(DescriptorRenderer.TEXT.render(call.getResultingDescriptor())).append("\n");
}
return stringBuilder.toString();
}
compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/rendering/TabledDescriptorRenderer.java
+2 -2
View File
@@ -26,7 +26,7 @@ import org.jetbrains.jet.lang.diagnostics.rendering.TabledDescriptorRenderer.Tab
import org.jetbrains.jet.lang.diagnostics.rendering.TabledDescriptorRenderer.TextRenderer.TextElement;
import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintPosition;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import java.util.Iterator;
import java.util.List;
@@ -168,7 +168,7 @@ public class TabledDescriptorRenderer {
renderText((TextRenderer) row, result);
}
if (row instanceof DescriptorRow) {
result.append(DescriptorRendererImpl.COMPACT.render(((DescriptorRow) row).descriptor));
result.append(DescriptorRenderer.COMPACT.render(((DescriptorRow) row).descriptor));
}
if (row instanceof FunctionArgumentsRow) {
FunctionArgumentsRow functionArgumentsRow = (FunctionArgumentsRow) row;
compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java
+2 -2
View File
@@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScope;
import org.jetbrains.jet.lang.resolve.scopes.WritableScope;
import org.jetbrains.jet.lang.types.ErrorUtils;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import javax.inject.Inject;
import java.util.*;
@@ -311,7 +311,7 @@ public class DeclarationResolver {
for (DeclarationDescriptor declarationDescriptor : descriptors) {
for (PsiElement declaration : getDeclarationsByDescriptor(declarationDescriptor)) {
assert declaration != null : "Null declaration for descriptor: " + declarationDescriptor + " " +
(declarationDescriptor != null ? DescriptorRendererImpl.TEXT.render(declarationDescriptor) : "");
(declarationDescriptor != null ? DescriptorRenderer.TEXT.render(declarationDescriptor) : "");
trace.report(REDECLARATION.on(declaration, declarationDescriptor.getName().getName()));
}
}
compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRenderer.java
+60
View File
@@ -0,0 +1,60 @@
/*
* Copyright 2010-2012 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.jet.renderer;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor;
import org.jetbrains.jet.lang.diagnostics.rendering.Renderer;
import org.jetbrains.jet.lang.types.JetType;
public interface DescriptorRenderer extends Renderer<DeclarationDescriptor> {
DescriptorRenderer COMPACT_WITH_MODIFIERS = new DescriptorRendererImpl(false, false, true, false, false, null, TextFormat.PLAIN);
DescriptorRenderer COMPACT = new DescriptorRendererImpl(false, false, false, false, false, null, TextFormat.PLAIN);
DescriptorRenderer STARTS_FROM_NAME = new DescriptorRendererImpl(false, false, false, true, false, null, TextFormat.PLAIN);
DescriptorRenderer TEXT = new DescriptorRendererImpl(false, true, true, false, false, null, TextFormat.PLAIN);
DescriptorRenderer SHORT_NAMES_IN_TYPES = new DescriptorRendererImpl(true, true, true, false, false, null, TextFormat.PLAIN);
DescriptorRenderer DEBUG_TEXT = new DescriptorRendererImpl(false, true, true, false, true, null, TextFormat.PLAIN);
DescriptorRenderer HTML = new DescriptorRendererImpl(false, true, true, false, false, null, TextFormat.HTML);
String renderType(JetType type);
@NotNull
@Override
String render(@NotNull DeclarationDescriptor declarationDescriptor);
String renderFunctionParameters(@NotNull FunctionDescriptor functionDescriptor);
enum TextFormat {
PLAIN, HTML
}
interface ValueParametersHandler {
// by default, renders "("
void appendBeforeValueParameters(@NotNull FunctionDescriptor function, @NotNull StringBuilder stringBuilder);
// by default, renders ")"
void appendAfterValueParameters(@NotNull FunctionDescriptor function, @NotNull StringBuilder stringBuilder);
// by default, renders nothing
void appendBeforeValueParameter(@NotNull ValueParameterDescriptor parameter, @NotNull StringBuilder stringBuilder);
// by default, renders ", " if its not last parameter
void appendAfterValueParameter(@NotNull ValueParameterDescriptor parameter, @NotNull StringBuilder stringBuilder);
}
}
compiler/frontend/src/org/jetbrains/jet/renderer/DescriptorRendererImpl.java
+3 -33
View File
@@ -22,7 +22,6 @@ 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.diagnostics.rendering.Renderer;
import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe;
@@ -37,7 +36,7 @@ import java.util.*;
/**
* @author abreslav
*/
public class DescriptorRendererImpl implements Renderer<DeclarationDescriptor> {
public class DescriptorRendererImpl implements DescriptorRenderer {
private static final Set<String> KEYWORDS = Sets.newHashSet();
static {
for (IElementType elementType : JetTokens.KEYWORDS.getTypes()) {
@@ -47,18 +46,6 @@ public class DescriptorRendererImpl implements Renderer<DeclarationDescriptor> {
}
}
public static final DescriptorRendererImpl COMPACT_WITH_MODIFIERS = new DescriptorRendererImpl(false, false, true, false, false, null,
TextFormat.PLAIN);
public static final DescriptorRendererImpl COMPACT = new DescriptorRendererImpl(false, false, false, false, false, null,
TextFormat.PLAIN);
public static final DescriptorRendererImpl STARTS_FROM_NAME = new DescriptorRendererImpl(false, false, false, true, false, null,
TextFormat.PLAIN);
public static final DescriptorRendererImpl TEXT = new DescriptorRendererImpl(false, true, true, false, false, null, TextFormat.PLAIN);
public static final DescriptorRendererImpl SHORT_NAMES_IN_TYPES = new DescriptorRendererImpl(true, true, true, false, false, null,
TextFormat.PLAIN);
public static final DescriptorRendererImpl DEBUG_TEXT = new DescriptorRendererImpl(false, true, true, false, true, null,
TextFormat.PLAIN);
public static final DescriptorRendererImpl HTML = new DescriptorRendererImpl(false, true, true, false, false, null, TextFormat.HTML);
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
private final DeclarationDescriptorVisitor<Void, StringBuilder> subVisitor = new RenderDeclarationDescriptorVisitor() {
@Override
@@ -148,6 +135,7 @@ public class DescriptorRendererImpl implements Renderer<DeclarationDescriptor> {
return buf.toString();
}
@Override
public String renderType(JetType type) {
if (type == null) {
return escape("[NULL]");
@@ -270,6 +258,7 @@ public class DescriptorRendererImpl implements Renderer<DeclarationDescriptor> {
return stringBuilder.toString();
}
@Override
public String renderFunctionParameters(@NotNull FunctionDescriptor functionDescriptor) {
StringBuilder stringBuilder = new StringBuilder();
renderValueParameters(functionDescriptor, stringBuilder);
@@ -323,7 +312,6 @@ public class DescriptorRendererImpl implements Renderer<DeclarationDescriptor> {
}
private class RenderDeclarationDescriptorVisitor implements DeclarationDescriptorVisitor<Void, StringBuilder> {
@Override
public Void visitValueParameterDescriptor(ValueParameterDescriptor descriptor, StringBuilder builder) {
builder.append(renderKeyword("value-parameter")).append(" ");
@@ -648,22 +636,4 @@ public class DescriptorRendererImpl implements Renderer<DeclarationDescriptor> {
}
}
}
public enum TextFormat {
PLAIN, HTML
}
public interface ValueParametersHandler {
// by default, renders "("
void appendBeforeValueParameters(@NotNull FunctionDescriptor function, @NotNull StringBuilder stringBuilder);
// by default, renders ")"
void appendAfterValueParameters(@NotNull FunctionDescriptor function, @NotNull StringBuilder stringBuilder);
// by default, renders nothing
void appendBeforeValueParameter(@NotNull ValueParameterDescriptor parameter, @NotNull StringBuilder stringBuilder);
// by default, renders ", " if its not last parameter
void appendAfterValueParameter(@NotNull ValueParameterDescriptor parameter, @NotNull StringBuilder stringBuilder);
}
}
compiler/tests/org/jetbrains/jet/jvm/compiler/AnnotationJavaDescriptorResolverTest.java
+2 -2
View File
@@ -28,7 +28,7 @@ import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import org.jetbrains.jet.JetTestUtils;
import java.io.File;
@@ -193,7 +193,7 @@ public class AnnotationJavaDescriptorResolverTest extends AbstractJavaResolverDe
}
private static void compareJetTypeWithClass(@NotNull JetType actualType, @NotNull String expectedType) {
assertEquals(expectedType, DescriptorRendererImpl.TEXT.renderType(actualType));
assertEquals(expectedType, DescriptorRenderer.TEXT.renderType(actualType));
}
@NotNull
compiler/tests/org/jetbrains/jet/jvm/compiler/ExpectedLoadErrorsUtil.java
+2 -2
View File
@@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.lang.resolve.constants.CompileTimeConstant;
import org.jetbrains.jet.lang.resolve.scopes.JetScope;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import java.io.File;
import java.util.*;
@@ -47,7 +47,7 @@ public class ExpectedLoadErrorsUtil {
for (DeclarationDescriptor descriptor : ContainerUtil.union(expectedErrors.keySet(), actualErrors.keySet())) {
List<String> actual = actualErrors.get(descriptor);
List<String> expected = expectedErrors.get(descriptor);
String rendered = DescriptorRendererImpl.TEXT.render(descriptor);
String rendered = DescriptorRenderer.TEXT.render(descriptor);
assertNotNull("Unexpected load error(s):\n" + actual + "\ncontainer:" + rendered, expected);
assertNotNull("Missing load error(s):\n" + expected + "\ncontainer:" + rendered, actual);
compiler/tests/org/jetbrains/jet/jvm/compiler/JdkAnnotationsValidityTest.java
+2 -2
View File
@@ -42,7 +42,7 @@ import org.jetbrains.jet.lang.resolve.java.JavaDescriptorResolver;
import org.jetbrains.jet.lang.resolve.java.JavaToKotlinClassMap;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.scopes.JetScope;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import java.io.IOException;
import java.util.List;
@@ -182,7 +182,7 @@ public class JdkAnnotationsValidityTest extends UsefulTestCase {
private Void visitDeclaration(@NotNull DeclarationDescriptor descriptor) {
List<String> errors = bindingContext.get(BindingContext.LOAD_FROM_JAVA_SIGNATURE_ERRORS, descriptor);
if (errors != null) {
this.errors.put(DescriptorRendererImpl.TEXT.render(descriptor), errors);
this.errors.put(DescriptorRenderer.TEXT.render(descriptor), errors);
}
return null;
}
compiler/tests/org/jetbrains/jet/lang/resolve/lazy/AbstractLazyResolveDescriptorRendererTest.java
+2 -2
View File
@@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import java.io.File;
import java.io.IOException;
@@ -136,7 +136,7 @@ public abstract class AbstractLazyResolveDescriptorRendererTest extends KotlinTe
if (renderedDescriptors.length() != 0) {
renderedDescriptors.append("\n");
}
renderedDescriptors.append(DescriptorRendererImpl.TEXT.render(descriptor));
renderedDescriptors.append(DescriptorRenderer.TEXT.render(descriptor));
}
Document document = new DocumentImpl(psiFile.getText());
compiler/tests/org/jetbrains/jet/renderer/DescriptorRendererTest.java
+1 -1
View File
@@ -113,7 +113,7 @@ public class DescriptorRendererTest extends JetLiteFixture {
if (renderedDescriptors.length() != 0) {
renderedDescriptors.append("\n");
}
renderedDescriptors.append(DescriptorRendererImpl.TEXT.render(descriptor));
renderedDescriptors.append(DescriptorRenderer.TEXT.render(descriptor));
}
Document document = new DocumentImpl(psiFile.getText());
compiler/tests/org/jetbrains/jet/resolve/ExpectedResolveData.java
+2 -2
View File
@@ -44,7 +44,7 @@ import org.jetbrains.jet.lang.types.ErrorUtils;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.TypeConstructor;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import java.util.Collections;
import java.util.List;
@@ -375,6 +375,6 @@ public abstract class ExpectedResolveData {
@NotNull
private static String renderNullableDescriptor(@Nullable DeclarationDescriptor d) {
return d == null ? "<null>" : DescriptorRendererImpl.TEXT.render(d);
return d == null ? "<null>" : DescriptorRenderer.TEXT.render(d);
}
}
compiler/tests/org/jetbrains/jet/types/BoundsSubstitutorTest.java
+2 -2
View File
@@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.lang.resolve.lazy.KotlinTestWithEnvironment;
import org.jetbrains.jet.lang.resolve.lazy.LazyResolveTestUtil;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import java.util.Collection;
import java.util.Collections;
@@ -79,7 +79,7 @@ public class BoundsSubstitutorTest extends KotlinTestWithEnvironment {
FunctionDescriptor function = ContainerUtil.getFirstItem(functions);
FunctionDescriptor substituted = DescriptorUtils.substituteBounds(function);
String actual = DescriptorRendererImpl.COMPACT.render(substituted);
String actual = DescriptorRenderer.COMPACT.render(substituted);
assertEquals(expected, actual);
}
}
compiler/tests/org/jetbrains/jet/types/TypeSubstitutorTest.java
+2 -2
View File
@@ -44,7 +44,7 @@ import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lang.resolve.scopes.*;
import org.jetbrains.jet.lang.types.*;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import java.io.File;
import java.io.IOException;
@@ -106,7 +106,7 @@ public class TypeSubstitutorTest extends KotlinTestWithEnvironment {
JetType result = substitutor.substitute(initialType, Variance.INVARIANT);
assertEquals(expectedTypeStr, DescriptorRendererImpl.SHORT_NAMES_IN_TYPES.renderType(result));
assertEquals(expectedTypeStr, DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderType(result));
}
private Map<TypeConstructor, TypeProjection> stringsToSubstitutionMap(Pair<String, String>[] substitutionStrs) {
generators/org/jetbrains/jet/generators/jvm/GenerateJavaToKotlinMethodMap.java
+2 -2
View File
@@ -36,7 +36,7 @@ import org.jetbrains.jet.lang.descriptors.FunctionDescriptor;
import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.lang.resolve.java.JavaToKotlinClassMapBuilder;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import org.jetbrains.jet.utils.PathUtil;
import org.jetbrains.jet.utils.Printer;
@@ -182,7 +182,7 @@ public class GenerateJavaToKotlinMethodMap {
// "special case": remove(Int) and remove(Any?) in MutableList
if (method.getName().equals("remove") && method.getContainingClass().getName().equals("List")) {
String psiType = method.getParameterList().getParameters()[0].getType().getPresentableText();
String jetType = DescriptorRendererImpl.SHORT_NAMES_IN_TYPES.renderType(fun.getValueParameters().get(0).getType());
String jetType = DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderType(fun.getValueParameters().get(0).getType());
String string = psiType + "|" + jetType;
return "int|Int".equals(string) || "Object|Any?".equals(string);
idea/src/org/jetbrains/jet/plugin/JetQuickDocumentationProvider.java
+2 -2
View File
@@ -31,7 +31,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.BindingContextUtils;
import org.jetbrains.jet.plugin.libraries.JetDecompiledData;
import org.jetbrains.jet.plugin.project.WholeProjectAnalyzerFacade;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import org.jetbrains.jet.renderer.DescriptorRenderer;
/**
* @author abreslav
@@ -85,7 +85,7 @@ public class JetQuickDocumentationProvider extends AbstractDocumentationProvider
private static String render(@NotNull DeclarationDescriptor declarationDescriptor, @NotNull BindingContext bindingContext,
PsiElement element, PsiElement originalElement, boolean mergeKotlinAndJava) {
String renderedDecl = DescriptorRendererImpl.HTML.render(declarationDescriptor);
String renderedDecl = DescriptorRenderer.HTML.render(declarationDescriptor);
if (isKotlinDeclaration(declarationDescriptor, bindingContext)) {
return renderedDecl;
} else {
idea/src/org/jetbrains/jet/plugin/actions/ShowExpressionTypeAction.java
+2 -2
View File
@@ -31,7 +31,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.plugin.JetLanguage;
import org.jetbrains.jet.plugin.project.WholeProjectAnalyzerFacade;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import org.jetbrains.jet.renderer.DescriptorRenderer;
/**
* @author yole
@@ -65,7 +65,7 @@ public class ShowExpressionTypeAction extends AnAction {
if (expression != null) {
JetType type = bindingContext.get(BindingContext.EXPRESSION_TYPE, expression);
if (type != null) {
HintManager.getInstance().showInformationHint(editor, "<html>" + DescriptorRendererImpl.HTML.renderType(type) + "</html>");
HintManager.getInstance().showInformationHint(editor, "<html>" + DescriptorRenderer.HTML.renderType(type) + "</html>");
}
}
}
idea/src/org/jetbrains/jet/plugin/codeInsight/DescriptorClassMember.java
+2 -2
View File
@@ -31,7 +31,7 @@ import org.jetbrains.jet.lang.psi.JetClass;
import org.jetbrains.jet.lang.psi.JetDeclaration;
import org.jetbrains.jet.lang.psi.JetNamedDeclaration;
import org.jetbrains.jet.plugin.JetDescriptorIconProvider;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import javax.swing.*;
@@ -93,7 +93,7 @@ public class DescriptorClassMember implements ClassMemberWithElement {
@Override
public String getText() {
return DescriptorRendererImpl.STARTS_FROM_NAME.render(myDescriptor);
return DescriptorRenderer.STARTS_FROM_NAME.render(myDescriptor);
}
public DeclarationDescriptor getDescriptor() {
idea/src/org/jetbrains/jet/plugin/codeInsight/JetFunctionPsiElementCellRenderer.java
+2 -2
View File
@@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement;
import org.jetbrains.jet.lang.descriptors.SimpleFunctionDescriptor;
import org.jetbrains.jet.lang.psi.JetNamedFunction;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import org.jetbrains.jet.renderer.DescriptorRenderer;
/**
* @author Evgeny Gerashchenko
@@ -41,7 +41,7 @@ public class JetFunctionPsiElementCellRenderer extends DefaultPsiElementCellRend
SimpleFunctionDescriptor fd =
bindingContext.get(BindingContext.FUNCTION, function);
assert fd != null;
return DescriptorRendererImpl.TEXT.render(fd);
return DescriptorRenderer.TEXT.render(fd);
}
return super.getElementText(element);
}
idea/src/org/jetbrains/jet/plugin/codeInsight/OverrideImplementMethodsHandler.java
+3 -3
View File
@@ -36,7 +36,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.plugin.project.WholeProjectAnalyzerFacade;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import java.util.ArrayList;
import java.util.Collections;
@@ -142,7 +142,7 @@ public abstract class OverrideImplementMethodsHandler implements LanguageCodeIns
addReceiverParameter(descriptor, bodyBuilder);
bodyBuilder.append(descriptor.getName()).append(" : ").append(
DescriptorRendererImpl.SHORT_NAMES_IN_TYPES.renderType(descriptor.getType()));
DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderType(descriptor.getType()));
String initializer = defaultInitializer(descriptor.getType(), KotlinBuiltIns.getInstance());
if (initializer != null) {
bodyBuilder.append(" = ").append(initializer);
@@ -154,7 +154,7 @@ public abstract class OverrideImplementMethodsHandler implements LanguageCodeIns
}
private static String renderType(JetType type) {
return DescriptorRendererImpl.TEXT.renderType(type);
return DescriptorRenderer.TEXT.renderType(type);
}
private static JetElement overrideFunction(Project project, SimpleFunctionDescriptor descriptor) {
idea/src/org/jetbrains/jet/plugin/codeInsight/ktSignature/AddKotlinSignatureAnnotation.java
+3 -2
View File
@@ -41,6 +41,7 @@ import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lang.resolve.scopes.JetScope;
import org.jetbrains.jet.plugin.JetBundle;
import org.jetbrains.jet.plugin.JetIcons;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import javax.swing.*;
@@ -52,8 +53,8 @@ import static org.jetbrains.jet.plugin.codeInsight.ktSignature.KotlinSignatureUt
* @since 16 Aug 2012
*/
public class AddKotlinSignatureAnnotation extends BaseIntentionAction implements Iconable {
private static final DescriptorRendererImpl RENDERER = new DescriptorRendererImpl(true, false, false, false, false, null,
DescriptorRendererImpl.TextFormat.PLAIN);
private static final DescriptorRenderer RENDERER = new DescriptorRendererImpl(true, false, false, false, false, null,
DescriptorRenderer.TextFormat.PLAIN);
public AddKotlinSignatureAnnotation() {
setText(JetBundle.message("add.kotlin.signature.action.text"));
idea/src/org/jetbrains/jet/plugin/completion/DescriptorLookupConverter.java
+6 -6
View File
@@ -41,7 +41,7 @@ import org.jetbrains.jet.plugin.completion.handlers.JetClassInsertHandler;
import org.jetbrains.jet.plugin.completion.handlers.JetFunctionInsertHandler;
import org.jetbrains.jet.plugin.completion.handlers.JetJavaClassInsertHandler;
import org.jetbrains.jet.plugin.libraries.DecompiledDataFactory;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import java.util.List;
@@ -88,19 +88,19 @@ public final class DescriptorLookupConverter {
if (descriptor instanceof FunctionDescriptor) {
FunctionDescriptor functionDescriptor = (FunctionDescriptor) descriptor;
JetType returnType = functionDescriptor.getReturnType();
typeText = DescriptorRendererImpl.TEXT.renderType(returnType);
presentableText += DescriptorRendererImpl.TEXT.renderFunctionParameters(functionDescriptor);
typeText = DescriptorRenderer.TEXT.renderType(returnType);
presentableText += DescriptorRenderer.TEXT.renderFunctionParameters(functionDescriptor);
boolean extensionFunction = functionDescriptor.getReceiverParameter() != null;
DeclarationDescriptor containingDeclaration = descriptor.getContainingDeclaration();
if (containingDeclaration != null && extensionFunction) {
tailText += " for " + DescriptorRendererImpl.TEXT.renderType(functionDescriptor.getReceiverParameter().getType());
tailText += " for " + DescriptorRenderer.TEXT.renderType(functionDescriptor.getReceiverParameter().getType());
tailText += " in " + DescriptorUtils.getFQName(containingDeclaration);
}
}
else if (descriptor instanceof VariableDescriptor) {
JetType outType = ((VariableDescriptor) descriptor).getType();
typeText = DescriptorRendererImpl.TEXT.renderType(outType);
typeText = DescriptorRenderer.TEXT.renderType(outType);
}
else if (descriptor instanceof ClassDescriptor) {
DeclarationDescriptor declaredIn = descriptor.getContainingDeclaration();
@@ -109,7 +109,7 @@ public final class DescriptorLookupConverter {
tailTextGrayed = true;
}
else {
typeText = DescriptorRendererImpl.TEXT.render(descriptor);
typeText = DescriptorRenderer.TEXT.render(descriptor);
}
element = element.withInsertHandler(getInsertHandler(descriptor));
idea/src/org/jetbrains/jet/plugin/completion/JetLookupObject.java
+3 -3
View File
@@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
import org.jetbrains.jet.lang.resolve.lazy.ResolveSession;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import org.jetbrains.jet.renderer.DescriptorRenderer;
/**
* Stores information about resolved descriptor and position of that descriptor.
@@ -89,9 +89,9 @@ public final class JetLookupObject {
else {
LOG.warn("Descriptors from different resolve sessions");
String descriptorText = DescriptorRendererImpl.TEXT.render(descriptor);
String descriptorText = DescriptorRenderer.TEXT.render(descriptor);
@SuppressWarnings("ConstantConditions")
String otherDescriptorText = DescriptorRendererImpl.TEXT.render(other.descriptor);
String otherDescriptorText = DescriptorRenderer.TEXT.render(other.descriptor);
if (descriptorText.equals(otherDescriptorText)) {
return true;
}
idea/src/org/jetbrains/jet/plugin/highlighter/DeclarationHintSupport.java
+2 -2
View File
@@ -45,7 +45,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.plugin.JetLanguage;
import org.jetbrains.jet.plugin.project.WholeProjectAnalyzerFacade;
import org.jetbrains.jet.plugin.util.LongRunningReadTask;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import javax.swing.*;
import java.awt.*;
@@ -172,7 +172,7 @@ public class DeclarationHintSupport extends AbstractProjectComponent {
JLayeredPane layeredPane = editor.getComponent().getRootPane().getLayeredPane();
Point point = SwingUtilities.convertPoint(editor.getContentComponent(), mousePosition, layeredPane);
lastHint = new LightweightHint(HintUtil.createInformationLabel(DescriptorRendererImpl.HTML.render(descriptor)));
lastHint = new LightweightHint(HintUtil.createInformationLabel(DescriptorRenderer.HTML.render(descriptor)));
((HintManagerImpl) HintManager.getInstance()).showEditorHint(
lastHint, editor, point,
HintManager.HIDE_BY_ANY_KEY | HintManager.HIDE_BY_TEXT_CHANGE
idea/src/org/jetbrains/jet/plugin/highlighter/DeprecatedAnnotationVisitor.java
+3 -3
View File
@@ -38,7 +38,7 @@ import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lang.types.TypeUtils;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import org.jetbrains.jet.renderer.DescriptorRenderer;
public class DeprecatedAnnotationVisitor extends AfterAnalysisHighlightingVisitor {
@@ -267,8 +267,8 @@ public class DeprecatedAnnotationVisitor extends AfterAnalysisHighlightingVisito
return "val " + descriptor.getName();
}
else if (descriptor instanceof FunctionDescriptor) {
return "fun " + descriptor.getName() + DescriptorRendererImpl.TEXT.renderFunctionParameters((FunctionDescriptor) descriptor);
return "fun " + descriptor.getName() + DescriptorRenderer.TEXT.renderFunctionParameters((FunctionDescriptor) descriptor);
}
return DescriptorRendererImpl.TEXT.render(descriptor);
return DescriptorRenderer.TEXT.render(descriptor);
}
}
idea/src/org/jetbrains/jet/plugin/highlighter/HtmlTabledDescriptorRenderer.java
+4 -3
View File
@@ -27,6 +27,7 @@ import org.jetbrains.jet.lang.diagnostics.rendering.TabledDescriptorRenderer.Tab
import org.jetbrains.jet.lang.diagnostics.rendering.TabledDescriptorRenderer.TableRenderer.TableRow;
import org.jetbrains.jet.lang.resolve.calls.inference.ConstraintPosition;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import java.util.Iterator;
@@ -151,7 +152,7 @@ public class HtmlTabledDescriptorRenderer extends TabledDescriptorRenderer {
super();
}
public static final DescriptorRendererImpl.ValueParametersHandler RENDERER_HANDLER = new DescriptorRendererImpl.ValueParametersHandler() {
public static final DescriptorRenderer.ValueParametersHandler RENDERER_HANDLER = new DescriptorRenderer.ValueParametersHandler() {
@Override
public void appendBeforeValueParameter(@NotNull ValueParameterDescriptor parameter, @NotNull StringBuilder stringBuilder) {
stringBuilder.append("<td align=\"right\"><div style=\"white-space:nowrap;font-weight:bold;\">");
@@ -186,8 +187,8 @@ public class HtmlTabledDescriptorRenderer extends TabledDescriptorRenderer {
}
};
public static final DescriptorRendererImpl DESCRIPTOR_IN_TABLE =
new DescriptorRendererImpl(false, false, false, false, false, RENDERER_HANDLER, DescriptorRendererImpl.TextFormat.HTML);
public static final DescriptorRenderer DESCRIPTOR_IN_TABLE =
new DescriptorRendererImpl(false, false, false, false, false, RENDERER_HANDLER, DescriptorRenderer.TextFormat.HTML);
private static void td(StringBuilder builder, String text) {
builder.append("<td><div style=\"white-space:nowrap;\">").append(text).append("</div></td>");
idea/src/org/jetbrains/jet/plugin/highlighter/IdeErrorMessages.java
+7 -7
View File
@@ -20,7 +20,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor;
import org.jetbrains.jet.lang.diagnostics.Diagnostic;
import org.jetbrains.jet.lang.diagnostics.rendering.*;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import static org.jetbrains.jet.lang.diagnostics.Errors.*;
import static org.jetbrains.jet.lang.diagnostics.rendering.Renderers.RENDER_CLASS_OR_OBJECT;
@@ -86,20 +86,20 @@ public class IdeErrorMessages {
@NotNull
@Override
public String render(@NotNull CallableMemberDescriptor object) {
return DescriptorRendererImpl.HTML.renderType(object.getReturnType());
return DescriptorRenderer.HTML.renderType(object.getReturnType());
}
}, DescriptorRendererImpl.HTML);
}, DescriptorRenderer.HTML);
MAP.put(VAR_OVERRIDDEN_BY_VAL, "<html>Val-property cannot override var-property<br />" +
"{1}</html>", DescriptorRendererImpl.HTML, DescriptorRendererImpl.HTML);
"{1}</html>", DescriptorRenderer.HTML, DescriptorRenderer.HTML);
MAP.put(ABSTRACT_MEMBER_NOT_IMPLEMENTED, "<html>{0} must be declared abstract or implement abstract member<br/>" +
"{1}</html>", RENDER_CLASS_OR_OBJECT,
DescriptorRendererImpl.HTML);
DescriptorRenderer.HTML);
MAP.put(MANY_IMPL_MEMBER_NOT_IMPLEMENTED, "<html>{0} must override {1}<br />because it inherits many implementations of it</html>",
RENDER_CLASS_OR_OBJECT, DescriptorRendererImpl.HTML);
MAP.put(CONFLICTING_OVERLOADS, "<html>{1}<br />is already defined in ''{0}''</html>", DescriptorRendererImpl.HTML, TO_STRING);
RENDER_CLASS_OR_OBJECT, DescriptorRenderer.HTML);
MAP.put(CONFLICTING_OVERLOADS, "<html>{1}<br />is already defined in ''{0}''</html>", DescriptorRenderer.HTML, TO_STRING);
MAP.put(RESULT_TYPE_MISMATCH, "<html>Function return type mismatch." +
"<table><tr><td>Expected:</td><td>{1}</td></tr>" +
idea/src/org/jetbrains/jet/plugin/highlighter/IdeRenderers.java
+4 -4
View File
@@ -38,7 +38,7 @@ import org.jetbrains.jet.lang.resolve.calls.model.ResolvedValueArgument;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.lang.resolve.name.FqNameUnsafe;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import java.util.Collection;
import java.util.HashSet;
@@ -75,7 +75,7 @@ public class IdeRenderers {
StringBuilder stringBuilder = new StringBuilder("");
for (ResolvedCall<? extends CallableDescriptor> call : calls) {
stringBuilder.append("<li>");
stringBuilder.append(DescriptorRendererImpl.HTML.render(call.getResultingDescriptor())).append("\n");
stringBuilder.append(DescriptorRenderer.HTML.render(call.getResultingDescriptor())).append("\n");
stringBuilder.append("</li>");
}
return stringBuilder.toString();
@@ -86,7 +86,7 @@ public class IdeRenderers {
@NotNull
@Override
public String render(@NotNull JetType type) {
return DescriptorRendererImpl.HTML.renderType(type);
return DescriptorRenderer.HTML.renderType(type);
}
};
@@ -140,7 +140,7 @@ public class IdeRenderers {
CallableDescriptor funDescriptor = call.getResultingDescriptor();
Set<ValueParameterDescriptor> parametersToHighlight = getParametersToHighlight(call);
DescriptorRendererImpl htmlRenderer = DescriptorRendererImpl.HTML;
DescriptorRenderer htmlRenderer = DescriptorRenderer.HTML;
ReceiverParameterDescriptor receiverParameter = funDescriptor.getReceiverParameter();
if (receiverParameter != null) {
stringBuilder.append(htmlRenderer.renderType(receiverParameter.getType())).append(".");
idea/src/org/jetbrains/jet/plugin/highlighter/JetLineMarkerProvider.java
+4 -4
View File
@@ -50,7 +50,7 @@ import org.jetbrains.jet.lang.resolve.BindingContextUtils;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.jet.plugin.codeInsight.JetFunctionPsiElementCellRenderer;
import org.jetbrains.jet.plugin.project.WholeProjectAnalyzerFacade;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import javax.swing.*;
import java.awt.event.MouseEvent;
@@ -185,7 +185,7 @@ public class JetLineMarkerProvider implements LineMarkerProvider {
else {
JBPopup popup = NavigationUtil.getPsiElementPopup(PsiUtilCore.toPsiElementArray(list),
new JetFunctionPsiElementCellRenderer(bindingContext),
DescriptorRendererImpl.TEXT.render(descriptor));
DescriptorRenderer.TEXT.render(descriptor));
if (event != null) {
popup.show(new RelativePoint(event));
}
@@ -218,11 +218,11 @@ public class JetLineMarkerProvider implements LineMarkerProvider {
StringBuilder builder = new StringBuilder();
builder.append(DescriptorRendererImpl.HTML.render(descriptor));
builder.append(DescriptorRenderer.HTML.render(descriptor));
int overrideCount = overriddenMembers.size();
if (overrideCount >= 1) {
builder.append("\n").append(implementsOrOverrides).append("\n");
builder.append(DescriptorRendererImpl.HTML.render(overriddenMembers.iterator().next()));
builder.append(DescriptorRenderer.HTML.render(overriddenMembers.iterator().next()));
}
if (overrideCount > 1) {
int count = overrideCount - 1;
idea/src/org/jetbrains/jet/plugin/highlighter/VariablesHighlightingVisitor.java
+2 -2
View File
@@ -23,7 +23,7 @@ import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import static org.jetbrains.jet.lang.resolve.BindingContext.*;
@@ -66,7 +66,7 @@ class VariablesHighlightingVisitor extends AfterAnalysisHighlightingVisitor {
public void visitExpression(@NotNull JetExpression expression) {
JetType autoCast = bindingContext.get(AUTOCAST, expression);
if (autoCast != null) {
holder.createInfoAnnotation(expression, "Automatically cast to " + DescriptorRendererImpl.TEXT.renderType(autoCast)).setTextAttributes(
holder.createInfoAnnotation(expression, "Automatically cast to " + DescriptorRenderer.TEXT.renderType(autoCast)).setTextAttributes(
JetHighlightingColors.AUTO_CASTED_VALUE);
}
super.visitExpression(expression);
idea/src/org/jetbrains/jet/plugin/intentions/SpecifyTypeExplicitlyAction.java
+4 -4
View File
@@ -38,7 +38,7 @@ import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.plugin.JetBundle;
import org.jetbrains.jet.plugin.codeInsight.ReferenceToClassesShortening;
import org.jetbrains.jet.plugin.project.AnalyzeSingleFileUtil;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import java.util.Collections;
@@ -186,7 +186,7 @@ public class SpecifyTypeExplicitlyAction extends PsiElementBaseIntentionAction {
exprType = enumClass.getDefaultType();
}
JetTypeReference typeReference = JetPsiFactory.createType(project, DescriptorRendererImpl.TEXT.renderType(exprType));
JetTypeReference typeReference = JetPsiFactory.createType(project, DescriptorRenderer.TEXT.renderType(exprType));
ASTNode colon = JetPsiFactory.createColonNode(project);
ASTNode anchorNode = anchor == null ? null : anchor.getNode().getTreeNext();
if (anchor == null) {
@@ -203,7 +203,7 @@ public class SpecifyTypeExplicitlyAction extends PsiElementBaseIntentionAction {
}
public static void addTypeAnnotation(Project project, JetFunction function, @NotNull JetType exprType) {
JetTypeReference typeReference = JetPsiFactory.createType(project, DescriptorRendererImpl.TEXT.renderType(exprType));
JetTypeReference typeReference = JetPsiFactory.createType(project, DescriptorRenderer.TEXT.renderType(exprType));
Pair<PsiElement, PsiElement> colon = JetPsiFactory.createColon(project);
JetParameterList valueParameterList = function.getValueParameterList();
assert valueParameterList != null;
@@ -213,7 +213,7 @@ public class SpecifyTypeExplicitlyAction extends PsiElementBaseIntentionAction {
}
public static void addTypeAnnotation(Project project, JetParameter parameter, @NotNull JetType exprType) {
JetTypeReference typeReference = JetPsiFactory.createType(project, DescriptorRendererImpl.TEXT.renderType(exprType));
JetTypeReference typeReference = JetPsiFactory.createType(project, DescriptorRenderer.TEXT.renderType(exprType));
Pair<PsiElement, PsiElement> colon = JetPsiFactory.createColon(project);
parameter.addAfter(typeReference, parameter.getNameIdentifier());
parameter.addRangeAfter(colon.getFirst(), colon.getSecond(), parameter.getNameIdentifier());
idea/src/org/jetbrains/jet/plugin/libraries/DeclarationDescriptorComparator.java
+5 -5
View File
@@ -17,7 +17,7 @@
package org.jetbrains.jet.plugin.libraries;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import java.util.Comparator;
@@ -67,8 +67,8 @@ class DeclarationDescriptorComparator implements Comparator<DeclarationDescripto
ReceiverParameterDescriptor c1ReceiverParameter = c1.getReceiverParameter();
ReceiverParameterDescriptor c2ReceiverParameter = c2.getReceiverParameter();
if (c1ReceiverParameter != null && c2ReceiverParameter != null) {
String r1 = DescriptorRendererImpl.TEXT.renderType(c1ReceiverParameter.getType());
String r2 = DescriptorRendererImpl.TEXT.renderType(c2ReceiverParameter.getType());
String r1 = DescriptorRenderer.TEXT.renderType(c1ReceiverParameter.getType());
String r2 = DescriptorRenderer.TEXT.renderType(c2ReceiverParameter.getType());
int receiversCompareTo = r1.compareTo(r2);
if (receiversCompareTo != 0) {
return receiversCompareTo;
@@ -76,8 +76,8 @@ class DeclarationDescriptorComparator implements Comparator<DeclarationDescripto
}
for (int i = 0; i < Math.min(c1.getValueParameters().size(), c2.getValueParameters().size()); i++) {
String p1 = DescriptorRendererImpl.TEXT.renderType(c1.getValueParameters().get(i).getType());
String p2 = DescriptorRendererImpl.TEXT.renderType(c2.getValueParameters().get(i).getType());
String p1 = DescriptorRenderer.TEXT.renderType(c1.getValueParameters().get(i).getType());
String p2 = DescriptorRenderer.TEXT.renderType(c2.getValueParameters().get(i).getType());
int parametersCompareTo = p1.compareTo(p2);
if (parametersCompareTo != 0) {
return parametersCompareTo;
idea/src/org/jetbrains/jet/plugin/libraries/DecompiledDataFactory.java
+2 -2
View File
@@ -38,7 +38,7 @@ import org.jetbrains.jet.lang.resolve.java.JvmAbi;
import org.jetbrains.jet.lang.resolve.java.JvmStdlibNames;
import org.jetbrains.jet.lang.resolve.java.kt.JetClassAnnotation;
import org.jetbrains.jet.lang.resolve.name.FqName;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import java.util.*;
@@ -128,7 +128,7 @@ public class DecompiledDataFactory {
private void appendDescriptor(@NotNull DeclarationDescriptor descriptor, String indent) {
int startOffset = builder.length();
String renderedDescriptor = DescriptorRendererImpl.COMPACT_WITH_MODIFIERS.render(descriptor);
String renderedDescriptor = DescriptorRenderer.COMPACT_WITH_MODIFIERS.render(descriptor);
renderedDescriptor = renderedDescriptor.replace("= ...", "= " + DECOMPILED_COMMENT);
builder.append(renderedDescriptor);
int endOffset = builder.length();
idea/src/org/jetbrains/jet/plugin/libraries/JetSourceNavigationHelper.java
+3 -3
View File
@@ -44,7 +44,7 @@ import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lang.resolve.scopes.JetScope;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import org.jetbrains.jet.util.slicedmap.ReadOnlySlice;
import java.util.ArrayList;
@@ -177,7 +177,7 @@ public class JetSourceNavigationHelper {
for (Descr candidate : matcher.getCandidatesFromScope(namespaceDescriptor.getMemberScope(), entityNameAsName)) {
ReceiverParameterDescriptor receiverParameter = candidate.getReceiverParameter();
if (receiverParameter != null) {
String thisReceiverType = DescriptorRendererImpl.TEXT.renderType(receiverParameter.getType());
String thisReceiverType = DescriptorRenderer.TEXT.renderType(receiverParameter.getType());
if (expectedTypeString.equals(thisReceiverType)) {
if (matcher.areSame(decompiledDeclaration, candidate)) {
return (JetDeclaration) BindingContextUtils.descriptorToDeclaration(bindingContext, candidate);
@@ -263,7 +263,7 @@ public class JetSourceNavigationHelper {
return false;
}
String declarationTypeText = typeReference.getText();
String descriptorParameterText = DescriptorRendererImpl.TEXT.renderType(vararg
String descriptorParameterText = DescriptorRenderer.TEXT.renderType(vararg
? descriptorParameter.getVarargElementType()
: descriptorParameter.getType());
if (!declarationTypeText.equals(descriptorParameterText)) {
idea/src/org/jetbrains/jet/plugin/parameterInfo/JetFunctionParameterInfoHandler.java
+2 -2
View File
@@ -40,7 +40,7 @@ import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.jet.plugin.project.AnalyzeSingleFileUtil;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import java.awt.*;
import java.util.*;
@@ -151,7 +151,7 @@ public class JetFunctionParameterInfoHandler implements
builder.append("vararg ");
}
builder.append(descriptor.getName()).append(": ").
append(DescriptorRendererImpl.SHORT_NAMES_IN_TYPES.renderType(getActualParameterType(descriptor)));
append(DescriptorRenderer.SHORT_NAMES_IN_TYPES.renderType(getActualParameterType(descriptor)));
if (descriptor.hasDefaultValue()) {
PsiElement element = BindingContextUtils.descriptorToDeclaration(bindingContext, descriptor);
String defaultExpression = "?";
idea/src/org/jetbrains/jet/plugin/refactoring/introduceVariable/JetIntroduceVariableHandler.java
+2 -2
View File
@@ -52,7 +52,7 @@ import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.jet.plugin.codeInsight.ReferenceToClassesShortening;
import org.jetbrains.jet.plugin.project.AnalyzeSingleFileUtil;
import org.jetbrains.jet.plugin.refactoring.*;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import java.util.*;
@@ -239,7 +239,7 @@ public class JetIntroduceVariableHandler extends JetIntroduceHandlerBase {
public void run() {
String variableText = "val " + suggestedNames[0];
if (noTypeInference) {
variableText += ": " + DescriptorRendererImpl.TEXT.renderType(expressionType);
variableText += ": " + DescriptorRenderer.TEXT.renderType(expressionType);
}
variableText += " = ";
if (expression instanceof JetParenthesizedExpression) {
idea/src/org/jetbrains/jet/plugin/references/StandardLibraryReferenceResolver.java
+3 -3
View File
@@ -45,7 +45,7 @@ import org.jetbrains.jet.lang.resolve.scopes.WritableScope;
import org.jetbrains.jet.lang.resolve.scopes.WritableScopeImpl;
import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
import org.jetbrains.jet.plugin.JetStandardLibraryInitializer;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import java.net.URL;
import java.util.Collection;
@@ -163,7 +163,7 @@ public class StandardLibraryReferenceResolver extends AbstractProjectComponent {
JetScope memberScope = getMemberScope(containingDeclaration);
if (memberScope == null) return null;
String renderedOriginal = DescriptorRendererImpl.TEXT.render(originalDescriptor);
String renderedOriginal = DescriptorRenderer.TEXT.render(originalDescriptor);
Collection<? extends DeclarationDescriptor> descriptors;
if (originalDescriptor instanceof ConstructorDescriptor && containingDeclaration instanceof ClassDescriptor) {
descriptors = ((ClassDescriptor) containingDeclaration).getConstructors();
@@ -172,7 +172,7 @@ public class StandardLibraryReferenceResolver extends AbstractProjectComponent {
descriptors = memberScope.getAllDescriptors();
}
for (DeclarationDescriptor member : descriptors) {
if (renderedOriginal.equals(DescriptorRendererImpl.TEXT.render(member).replace(TUPLE0_FQ_NAME.getFqName(),
if (renderedOriginal.equals(DescriptorRenderer.TEXT.render(member).replace(TUPLE0_FQ_NAME.getFqName(),
KotlinBuiltIns.UNIT_ALIAS.getName()))) {
return member;
}
idea/src/org/jetbrains/jet/plugin/structureView/JetStructureViewElement.java
+6 -6
View File
@@ -34,7 +34,7 @@ import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.DescriptorUtils;
import org.jetbrains.jet.lang.types.JetType;
import org.jetbrains.jet.plugin.project.WholeProjectAnalyzerFacade;
import org.jetbrains.jet.renderer.DescriptorRendererImpl;
import org.jetbrains.jet.renderer.DescriptorRenderer;
import javax.swing.*;
import java.util.ArrayList;
@@ -196,7 +196,7 @@ public class JetStructureViewElement implements StructureViewTreeElement {
FunctionDescriptor functionDescriptor = (FunctionDescriptor) descriptor;
ReceiverParameterDescriptor receiver = functionDescriptor.getReceiverParameter();
if (receiver != null) {
textBuilder.append(DescriptorRendererImpl.TEXT.renderType(receiver.getType())).append(".");
textBuilder.append(DescriptorRenderer.TEXT.renderType(receiver.getType())).append(".");
}
textBuilder.append(functionDescriptor.getName());
@@ -207,7 +207,7 @@ public class JetStructureViewElement implements StructureViewTreeElement {
@Override
public String fun(ValueParameterDescriptor valueParameterDescriptor) {
return valueParameterDescriptor.getName() + ":" +
DescriptorRendererImpl.TEXT.renderType(valueParameterDescriptor.getType());
DescriptorRenderer.TEXT.renderType(valueParameterDescriptor.getType());
}
},
",");
@@ -215,13 +215,13 @@ public class JetStructureViewElement implements StructureViewTreeElement {
textBuilder.append("(").append(parametersString).append(")");
JetType returnType = functionDescriptor.getReturnType();
textBuilder.append(":").append(DescriptorRendererImpl.TEXT.renderType(returnType));
textBuilder.append(":").append(DescriptorRenderer.TEXT.renderType(returnType));
}
else if (descriptor instanceof VariableDescriptor) {
JetType outType = ((VariableDescriptor) descriptor).getType();
textBuilder = new StringBuilder(descriptor.getName().getName());
textBuilder.append(":").append(DescriptorRendererImpl.TEXT.renderType(outType));
textBuilder.append(":").append(DescriptorRenderer.TEXT.renderType(outType));
}
else if (descriptor instanceof ClassDescriptor) {
textBuilder = new StringBuilder(descriptor.getName().getName());
@@ -231,7 +231,7 @@ public class JetStructureViewElement implements StructureViewTreeElement {
.append(")");
}
else {
return DescriptorRendererImpl.TEXT.render(descriptor);
return DescriptorRenderer.TEXT.render(descriptor);
}
return textBuilder.toString();