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/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) {