Extract variable refactoring
This commit is contained in:
@@ -195,11 +195,12 @@ public abstract class ExpectedResolveData {
|
|||||||
PsiElement element = position.getElement();
|
PsiElement element = position.getElement();
|
||||||
|
|
||||||
JetReferenceExpression referenceExpression = PsiTreeUtil.getParentOfType(element, JetReferenceExpression.class);
|
JetReferenceExpression referenceExpression = PsiTreeUtil.getParentOfType(element, JetReferenceExpression.class);
|
||||||
|
DeclarationDescriptor referenceTarget = bindingContext.get(REFERENCE_TARGET, referenceExpression);
|
||||||
if ("!".equals(name)) {
|
if ("!".equals(name)) {
|
||||||
assertTrue(
|
assertTrue(
|
||||||
"Must have been unresolved: " +
|
"Must have been unresolved: " +
|
||||||
renderReferenceInContext(referenceExpression) +
|
renderReferenceInContext(referenceExpression) +
|
||||||
" but was resolved to " + renderNullableDescriptor(bindingContext.get(REFERENCE_TARGET, referenceExpression)),
|
" but was resolved to " + renderNullableDescriptor(referenceTarget),
|
||||||
unresolvedReferences.contains(referenceExpression));
|
unresolvedReferences.contains(referenceExpression));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@@ -207,7 +208,7 @@ public abstract class ExpectedResolveData {
|
|||||||
assertTrue(
|
assertTrue(
|
||||||
"Must have been resolved to multiple descriptors: " +
|
"Must have been resolved to multiple descriptors: " +
|
||||||
renderReferenceInContext(referenceExpression) +
|
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);
|
bindingContext.get(AMBIGUOUS_REFERENCE_TARGET, referenceExpression) != null);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@@ -215,8 +216,8 @@ public abstract class ExpectedResolveData {
|
|||||||
assertTrue(
|
assertTrue(
|
||||||
"Must have been resolved to null: " +
|
"Must have been resolved to null: " +
|
||||||
renderReferenceInContext(referenceExpression) +
|
renderReferenceInContext(referenceExpression) +
|
||||||
" but was resolved to " + renderNullableDescriptor(bindingContext.get(REFERENCE_TARGET, referenceExpression)),
|
" but was resolved to " + renderNullableDescriptor(referenceTarget),
|
||||||
bindingContext.get(REFERENCE_TARGET, referenceExpression) == null
|
referenceTarget == null
|
||||||
);
|
);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@@ -224,8 +225,8 @@ public abstract class ExpectedResolveData {
|
|||||||
assertTrue(
|
assertTrue(
|
||||||
"Must have been resolved to error: " +
|
"Must have been resolved to error: " +
|
||||||
renderReferenceInContext(referenceExpression) +
|
renderReferenceInContext(referenceExpression) +
|
||||||
" but was resolved to " + renderNullableDescriptor(bindingContext.get(REFERENCE_TARGET, referenceExpression)),
|
" but was resolved to " + renderNullableDescriptor(referenceTarget),
|
||||||
ErrorUtils.isError(bindingContext.get(REFERENCE_TARGET, referenceExpression))
|
ErrorUtils.isError(referenceTarget)
|
||||||
);
|
);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user