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

Refactoring: method rename resolveToExpression -> resolveToElement

Browse Source
This commit is contained in:
Nikolay Krasko
2013-07-11 16:35:14 +04:00
parent b6be094724
commit ab4452a508
12 changed files with 43 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSessionUtils.java
+7 -7
View File
@@ -113,16 +113,16 @@ public class ResolveSessionUtils {
}
}
public static @NotNull BindingContext resolveToExpression(
public static @NotNull BindingContext resolveToElement(
@NotNull ResolveSession resolveSession,
@NotNull JetElement expression
@NotNull JetElement jetElement
) {
DelegatingBindingTrace trace = new DelegatingBindingTrace(
resolveSession.getBindingContext(), "trace to resolve expression", expression);
JetFile file = (JetFile) expression.getContainingFile();
resolveSession.getBindingContext(), "trace to resolve jetElement", jetElement);
JetFile file = (JetFile) jetElement.getContainingFile();
@SuppressWarnings("unchecked")
PsiElement topmostCandidateForAdditionalResolve = JetPsiUtil.getTopmostParentOfTypes(expression,
PsiElement topmostCandidateForAdditionalResolve = JetPsiUtil.getTopmostParentOfTypes(jetElement,
JetNamedFunction.class, JetClassInitializer.class,
JetProperty.class, JetDelegationSpecifierList.class,
JetImportDirective.class);
@@ -155,8 +155,8 @@ public class ResolveSessionUtils {
return trace.getBindingContext();
}
if (expression instanceof JetExpression) {
JetExpression jetExpression = (JetExpression) expression;
if (jetElement instanceof JetExpression) {
JetExpression jetExpression = (JetExpression) jetElement;
// Setup resolution scope explicitly
if (trace.getBindingContext().get(BindingContext.RESOLUTION_SCOPE, jetExpression) == null) {
JetScope scope = getExpressionMemberScope(resolveSession, jetExpression);