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

Refactoring: use interface instead of class

Browse Source
This commit is contained in:
Nikolay Krasko
2013-07-24 20:29:04 +04:00
parent 90511e93b5
commit 37f2168c38
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/ResolveSessionUtils.java
+9 -9
View File
@@ -130,7 +130,7 @@ public class ResolveSessionUtils {
if (resolveElement != null) { if (resolveElement != null) {
// All additional resolve should be done to separate trace // All additional resolve should be done to separate trace
DelegatingBindingTrace trace = new DelegatingBindingTrace(resolveSession.getBindingContext(), "trace to resolve element", jetElement); BindingTrace trace = new DelegatingBindingTrace(resolveSession.getBindingContext(), "trace to resolve element", jetElement);
JetFile file = (JetFile) jetElement.getContainingFile(); JetFile file = (JetFile) jetElement.getContainingFile();
@@ -187,7 +187,7 @@ public class ResolveSessionUtils {
private static void namespaceRefAdditionalResolve( private static void namespaceRefAdditionalResolve(
ResolveSession resolveSession, ResolveSession resolveSession,
JetNamespaceHeader header, DelegatingBindingTrace trace, JetElement jetElement JetNamespaceHeader header, BindingTrace trace, JetElement jetElement
) { ) {
if (jetElement instanceof JetSimpleNameExpression) { if (jetElement instanceof JetSimpleNameExpression) {
JetSimpleNameExpression packageNameExpression = (JetSimpleNameExpression) jetElement; JetSimpleNameExpression packageNameExpression = (JetSimpleNameExpression) jetElement;
@@ -243,7 +243,7 @@ public class ResolveSessionUtils {
private static void delegationSpecifierAdditionalResolve( private static void delegationSpecifierAdditionalResolve(
KotlinCodeAnalyzer analyzer, KotlinCodeAnalyzer analyzer,
JetDelegationSpecifierList specifier, DelegatingBindingTrace trace, JetFile file) { JetDelegationSpecifierList specifier, BindingTrace trace, JetFile file) {
BodyResolver bodyResolver = createBodyResolverWithEmptyContext(trace, file, analyzer.getRootModuleDescriptor()); BodyResolver bodyResolver = createBodyResolverWithEmptyContext(trace, file, analyzer.getRootModuleDescriptor());
JetClassOrObject classOrObject = (JetClassOrObject) specifier.getParent(); JetClassOrObject classOrObject = (JetClassOrObject) specifier.getParent();
@@ -258,7 +258,7 @@ public class ResolveSessionUtils {
descriptor.getScopeForMemberDeclarationResolution()); descriptor.getScopeForMemberDeclarationResolution());
} }
private static void propertyAdditionalResolve(ResolveSession resolveSession, final JetProperty jetProperty, DelegatingBindingTrace trace, JetFile file) { private static void propertyAdditionalResolve(ResolveSession resolveSession, final JetProperty jetProperty, BindingTrace trace, JetFile file) {
final JetScope propertyResolutionScope = resolveSession.getInjector().getScopeProvider().getResolutionScopeForDeclaration( final JetScope propertyResolutionScope = resolveSession.getInjector().getScopeProvider().getResolutionScopeForDeclaration(
jetProperty); jetProperty);
@@ -288,7 +288,7 @@ public class ResolveSessionUtils {
private static void functionAdditionalResolve( private static void functionAdditionalResolve(
ResolveSession resolveSession, ResolveSession resolveSession,
JetNamedFunction namedFunction, JetNamedFunction namedFunction,
DelegatingBindingTrace trace, BindingTrace trace,
JetFile file JetFile file
) { ) {
BodyResolver bodyResolver = createBodyResolverWithEmptyContext(trace, file, resolveSession.getRootModuleDescriptor()); BodyResolver bodyResolver = createBodyResolverWithEmptyContext(trace, file, resolveSession.getRootModuleDescriptor());
@@ -300,7 +300,7 @@ public class ResolveSessionUtils {
private static boolean initializerAdditionalResolve( private static boolean initializerAdditionalResolve(
KotlinCodeAnalyzer analyzer, KotlinCodeAnalyzer analyzer,
JetClassInitializer classInitializer, JetClassInitializer classInitializer,
DelegatingBindingTrace trace, BindingTrace trace,
JetFile file JetFile file
) { ) {
BodyResolver bodyResolver = createBodyResolverWithEmptyContext(trace, file, analyzer.getRootModuleDescriptor()); BodyResolver bodyResolver = createBodyResolverWithEmptyContext(trace, file, analyzer.getRootModuleDescriptor());
@@ -312,7 +312,7 @@ public class ResolveSessionUtils {
return true; return true;
} }
private static BodyResolver createBodyResolver(DelegatingBindingTrace trace, JetFile file, BodyResolveContextForLazy bodyResolveContext, private static BodyResolver createBodyResolver(BindingTrace trace, JetFile file, BodyResolveContextForLazy bodyResolveContext,
ModuleDescriptor module) { ModuleDescriptor module) {
TopDownAnalysisParameters parameters = new TopDownAnalysisParameters( TopDownAnalysisParameters parameters = new TopDownAnalysisParameters(
Predicates.<PsiFile>alwaysTrue(), false, true, Collections.<AnalyzerScriptParameter>emptyList()); Predicates.<PsiFile>alwaysTrue(), false, true, Collections.<AnalyzerScriptParameter>emptyList());
@@ -321,7 +321,7 @@ public class ResolveSessionUtils {
} }
private static BodyResolver createBodyResolverWithEmptyContext( private static BodyResolver createBodyResolverWithEmptyContext(
DelegatingBindingTrace trace, BindingTrace trace,
JetFile file, JetFile file,
ModuleDescriptor module ModuleDescriptor module
) { ) {
@@ -338,7 +338,7 @@ public class ResolveSessionUtils {
} }
public static JetScope getExpressionMemberScope(@NotNull ResolveSession resolveSession, @NotNull JetExpression expression) { public static JetScope getExpressionMemberScope(@NotNull ResolveSession resolveSession, @NotNull JetExpression expression) {
DelegatingBindingTrace trace = new DelegatingBindingTrace( BindingTrace trace = new DelegatingBindingTrace(
resolveSession.getBindingContext(), "trace to resolve a member scope of expression", expression); resolveSession.getBindingContext(), "trace to resolve a member scope of expression", expression);
if (BindingContextUtils.isExpressionWithValidReference(expression, resolveSession.getBindingContext())) { if (BindingContextUtils.isExpressionWithValidReference(expression, resolveSession.getBindingContext())) {