Extract variable refactoring

This commit is contained in:
Nikolay Krasko
2012-08-29 22:41:02 +04:00
parent 03989b9055
commit 9a9efd5b2f
@@ -195,11 +195,12 @@ public abstract class ExpectedResolveData {
PsiElement element = position.getElement();
JetReferenceExpression referenceExpression = PsiTreeUtil.getParentOfType(element, JetReferenceExpression.class);
DeclarationDescriptor referenceTarget = bindingContext.get(REFERENCE_TARGET, referenceExpression);
if ("!".equals(name)) {
assertTrue(
"Must have been unresolved: " +
renderReferenceInContext(referenceExpression) +
" but was resolved to " + renderNullableDescriptor(bindingContext.get(REFERENCE_TARGET, referenceExpression)),
" but was resolved to " + renderNullableDescriptor(referenceTarget),
unresolvedReferences.contains(referenceExpression));
continue;
}
@@ -207,7 +208,7 @@ public abstract class ExpectedResolveData {
assertTrue(
"Must have been resolved to multiple descriptors: " +
renderReferenceInContext(referenceExpression) +
" but was resolved to " + renderNullableDescriptor(bindingContext.get(REFERENCE_TARGET, referenceExpression)),
" but was resolved to " + renderNullableDescriptor(referenceTarget),
bindingContext.get(AMBIGUOUS_REFERENCE_TARGET, referenceExpression) != null);
continue;
}
@@ -215,8 +216,8 @@ public abstract class ExpectedResolveData {
assertTrue(
"Must have been resolved to null: " +
renderReferenceInContext(referenceExpression) +
" but was resolved to " + renderNullableDescriptor(bindingContext.get(REFERENCE_TARGET, referenceExpression)),
bindingContext.get(REFERENCE_TARGET, referenceExpression) == null
" but was resolved to " + renderNullableDescriptor(referenceTarget),
referenceTarget == null
);
continue;
}
@@ -224,8 +225,8 @@ public abstract class ExpectedResolveData {
assertTrue(
"Must have been resolved to error: " +
renderReferenceInContext(referenceExpression) +
" but was resolved to " + renderNullableDescriptor(bindingContext.get(REFERENCE_TARGET, referenceExpression)),
ErrorUtils.isError(bindingContext.get(REFERENCE_TARGET, referenceExpression))
" but was resolved to " + renderNullableDescriptor(referenceTarget),
ErrorUtils.isError(referenceTarget)
);
continue;
}