From ec7efdfee29fe63d43c570f7ff79459ab65f231c Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 18 Jun 2012 19:43:52 +0400 Subject: [PATCH] ExpressionTypingServices.getTypeInfo() --- .../types/expressions/ExpressionTypingServices.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingServices.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingServices.java index dc68014f924..84c0717f6c1 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingServices.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingServices.java @@ -115,12 +115,17 @@ public class ExpressionTypingServices { return ErrorUtils.createErrorType("Type for " + expression.getText()); } - @Nullable - public JetType getType(@NotNull final JetScope scope, @NotNull JetExpression expression, @NotNull JetType expectedType, @NotNull DataFlowInfo dataFlowInfo, @NotNull BindingTrace trace) { + @NotNull + public JetTypeInfo getTypeInfo(@NotNull final JetScope scope, @NotNull JetExpression expression, @NotNull JetType expectedType, @NotNull DataFlowInfo dataFlowInfo, @NotNull BindingTrace trace) { ExpressionTypingContext context = ExpressionTypingContext.newContext( this, trace, scope, dataFlowInfo, expectedType, false ); - return expressionTypingFacade.getTypeInfo(expression, context).getType(); + return expressionTypingFacade.getTypeInfo(expression, context); + } + + @Nullable + public JetType getType(@NotNull final JetScope scope, @NotNull JetExpression expression, @NotNull JetType expectedType, @NotNull DataFlowInfo dataFlowInfo, @NotNull BindingTrace trace) { + return getTypeInfo(scope, expression, expectedType, dataFlowInfo, trace).getType(); } public JetType getTypeWithNamespaces(@NotNull final JetScope scope, @NotNull JetExpression expression, @NotNull BindingTrace trace) {