diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeFieldSignatureData.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeFieldSignatureData.java index c7721091b44..a0f07a43f97 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeFieldSignatureData.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeFieldSignatureData.java @@ -53,7 +53,7 @@ public class AlternativeFieldSignatureData extends ElementAlternativeSignatureDa try { checkForSyntaxErrors(altPropertyDeclaration); checkFieldAnnotation(altPropertyDeclaration, field, isVar); - altReturnType = computeReturnType(originalReturnType, altPropertyDeclaration.getTypeRef(), + altReturnType = computeReturnType(originalReturnType, altPropertyDeclaration.getTypeReference(), new HashMap()); } catch (AlternativeSignatureMismatchException e) { @@ -73,7 +73,7 @@ public class AlternativeFieldSignatureData extends ElementAlternativeSignatureDa field.getName().asString(), altProperty.getName()); } - if (altProperty.getTypeRef() == null) { + if (altProperty.getTypeReference() == null) { throw new AlternativeSignatureMismatchException("Field annotation for shouldn't have type reference"); } diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeMethodSignatureData.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeMethodSignatureData.java index 03fe0c1a38b..d5bb2e924e1 100644 --- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeMethodSignatureData.java +++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/AlternativeMethodSignatureData.java @@ -89,7 +89,7 @@ public class AlternativeMethodSignatureData extends ElementAlternativeSignatureD computeValueParameters(valueParameters); if (originalReturnType != null) { - altReturnType = computeReturnType(originalReturnType, altFunDeclaration.getReturnTypeRef(), originalToAltTypeParameters); + altReturnType = computeReturnType(originalReturnType, altFunDeclaration.getTypeReference(), originalToAltTypeParameters); } if (hasSuperMethods) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/PositioningStrategies.java b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/PositioningStrategies.java index a66176d0600..5ce0ff2606d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/PositioningStrategies.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/diagnostics/PositioningStrategies.java @@ -72,12 +72,12 @@ public class PositioningStrategies { PsiElement nameIdentifierOrPlaceholder = null; if (declaration instanceof JetNamedFunction) { JetFunction function = (JetNamedFunction) declaration; - returnTypeRef = function.getReturnTypeRef(); + returnTypeRef = function.getTypeReference(); nameIdentifierOrPlaceholder = function.getNameIdentifier(); } else if (declaration instanceof JetProperty) { JetProperty property = (JetProperty) declaration; - returnTypeRef = property.getTypeRef(); + returnTypeRef = property.getTypeReference(); nameIdentifierOrPlaceholder = property.getNameIdentifier(); } else if (declaration instanceof JetPropertyAccessor) { @@ -148,7 +148,7 @@ public class PositioningStrategies { JetNamedFunction function = (JetNamedFunction)element; PsiElement endOfSignatureElement; JetParameterList valueParameterList = function.getValueParameterList(); - JetElement returnTypeRef = function.getReturnTypeRef(); + JetElement returnTypeRef = function.getTypeReference(); PsiElement nameIdentifier = function.getNameIdentifier(); if (returnTypeRef != null) { endOfSignatureElement = returnTypeRef; @@ -167,7 +167,7 @@ public class PositioningStrategies { else if (element instanceof JetProperty) { JetProperty property = (JetProperty) element; PsiElement endOfSignatureElement; - JetTypeReference propertyTypeRef = property.getTypeRef(); + JetTypeReference propertyTypeRef = property.getTypeReference(); PsiElement nameIdentifier = property.getNameIdentifier(); if (propertyTypeRef != null) { endOfSignatureElement = propertyTypeRef; diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/DebugTextUtil.kt b/compiler/frontend/src/org/jetbrains/jet/lang/psi/DebugTextUtil.kt index c261f456ea5..e3e94366289 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/DebugTextUtil.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/DebugTextUtil.kt @@ -266,7 +266,7 @@ private object DebugTextBuildingVisitor : JetVisitor() { appendInn(typeParameterList) } appendInn(function.getValueParameterList()) - appendInn(function.getReturnTypeRef(), prefix = ": ") + appendInn(function.getTypeReference(), prefix = ": ") appendInn(function.getTypeConstraintList(), prefix = " ") } } @@ -302,7 +302,7 @@ private object DebugTextBuildingVisitor : JetVisitor() { appendInn(property.getModifierList(), suffix = " ") append(if (property.isVar()) "var " else "val ") appendInn(property.getNameAsName()) - appendInn(property.getTypeRef(), prefix = ": ") + appendInn(property.getTypeReference(), prefix = ": ") } } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCallableDeclaration.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCallableDeclaration.java index e682f0fb862..b67f0f24492 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCallableDeclaration.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetCallableDeclaration.java @@ -26,8 +26,8 @@ public interface JetCallableDeclaration extends JetNamedDeclaration, JetTypePara JetTypeReference getReceiverTypeRef(); @Nullable - JetTypeReference getReturnTypeRef(); + JetTypeReference getTypeReference(); @Nullable - JetTypeReference setReturnTypeRef(@Nullable JetTypeReference typeRef); + JetTypeReference setTypeReference(@Nullable JetTypeReference typeRef); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionLiteralExpression.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionLiteralExpression.java index 0ea2ec7e514..c888e2a4a01 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionLiteralExpression.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionLiteralExpression.java @@ -53,7 +53,7 @@ public class JetFunctionLiteralExpression extends JetExpressionImpl { } public boolean hasDeclaredReturnType() { - return getFunctionLiteral().getReturnTypeRef() != null; + return getFunctionLiteral().getTypeReference() != null; } @NotNull diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionNotStubbed.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionNotStubbed.java index 64340f16ce7..b53d1338bf3 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionNotStubbed.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetFunctionNotStubbed.java @@ -56,7 +56,7 @@ abstract public class JetFunctionNotStubbed extends JetTypeParameterListOwnerNot @Override public boolean hasDeclaredReturnType() { - return getReturnTypeRef() != null; + return getTypeReference() != null; } @Override @@ -77,13 +77,13 @@ abstract public class JetFunctionNotStubbed extends JetTypeParameterListOwnerNot @Override @Nullable - public JetTypeReference getReturnTypeRef() { + public JetTypeReference getTypeReference() { return TypeRefHelpersPackage.getTypeRef(this); } @Nullable @Override - public JetTypeReference setReturnTypeRef(@Nullable JetTypeReference typeRef) { + public JetTypeReference setTypeReference(@Nullable JetTypeReference typeRef) { return TypeRefHelpersPackage.setTypeRef(this, getValueParameterList(), typeRef); } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetModifiableBlockHelper.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetModifiableBlockHelper.java index 5b9337f8c37..511e200bb8d 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetModifiableBlockHelper.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetModifiableBlockHelper.java @@ -42,7 +42,7 @@ public final class JetModifiableBlockHelper { } else if (declaration instanceof JetProperty) { JetProperty property = (JetProperty) declaration; - if (property.getTypeRef() != null) { + if (property.getTypeReference() != null) { return takePartInDeclarationTypeInference(property); } @@ -71,7 +71,7 @@ public final class JetModifiableBlockHelper { } else if (declaration instanceof JetProperty) { JetProperty property = (JetProperty) declaration; - if (property.getTypeRef() == null) { + if (property.getTypeReference() == null) { return true; } } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetMultiDeclarationEntry.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetMultiDeclarationEntry.java index d9619839c50..1ba8a9403ef 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetMultiDeclarationEntry.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetMultiDeclarationEntry.java @@ -25,6 +25,9 @@ import org.jetbrains.jet.lang.psi.typeRefHelpers.TypeRefHelpersPackage; import org.jetbrains.jet.lang.resolve.name.FqName; import org.jetbrains.jet.lexer.JetTokens; +import java.util.Collections; +import java.util.List; + import static org.jetbrains.jet.lexer.JetTokens.VAL_KEYWORD; import static org.jetbrains.jet.lexer.JetTokens.VAR_KEYWORD; @@ -34,16 +37,40 @@ public class JetMultiDeclarationEntry extends JetNamedDeclarationNotStubbed impl } @Override - public JetTypeReference getTypeRef() { + public JetTypeReference getTypeReference() { return TypeRefHelpersPackage.getTypeRef(this); } @Override @Nullable - public JetTypeReference setTypeRef(@Nullable JetTypeReference typeRef) { + public JetTypeReference setTypeReference(@Nullable JetTypeReference typeRef) { return TypeRefHelpersPackage.setTypeRef(this, getNameIdentifier(), typeRef); } + @Nullable + @Override + public JetParameterList getValueParameterList() { + return null; + } + + @Nullable + @Override + public JetTypeReference getReceiverTypeRef() { + return null; + } + + @NotNull + @Override + public List getTypeConstraints() { + return Collections.emptyList(); + } + + @NotNull + @Override + public List getTypeParameters() { + return Collections.emptyList(); + } + @Override public R accept(@NotNull JetVisitor visitor, D data) { return visitor.visitMultiDeclarationEntry(this, data); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedFunction.java b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedFunction.java index 74295023991..4555fcd182b 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedFunction.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/psi/JetNamedFunction.java @@ -126,7 +126,7 @@ public class JetNamedFunction extends JetTypeParameterListOwnerStub typeReferences = getStubOrPsiChildrenAsList(JetStubElementTypes.TYPE_REFERENCE); @@ -180,7 +180,7 @@ public class JetNamedFunction extends JetTypeParameterListOwnerStub implements JetVariableDeclaration, - JetCallableDeclaration { +public class JetProperty extends JetTypeParameterListOwnerStub implements JetVariableDeclaration { private static final Logger LOG = Logger.getInstance(JetProperty.class); @@ -116,21 +115,9 @@ public class JetProperty extends JetTypeParameterListOwnerStub compileTimeInitializer = propertyDescriptor.getCompileTimeInitializer(); if (compileTimeInitializer == null) { expressionTypingServices.getType(propertyDeclarationInnerScope, initializer, expectedTypeForInitializer, c.getOuterDataFlowInfo(), trace); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java index 425353e0d72..af3a17a8714 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java @@ -362,12 +362,12 @@ public class DeclarationsChecker { private void checkDeclaredTypeInPublicMember(JetNamedDeclaration member, CallableMemberDescriptor memberDescriptor) { boolean hasDeferredType; if (member instanceof JetProperty) { - hasDeferredType = ((JetProperty) member).getTypeRef() == null && DescriptorResolver.hasBody((JetProperty) member); + hasDeferredType = ((JetProperty) member).getTypeReference() == null && DescriptorResolver.hasBody((JetProperty) member); } else { assert member instanceof JetFunction; JetFunction function = (JetFunction) member; - hasDeferredType = function.getReturnTypeRef() == null && function.hasBody() && !function.hasBlockBody(); + hasDeferredType = function.getTypeReference() == null && function.hasBody() && !function.hasBlockBody(); } if ((memberDescriptor.getVisibility().isPublicAPI()) && memberDescriptor.getOverriddenDescriptors().size() == 0 && hasDeferredType) { trace.report(PUBLIC_MEMBER_SHOULD_SPECIFY_TYPE.on(member)); @@ -425,7 +425,7 @@ public class DeclarationsChecker { (setter != null && setter.hasBody()); if (propertyDescriptor.getModality() == Modality.ABSTRACT) { - if (!property.hasDelegateExpressionOrInitializer() && property.getTypeRef() == null) { + if (!property.hasDelegateExpressionOrInitializer() && property.getTypeReference() == null) { trace.report(PROPERTY_WITH_NO_TYPE_NO_INITIALIZER.on(property)); } return; @@ -454,7 +454,7 @@ public class DeclarationsChecker { trace.report(MUST_BE_INITIALIZED_OR_BE_ABSTRACT.on(property)); } } - if (!error && property.getTypeRef() == null) { + if (!error && property.getTypeReference() == null) { trace.report(PROPERTY_WITH_NO_TYPE_NO_INITIALIZER.on(property)); } if (inTrait && property.hasModifier(JetTokens.FINAL_KEYWORD) && backingFieldRequired) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegatedPropertyResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegatedPropertyResolver.java index cf39ff090f5..e6733b52068 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegatedPropertyResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DelegatedPropertyResolver.java @@ -302,7 +302,7 @@ public class DelegatedPropertyResolver { @NotNull final JetScope accessorScope, @NotNull final BindingTrace trace ) { - final JetType expectedType = property.getTypeRef() != null ? propertyDescriptor.getType() : NO_EXPECTED_TYPE; + final JetType expectedType = property.getTypeReference() != null ? propertyDescriptor.getType() : NO_EXPECTED_TYPE; return new ConstraintSystemCompleter() { @Override public void completeConstraintSystem( diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java index 42dc725314e..208eafdb370 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java @@ -331,7 +331,7 @@ public class DescriptorResolver { innerScope.changeLockLevel(WritableScope.LockLevel.READING); - JetTypeReference returnTypeRef = function.getReturnTypeRef(); + JetTypeReference returnTypeRef = function.getTypeReference(); JetType returnType; if (returnTypeRef != null) { returnType = typeResolver.resolveType(innerScope, returnTypeRef, trace, true); @@ -1005,7 +1005,7 @@ public class DescriptorResolver { boolean notLocal, @NotNull final BindingTrace trace ) { - JetTypeReference propertyTypeRef = variable.getTypeRef(); + JetTypeReference propertyTypeRef = variable.getTypeReference(); boolean hasDelegate = variable instanceof JetProperty && ((JetProperty) variable).hasDelegateExpression(); if (propertyTypeRef == null) { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ArgumentTypeResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ArgumentTypeResolver.java index c67b5c963ba..4c2fbe48446 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ArgumentTypeResolver.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/ArgumentTypeResolver.java @@ -41,7 +41,6 @@ import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns; import javax.inject.Inject; import java.util.Collections; import java.util.List; -import java.util.Set; import static org.jetbrains.jet.lang.resolve.BindingContextUtils.getRecordedTypeInfo; import static org.jetbrains.jet.lang.resolve.calls.CallResolverUtil.ResolveArgumentsMode; @@ -211,7 +210,7 @@ public class ArgumentTypeResolver { parameterTypes.add(resolveTypeRefWithDefault(parameter.getTypeReference(), scope, temporaryTrace, DONT_CARE)); } JetFunctionLiteral functionLiteral = expression.getFunctionLiteral(); - JetType returnType = resolveTypeRefWithDefault(functionLiteral.getReturnTypeRef(), scope, temporaryTrace, DONT_CARE); + JetType returnType = resolveTypeRefWithDefault(functionLiteral.getTypeReference(), scope, temporaryTrace, DONT_CARE); assert returnType != null; JetType receiverType = resolveTypeRefWithDefault(functionLiteral.getReceiverTypeRef(), scope, temporaryTrace, null); return KotlinBuiltIns.getInstance().getFunctionType(Annotations.EMPTY, receiverType, parameterTypes, diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetScriptInfo.kt b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetScriptInfo.kt index b007b723417..343b284e9fa 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetScriptInfo.kt +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/data/JetScriptInfo.kt @@ -48,6 +48,6 @@ public fun shouldBeScriptClassMember(declaration: JetDeclaration): Boolean { // To avoid the necessity to always analyze the whole body of a script even if just its class descriptor is needed // we only add those vals, vars and funs that have explicitly specified return types // (or implicit Unit for function with block body) - return declaration is JetCallableDeclaration && declaration.getReturnTypeRef() != null + return declaration is JetCallableDeclaration && declaration.getTypeReference() != null || declaration is JetNamedFunction && declaration.hasBlockBody() } diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ClosureExpressionsTypingVisitor.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ClosureExpressionsTypingVisitor.java index f087495f49c..b161a8bb87a 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ClosureExpressionsTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ClosureExpressionsTypingVisitor.java @@ -275,7 +275,7 @@ public class ClosureExpressionsTypingVisitor extends ExpressionTypingVisitor { assert bodyExpression != null; JetScope functionInnerScope = FunctionDescriptorUtil.getFunctionInnerScope(context.scope, functionDescriptor, context.trace); - JetTypeReference returnTypeRef = functionLiteral.getReturnTypeRef(); + JetTypeReference returnTypeRef = functionLiteral.getTypeReference(); JetType declaredReturnType = null; if (returnTypeRef != null) { declaredReturnType = components.expressionTypingServices.getTypeResolver().resolveType(context.scope, returnTypeRef, context.trace, true); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingVisitor.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingVisitor.java index 28ad68154de..ec1a88f64e9 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingVisitor.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ControlStructureTypingVisitor.java @@ -517,7 +517,7 @@ public class ControlStructureTypingVisitor extends ExpressionTypingVisitor { private static JetType getFunctionExpectedReturnType(@NotNull FunctionDescriptor descriptor, @NotNull JetElement function) { JetType expectedType; if (function instanceof JetFunction) { - if (((JetFunction) function).getReturnTypeRef() != null || ((JetFunction) function).hasBlockBody()) { + if (((JetFunction) function).getTypeReference() != null || ((JetFunction) function).hasBlockBody()) { expectedType = descriptor.getReturnType(); } else { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingUtils.java index fc2bbe71a0f..077a630f4ba 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingUtils.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingUtils.java @@ -391,7 +391,7 @@ public class ExpressionTypingUtils { @NotNull private JetType getExpectedTypeForComponent(ExpressionTypingContext context, JetMultiDeclarationEntry entry) { - JetTypeReference entryTypeRef = entry.getTypeRef(); + JetTypeReference entryTypeRef = entry.getTypeReference(); if (entryTypeRef != null) { return expressionTypingServices.getTypeResolver().resolveType(context.scope, entryTypeRef, context.trace, true); } diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/RemoveExplicitTypeArguments.kt b/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/RemoveExplicitTypeArguments.kt index e40c9218299..143a55c9bf2 100644 --- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/RemoveExplicitTypeArguments.kt +++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/intentions/RemoveExplicitTypeArguments.kt @@ -60,7 +60,7 @@ public class RemoveExplicitTypeArguments : JetSelfTargetingIntention parent.getInitializer() == callExpression && parent.getTypeRef() != null + is JetProperty -> parent.getInitializer() == callExpression && parent.getTypeReference() != null is JetDeclarationWithBody -> parent.getBodyExpression() == callExpression is JetReturnExpression -> true else -> false diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/MoveDeclarationsOutHelper.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/MoveDeclarationsOutHelper.java index a1daa99d211..7c1f4db6eae 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/MoveDeclarationsOutHelper.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/surroundWith/MoveDeclarationsOutHelper.java @@ -125,7 +125,7 @@ public class MoveDeclarationsOutHelper { @NotNull private static JetProperty createProperty(@NotNull JetProperty property, @NotNull JetType propertyType, @Nullable String initializer) { - JetTypeReference typeRef = property.getTypeRef(); + JetTypeReference typeRef = property.getTypeReference(); String typeString = null; if (typeRef != null) { typeString = typeRef.getText(); diff --git a/idea/src/org/jetbrains/jet/plugin/codeInsight/upDownMover/JetDeclarationMover.java b/idea/src/org/jetbrains/jet/plugin/codeInsight/upDownMover/JetDeclarationMover.java index bb63a8a301e..4fb61a70c5a 100644 --- a/idea/src/org/jetbrains/jet/plugin/codeInsight/upDownMover/JetDeclarationMover.java +++ b/idea/src/org/jetbrains/jet/plugin/codeInsight/upDownMover/JetDeclarationMover.java @@ -75,7 +75,7 @@ public class JetDeclarationMover extends AbstractJetUpDownMover { JetTypeReference receiverTypeRef = function.getReceiverTypeRef(); if (receiverTypeRef != null) memberSuspects.add(receiverTypeRef); - JetTypeReference returnTypeRef = function.getReturnTypeRef(); + JetTypeReference returnTypeRef = function.getTypeReference(); if (returnTypeRef != null) memberSuspects.add(returnTypeRef); } @@ -90,7 +90,7 @@ public class JetDeclarationMover extends AbstractJetUpDownMover { JetTypeReference receiverTypeRef = property.getReceiverTypeRef(); if (receiverTypeRef != null) memberSuspects.add(receiverTypeRef); - JetTypeReference returnTypeRef = property.getTypeRef(); + JetTypeReference returnTypeRef = property.getTypeReference(); if (returnTypeRef != null) memberSuspects.add(returnTypeRef); } } diff --git a/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetKeywordInsertHandler.kt b/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetKeywordInsertHandler.kt index c87d902694d..7a25a8322bb 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetKeywordInsertHandler.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/handlers/JetKeywordInsertHandler.kt @@ -46,7 +46,7 @@ public object JetKeywordInsertHandler : InsertHandler { val element = context.getFile().findElementAt(context.getStartOffset()) if (element != null) { val jetFunction = PsiTreeUtil.getParentOfType(element, javaClass()) - if (jetFunction != null && (!jetFunction.hasDeclaredReturnType() || JetPsiUtil.isVoidType(jetFunction.getReturnTypeRef()))) { + if (jetFunction != null && (!jetFunction.hasDeclaredReturnType() || JetPsiUtil.isVoidType(jetFunction.getTypeReference()))) { // No space for void function return } diff --git a/idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt b/idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt index 113dafb12dc..aa5fe78fcfa 100644 --- a/idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt +++ b/idea/src/org/jetbrains/jet/plugin/completion/smart/SmartCompletion.kt @@ -161,8 +161,8 @@ class SmartCompletion(val expression: JetSimpleNameExpression, private fun implicitlyTypedDeclarationFromInitializer(expression: JetExpression): JetDeclaration? { val parent = expression.getParent() when (parent) { - is JetVariableDeclaration -> if (expression == parent.getInitializer() && parent.getTypeRef() == null) return parent - is JetNamedFunction -> if (expression == parent.getInitializer() && parent.getReturnTypeRef() == null) return parent + is JetVariableDeclaration -> if (expression == parent.getInitializer() && parent.getTypeReference() == null) return parent + is JetNamedFunction -> if (expression == parent.getInitializer() && parent.getTypeReference() == null) return parent } return null } diff --git a/idea/src/org/jetbrains/jet/plugin/findUsages/JetUsageTypeProvider.kt b/idea/src/org/jetbrains/jet/plugin/findUsages/JetUsageTypeProvider.kt index b177bd2a734..e3d863407f3 100644 --- a/idea/src/org/jetbrains/jet/plugin/findUsages/JetUsageTypeProvider.kt +++ b/idea/src/org/jetbrains/jet/plugin/findUsages/JetUsageTypeProvider.kt @@ -61,7 +61,7 @@ public object JetUsageTypeProvider : UsageTypeProviderEx { val property = refExpr.getParentByType(javaClass()) if (property != null) { when { - property.getTypeRef().isAncestor(refExpr) -> + property.getTypeReference().isAncestor(refExpr) -> return if (property.isLocal()) UsageType.CLASS_LOCAL_VAR_DECLARATION else JetUsageTypes.NON_LOCAL_PROPERTY_TYPE property.getReceiverTypeRef().isAncestor(refExpr) -> @@ -72,7 +72,7 @@ public object JetUsageTypeProvider : UsageTypeProviderEx { val function = refExpr.getParentByType(javaClass()) if (function != null) { when { - function.getReturnTypeRef().isAncestor(refExpr) -> + function.getTypeReference().isAncestor(refExpr) -> return JetUsageTypes.FUNCTION_RETURN_TYPE function.getReceiverTypeRef().isAncestor(refExpr) -> return JetUsageTypes.EXTENSION_RECEIVER_TYPE diff --git a/idea/src/org/jetbrains/jet/plugin/intentions/MakeTypeExplicitInLambdaIntention.kt b/idea/src/org/jetbrains/jet/plugin/intentions/MakeTypeExplicitInLambdaIntention.kt index 777d53916c6..cee3379895f 100644 --- a/idea/src/org/jetbrains/jet/plugin/intentions/MakeTypeExplicitInLambdaIntention.kt +++ b/idea/src/org/jetbrains/jet/plugin/intentions/MakeTypeExplicitInLambdaIntention.kt @@ -90,7 +90,7 @@ public class MakeTypeExplicitInLambdaIntention : JetSelfTargetingIntention if (declaration instanceof JetProperty) { JetProperty property = (JetProperty) declaration; - JetTypeReference ref = property.getTypeRef(); + JetTypeReference ref = property.getTypeReference(); if (ref != null) { if (settings.SPACE_BEFORE_TYPE_COLON) text += " "; text += ":"; @@ -90,7 +90,7 @@ public class JetDeclarationTreeNode extends AbstractPsiBasedNode } if (parameters.size() > 0) text = text.substring(0, text.length() - 2); text += ")"; - JetTypeReference typeReference = function.getReturnTypeRef(); + JetTypeReference typeReference = function.getTypeReference(); if (typeReference != null) { if (settings.SPACE_BEFORE_TYPE_COLON) text += " "; text += ":"; diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralReturnTypeFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralReturnTypeFix.java index cc0fa1e1c9a..62d387be14e 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralReturnTypeFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeFunctionLiteralReturnTypeFix.java @@ -53,7 +53,7 @@ public class ChangeFunctionLiteralReturnTypeFix extends JetIntentionAction } else { if (!(KotlinBuiltIns.getInstance().isUnit(type) && element.hasBlockBody())) { - element.setReturnTypeRef(JetPsiFactory(project).createType(renderedType)); + element.setTypeReference(JetPsiFactory(project).createType(renderedType)); } else { - element.setReturnTypeRef(null); + element.setTypeReference(null); } } } @@ -137,7 +137,7 @@ public class ChangeFunctionReturnTypeFix extends JetIntentionAction if (resolvedCall == null) return null; JetFunction componentFunction = (JetFunction) DescriptorToSourceUtils .descriptorToDeclaration(resolvedCall.getCandidateDescriptor()); - JetType expectedType = context.get(BindingContext.TYPE, entry.getTypeRef()); + JetType expectedType = context.get(BindingContext.TYPE, entry.getTypeReference()); if (componentFunction != null && expectedType != null) { return new ChangeFunctionReturnTypeFix(componentFunction, expectedType); } diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java index adc1fce22fc..fb07b1939a6 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/ChangeMemberFunctionSignatureFix.java @@ -371,7 +371,7 @@ public class ChangeMemberFunctionSignatureFix extends JetHintAction assert nextSibling != null; newElement.deleteChildRange(nextSibling, initializer); - if (newElement.getTypeRef() == null && type != null) { + if (newElement.getTypeReference() == null && type != null) { typeToAdd = type; } } diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt index 5f9d94f88b1..19dc9bdefca 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt @@ -379,7 +379,7 @@ class CallableBuilder(val config: CallableBuilderConfiguration) { } if (returnTypeExpression != null) { - val returnTypeRef = declaration.getReturnTypeRef() + val returnTypeRef = declaration.getTypeReference() if (returnTypeRef != null) { val returnType = returnTypeExpression.getTypeFromSelection( returnTypeRef.getText() @@ -388,7 +388,7 @@ class CallableBuilder(val config: CallableBuilderConfiguration) { if (returnType != null) { // user selected a given type replaceWithLongerName(returnTypeRef, returnType) - typeRefsToShorten.add(declaration.getReturnTypeRef()!!) + typeRefsToShorten.add(declaration.getTypeReference()!!) } } } @@ -420,7 +420,7 @@ class CallableBuilder(val config: CallableBuilderConfiguration) { private fun setupFunctionBody(func: JetNamedFunction) { val fileTemplate = FileTemplateManager.getInstance()!!.getCodeTemplate(TEMPLATE_FROM_USAGE_FUNCTION_BODY) val properties = Properties() - properties.setProperty(FileTemplate.ATTRIBUTE_RETURN_TYPE, if (isUnit) "Unit" else func.getReturnTypeRef()!!.getText()) + properties.setProperty(FileTemplate.ATTRIBUTE_RETURN_TYPE, if (isUnit) "Unit" else func.getTypeReference()!!.getText()) receiverClassDescriptor?.let { properties.setProperty(FileTemplate.ATTRIBUTE_CLASS_NAME, DescriptorUtils.getFqName(it).asString()) properties.setProperty(FileTemplate.ATTRIBUTE_SIMPLE_CLASS_NAME, it.getName().asString()) @@ -444,7 +444,7 @@ class CallableBuilder(val config: CallableBuilderConfiguration) { } private fun setupReturnTypeTemplate(builder: TemplateBuilder, declaration: JetCallableDeclaration): TypeExpression? { - val returnTypeRef = declaration.getReturnTypeRef() ?: return null + val returnTypeRef = declaration.getTypeReference() ?: return null val candidates = typeCandidates[config.callableInfo.returnTypeInfo]!! return when (candidates.size) { 0 -> null @@ -476,7 +476,7 @@ class CallableBuilder(val config: CallableBuilderConfiguration) { typeParameterMap[it.renderedType!!] = it.typeParameterNames!! } - if (declaration.getReturnTypeRef() != null) { + if (declaration.getTypeReference() != null) { typeCandidates[config.callableInfo.returnTypeInfo]!!.forEach { typeParameterMap[it.renderedType!!] = it.typeParameterNames!! } diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/templateExpressions.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/templateExpressions.kt index 3ac15e93abf..3daf85bac04 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/templateExpressions.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/templateExpressions.kt @@ -124,7 +124,7 @@ private class TypeParameterListExpression(private val typeParameterNamesFromRece } } } - val returnTypeRef = func.getReturnTypeRef() + val returnTypeRef = func.getTypeReference() if (returnTypeRef != null) { val typeParameterNamesFromReturnType = parameterTypeToTypeParameterNamesMap[returnTypeRef.getText()] if (typeParameterNamesFromReturnType != null) { diff --git a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/typeUtils.kt b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/typeUtils.kt index 941240aaa3a..47c9e622be8 100644 --- a/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/typeUtils.kt +++ b/idea/src/org/jetbrains/jet/plugin/quickfix/createFromUsage/callableBuilder/typeUtils.kt @@ -97,7 +97,7 @@ fun JetExpression.guessTypes(context: BindingContext): Array { } this is JetMultiDeclarationEntry -> { // expression is on the lhs of a multi-declaration - val typeRef = getTypeRef() + val typeRef = getTypeReference() if (typeRef != null) { // and has a specified type array(context[BindingContext.TYPE, typeRef]!!) @@ -122,7 +122,7 @@ fun JetExpression.guessTypes(context: BindingContext): Array { getParent() is JetVariableDeclaration -> { // the expression is the RHS of a variable assignment with a specified type val variable = getParent() as JetVariableDeclaration - val typeRef = variable.getTypeRef() + val typeRef = variable.getTypeReference() if (typeRef != null) { // and has a specified type array(context[BindingContext.TYPE, typeRef]!!) diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/JetFunctionDefinitionUsage.java b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/JetFunctionDefinitionUsage.java index 6d251ac5786..2543e7548b4 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/JetFunctionDefinitionUsage.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/changeSignature/usages/JetFunctionDefinitionUsage.java @@ -57,12 +57,12 @@ public class JetFunctionDefinitionUsage extends JetUsageInfo { } } if (changeInfo.isReturnTypeChanged()) { - function.setReturnTypeRef(null); + function.setTypeReference(null); String returnTypeText = changeInfo.getNewReturnTypeText(); //TODO use ChangeFunctionReturnTypeFix.invoke when JetTypeCodeFragment.getType() is ready if (!KotlinBuiltIns.getInstance().getUnitType().toString().equals(returnTypeText)) { - function.setReturnTypeRef(JetPsiFactory(function).createType(returnTypeText)); + function.setTypeReference(JetPsiFactory(function).createType(returnTypeText)); } } } diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractorUtil.kt b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractorUtil.kt index 581503c6050..7d7325994b2 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractorUtil.kt +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/extractFunction/extractorUtil.kt @@ -241,7 +241,7 @@ private fun makeCall( block.addBefore(newLine, anchorInBlock) } - val entries = declarationsToMerge.map { p -> p.getName() + (p.getTypeRef()?.let { ": ${it.getText()}" } ?: "") } + val entries = declarationsToMerge.map { p -> p.getName() + (p.getTypeReference()?.let { ": ${it.getText()}" } ?: "") } anchorInBlock?.replace( psiFactory.createDeclaration("${if (isVar) "var" else "val"} (${entries.joinToString()}) = $callText") ) diff --git a/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinInplaceVariableIntroducer.java b/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinInplaceVariableIntroducer.java index b0da6cf08e8..c55c70e6041 100644 --- a/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinInplaceVariableIntroducer.java +++ b/idea/src/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/KotlinInplaceVariableIntroducer.java @@ -121,7 +121,7 @@ public class KotlinInplaceVariableIntroducer extends InplaceVariableIntroducer