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

Refactoring: rename TEXT to FQNAMES_IN_TYPES

Browse Source
This commit is contained in:
Nikolay Krasko
2014-04-16 16:29:29 +04:00
parent 962044f887
commit 068c9636fc
39 changed files with 64 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/ElementAlternativeSignatureData.java
+1 -1
View File
@@ -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'",
DescriptorRenderer.TEXT.renderType(originalType));
DescriptorRenderer.FQNAMES_IN_TYPES.renderType(originalType));
}
}
compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/TypeTransformingVisitor.java
+2 -2
View File
@@ -74,7 +74,7 @@ public class TypeTransformingVisitor extends JetVisitor<JetType, Void> {
public JetType visitNullableType(@NotNull 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'",
DescriptorRenderer.TEXT.renderType(originalType), nullableType.getText());
DescriptorRenderer.FQNAMES_IN_TYPES.renderType(originalType), nullableType.getText());
}
JetTypeElement innerType = nullableType.getInnerType();
assert innerType != null : "Syntax error: " + nullableType.getText();
@@ -134,7 +134,7 @@ public 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",
DescriptorRenderer.TEXT.renderType(originalType), arguments.size(), type.getText(),
DescriptorRenderer.FQNAMES_IN_TYPES.renderType(originalType), arguments.size(), type.getText(),
type.getTypeArgumentsAsTypes().size());
}