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

Rename method refactoring

Browse Source
This commit is contained in:
Nikolay Krasko
2012-09-04 15:05:25 +04:00
parent 2fdcfcfff4
commit a0c2cee754
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSessionUtils.java
+1 -1
View File
@@ -90,7 +90,7 @@ public class ResolveSessionUtils {
} }
} }
public static @NotNull BindingContext getExpressionBindingContext(@NotNull ResolveSession resolveSession, @NotNull JetExpression expression) { public static @NotNull BindingContext resolveToExpression(@NotNull ResolveSession resolveSession, @NotNull JetExpression expression) {
final DelegatingBindingTrace trace = new DelegatingBindingTrace(resolveSession.getBindingContext()); final DelegatingBindingTrace trace = new DelegatingBindingTrace(resolveSession.getBindingContext());
JetFile file = (JetFile) expression.getContainingFile(); JetFile file = (JetFile) expression.getContainingFile();
idea/src/org/jetbrains/jet/plugin/caches/JetShortNamesCache.java
+2 -2
View File
@@ -156,7 +156,7 @@ public class JetShortNamesCache extends PsiShortNamesCache {
@NotNull ResolveSession resolveSession, @NotNull ResolveSession resolveSession,
@NotNull GlobalSearchScope scope @NotNull GlobalSearchScope scope
) { ) {
BindingContext context = ResolveSessionUtils.getExpressionBindingContext(resolveSession, expression); BindingContext context = ResolveSessionUtils.resolveToExpression(resolveSession, expression);
JetScope jetScope = context.get(BindingContext.RESOLUTION_SCOPE, expression); JetScope jetScope = context.get(BindingContext.RESOLUTION_SCOPE, expression);
if (jetScope == null || name.isEmpty()) { if (jetScope == null || name.isEmpty()) {
@@ -238,7 +238,7 @@ public class JetShortNamesCache extends PsiShortNamesCache {
) { ) {
Collection<DeclarationDescriptor> resultDescriptors = new ArrayList<DeclarationDescriptor>(); Collection<DeclarationDescriptor> resultDescriptors = new ArrayList<DeclarationDescriptor>();
BindingContext context = ResolveSessionUtils.getExpressionBindingContext(resolveSession, expression); BindingContext context = ResolveSessionUtils.resolveToExpression(resolveSession, expression);
JetExpression receiverExpression = expression.getReceiverExpression(); JetExpression receiverExpression = expression.getReceiverExpression();
if (receiverExpression != null) { if (receiverExpression != null) {
idea/src/org/jetbrains/jet/plugin/completion/JetCompletionContributor.java
+3 -3
View File
@@ -35,8 +35,8 @@ import org.jetbrains.jet.cli.jvm.compiler.TipsManager;
import org.jetbrains.jet.lang.descriptors.*; import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.psi.*; import org.jetbrains.jet.lang.psi.*;
import org.jetbrains.jet.lang.resolve.BindingContext; import org.jetbrains.jet.lang.resolve.BindingContext;
import org.jetbrains.jet.lang.resolve.lazy.ResolveSessionUtils;
import org.jetbrains.jet.lang.resolve.lazy.ResolveSession; import org.jetbrains.jet.lang.resolve.lazy.ResolveSession;
import org.jetbrains.jet.lang.resolve.lazy.ResolveSessionUtils;
import org.jetbrains.jet.lang.resolve.scopes.JetScope; import org.jetbrains.jet.lang.resolve.scopes.JetScope;
import org.jetbrains.jet.lexer.JetTokens; import org.jetbrains.jet.lexer.JetTokens;
import org.jetbrains.jet.plugin.caches.JetCacheManager; import org.jetbrains.jet.plugin.caches.JetCacheManager;
@@ -84,7 +84,7 @@ public class JetCompletionContributor extends CompletionContributor {
session.resolveSession = session.resolveSession =
WholeProjectAnalyzerFacade.getLazyResolveSessionForFile((JetFile) position.getContainingFile()); WholeProjectAnalyzerFacade.getLazyResolveSessionForFile((JetFile) position.getContainingFile());
session.expressionBindingContext = ResolveSessionUtils.getExpressionBindingContext( session.expressionBindingContext = ResolveSessionUtils.resolveToExpression(
session.resolveSession, jetReference.getExpression()); session.resolveSession, jetReference.getExpression());
JetScope scope = session.expressionBindingContext.get(BindingContext.RESOLUTION_SCOPE, jetReference.getExpression()); JetScope scope = session.expressionBindingContext.get(BindingContext.RESOLUTION_SCOPE, jetReference.getExpression());
@@ -96,7 +96,7 @@ public class JetCompletionContributor extends CompletionContributor {
// Rerun completion if nothing was found // Rerun completion if nothing was found
session.customInvocationCount = 1; session.customInvocationCount = 1;
session.resolveSession = WholeProjectAnalyzerFacade.getLazyResolveSessionForFile((JetFile) position.getContainingFile()); session.resolveSession = WholeProjectAnalyzerFacade.getLazyResolveSessionForFile((JetFile) position.getContainingFile());
session.expressionBindingContext = ResolveSessionUtils.getExpressionBindingContext( session.expressionBindingContext = ResolveSessionUtils.resolveToExpression(
session.resolveSession, jetReference.getExpression()); session.resolveSession, jetReference.getExpression());
completeForReference(parameters, result, position, jetReference, session); completeForReference(parameters, result, position, jetReference, session);
idea/src/org/jetbrains/jet/plugin/completion/JetPackagesContributor.java
+1 -1
View File
@@ -75,7 +75,7 @@ public class JetPackagesContributor extends CompletionContributor {
ResolveSession resolveSession = WholeProjectAnalyzerFacade.getLazyResolveSessionForFile( ResolveSession resolveSession = WholeProjectAnalyzerFacade.getLazyResolveSessionForFile(
(JetFile) simpleNameReference.getExpression().getContainingFile()); (JetFile) simpleNameReference.getExpression().getContainingFile());
BindingContext bindingContext = ResolveSessionUtils.getExpressionBindingContext( BindingContext bindingContext = ResolveSessionUtils.resolveToExpression(
resolveSession, simpleNameReference.getExpression()); resolveSession, simpleNameReference.getExpression());
for (LookupElement variant : DescriptorLookupConverter.collectLookupElements( for (LookupElement variant : DescriptorLookupConverter.collectLookupElements(
idea/src/org/jetbrains/jet/plugin/references/JetSimpleNameReference.java
+1 -1
View File
@@ -64,7 +64,7 @@ public class JetSimpleNameReference extends JetPsiReference {
@Override @Override
public Object[] getVariants() { public Object[] getVariants() {
ResolveSession resolveSession = WholeProjectAnalyzerFacade.getLazyResolveSessionForFile((JetFile) getExpression().getContainingFile()); ResolveSession resolveSession = WholeProjectAnalyzerFacade.getLazyResolveSessionForFile((JetFile) getExpression().getContainingFile());
BindingContext bindingContext = ResolveSessionUtils.getExpressionBindingContext(resolveSession, getExpression()); BindingContext bindingContext = ResolveSessionUtils.resolveToExpression(resolveSession, getExpression());
return DescriptorLookupConverter.collectLookupElements( return DescriptorLookupConverter.collectLookupElements(
resolveSession, bindingContext, TipsManager.getReferenceVariants(myExpression, bindingContext)); resolveSession, bindingContext, TipsManager.getReferenceVariants(myExpression, bindingContext));