Skip to content

Commit 96a812b

Browse files
abreslavabreslav
committed
Minor. Rename method BodiesResolveContext.getClasses()
This is done to avoid the clash of meanings with TopDownAnalysisContext.getAllClasses()
1 parent 98e6b7d commit 96a812b

12 files changed

+34
-33
lines changed

‎compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodiesResolveContext.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,16 @@ public interface BodiesResolveContext extends GlobalContext {
4747
Collection<JetFile> getFiles();
4848

4949
@Mutable
50-
Map<JetClassOrObject, ClassDescriptorWithResolutionScopes> getClasses();
50+
Map<JetClassOrObject, ClassDescriptorWithResolutionScopes> getDeclaredClasses();
51+
@Mutable
52+
Map<JetScript, ScriptDescriptor> getScripts();
53+
5154
@Mutable
5255
Map<JetProperty, PropertyDescriptor> getProperties();
5356
@Mutable
5457
Map<JetNamedFunction, SimpleFunctionDescriptor> getFunctions();
58+
5559
Function<JetDeclaration, JetScope> getDeclaringScopes();
56-
@Mutable
57-
Map<JetScript, ScriptDescriptor> getScripts();
5860
DataFlowInfo getOuterDataFlowInfo();
5961

6062
@NotNull

‎compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public void resolveBodies(@NotNull BodiesResolveContext c) {
146146

147147
private void resolveDelegationSpecifierLists(@NotNull BodiesResolveContext c) {
148148
// TODO : Make sure the same thing is not initialized twice
149-
for (Map.Entry<JetClassOrObject, ClassDescriptorWithResolutionScopes> entry : c.getClasses().entrySet()) {
149+
for (Map.Entry<JetClassOrObject, ClassDescriptorWithResolutionScopes> entry : c.getDeclaredClasses().entrySet()) {
150150
JetClassOrObject classOrObject = entry.getKey();
151151
ClassDescriptorWithResolutionScopes descriptor = entry.getValue();
152152

@@ -329,13 +329,13 @@ else if (constructor.isFinal() && !allowedFinalSupertypes.contains(constructor))
329329
}
330330

331331
private void resolveClassAnnotations(@NotNull BodiesResolveContext c) {
332-
for (Map.Entry<JetClassOrObject, ClassDescriptorWithResolutionScopes> entry : c.getClasses().entrySet()) {
332+
for (Map.Entry<JetClassOrObject, ClassDescriptorWithResolutionScopes> entry : c.getDeclaredClasses().entrySet()) {
333333
resolveAnnotationArguments(entry.getValue().getScopeForClassHeaderResolution(), entry.getKey());
334334
}
335335
}
336336

337337
private void resolveAnonymousInitializers(@NotNull BodiesResolveContext c) {
338-
for (Map.Entry<JetClassOrObject, ClassDescriptorWithResolutionScopes> entry : c.getClasses().entrySet()) {
338+
for (Map.Entry<JetClassOrObject, ClassDescriptorWithResolutionScopes> entry : c.getDeclaredClasses().entrySet()) {
339339
JetClassOrObject classOrObject = entry.getKey();
340340
ClassDescriptorWithResolutionScopes descriptor = entry.getValue();
341341
resolveAnonymousInitializers(c, classOrObject, descriptor.getUnsubstitutedPrimaryConstructor(),
@@ -378,7 +378,7 @@ private void processModifiersOnInitializer(@NotNull JetModifierListOwner owner,
378378
}
379379

380380
private void resolvePrimaryConstructorParameters(@NotNull BodiesResolveContext c) {
381-
for (Map.Entry<JetClassOrObject, ClassDescriptorWithResolutionScopes> entry : c.getClasses().entrySet()) {
381+
for (Map.Entry<JetClassOrObject, ClassDescriptorWithResolutionScopes> entry : c.getDeclaredClasses().entrySet()) {
382382
if (!(entry.getKey() instanceof JetClass)) continue;
383383
JetClass klass = (JetClass) entry.getKey();
384384
ClassDescriptorWithResolutionScopes classDescriptor = entry.getValue();
@@ -414,7 +414,7 @@ private void resolvePropertyDeclarationBodies(@NotNull BodiesResolveContext c) {
414414

415415
// Member properties
416416
Set<JetProperty> processed = Sets.newHashSet();
417-
for (Map.Entry<JetClassOrObject, ClassDescriptorWithResolutionScopes> entry : c.getClasses().entrySet()) {
417+
for (Map.Entry<JetClassOrObject, ClassDescriptorWithResolutionScopes> entry : c.getDeclaredClasses().entrySet()) {
418418
if (!(entry.getKey() instanceof JetClass)) continue;
419419
JetClass jetClass = (JetClass) entry.getKey();
420420
ClassDescriptorWithResolutionScopes classDescriptor = entry.getValue();

‎compiler/frontend/src/org/jetbrains/jet/lang/resolve/CachedBodiesResolveContext.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.jetbrains.jet.lang.psi.*;
2828
import org.jetbrains.jet.lang.resolve.calls.autocasts.DataFlowInfo;
2929
import org.jetbrains.jet.lang.resolve.scopes.JetScope;
30-
import org.jetbrains.jet.lang.resolve.scopes.WritableScope;
3130
import org.jetbrains.jet.storage.ExceptionTracker;
3231
import org.jetbrains.jet.storage.StorageManager;
3332

@@ -52,7 +51,7 @@ public class CachedBodiesResolveContext implements BodiesResolveContext {
5251

5352
public CachedBodiesResolveContext(TopDownAnalysisContext context) {
5453
files = Collections.unmodifiableCollection(context.getFiles());
55-
classes = Collections.unmodifiableMap(context.getClasses());
54+
classes = Collections.unmodifiableMap(context.getDeclaredClasses());
5655
properties = Collections.unmodifiableMap(context.getProperties());
5756
functions = Collections.unmodifiableMap(context.getFunctions());
5857
declaringScopes = context.getDeclaringScopes();
@@ -80,7 +79,7 @@ public Collection<JetFile> getFiles() {
8079
}
8180

8281
@Override
83-
public Map<JetClassOrObject, ClassDescriptorWithResolutionScopes> getClasses() {
82+
public Map<JetClassOrObject, ClassDescriptorWithResolutionScopes> getDeclaredClasses() {
8483
return classes;
8584
}
8685

‎compiler/frontend/src/org/jetbrains/jet/lang/resolve/ControlFlowAnalyzer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void process(@NotNull BodiesResolveContext c) {
4343
if (!c.completeAnalysisNeeded(file)) continue;
4444
checkDeclarationContainer(c, file);
4545
}
46-
for (JetClassOrObject aClass : c.getClasses().keySet()) {
46+
for (JetClassOrObject aClass : c.getDeclaredClasses().keySet()) {
4747
if (!c.completeAnalysisNeeded(aClass)) continue;
4848
checkDeclarationContainer(c, aClass);
4949
}

‎compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationResolver.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ public void process(@NotNull TopDownAnalysisContext c) {
103103
}
104104

105105
private void resolveAnnotationConstructors(@NotNull TopDownAnalysisContext c) {
106-
for (Map.Entry<JetClassOrObject, ClassDescriptorWithResolutionScopes> entry : c.getClasses().entrySet()) {
106+
for (Map.Entry<JetClassOrObject, ClassDescriptorWithResolutionScopes> entry : c.getDeclaredClasses().entrySet()) {
107107
JetClassOrObject classOrObject = entry.getKey();
108108
MutableClassDescriptor classDescriptor = (MutableClassDescriptor) entry.getValue();
109109

@@ -114,7 +114,7 @@ private void resolveAnnotationConstructors(@NotNull TopDownAnalysisContext c) {
114114
}
115115

116116
private void resolveConstructorHeaders(@NotNull TopDownAnalysisContext c) {
117-
for (Map.Entry<JetClassOrObject, ClassDescriptorWithResolutionScopes> entry : c.getClasses().entrySet()) {
117+
for (Map.Entry<JetClassOrObject, ClassDescriptorWithResolutionScopes> entry : c.getDeclaredClasses().entrySet()) {
118118
JetClassOrObject classOrObject = entry.getKey();
119119
MutableClassDescriptor classDescriptor = (MutableClassDescriptor) entry.getValue();
120120

@@ -125,7 +125,7 @@ private void resolveConstructorHeaders(@NotNull TopDownAnalysisContext c) {
125125
}
126126

127127
private void resolveAnnotationStubsOnClassesAndConstructors(@NotNull TopDownAnalysisContext c) {
128-
for (Map.Entry<JetClassOrObject, ClassDescriptorWithResolutionScopes> entry : c.getClasses().entrySet()) {
128+
for (Map.Entry<JetClassOrObject, ClassDescriptorWithResolutionScopes> entry : c.getDeclaredClasses().entrySet()) {
129129
JetModifierList modifierList = entry.getKey().getModifierList();
130130
if (modifierList != null) {
131131
MutableClassDescriptor descriptor = (MutableClassDescriptor) entry.getValue();
@@ -143,7 +143,7 @@ private void resolveFunctionAndPropertyHeaders(@NotNull TopDownAnalysisContext c
143143

144144
resolveFunctionAndPropertyHeaders(c, file.getDeclarations(), fileScope, fileScope, fileScope, packageBuilder);
145145
}
146-
for (Map.Entry<JetClassOrObject, ClassDescriptorWithResolutionScopes> entry : c.getClasses().entrySet()) {
146+
for (Map.Entry<JetClassOrObject, ClassDescriptorWithResolutionScopes> entry : c.getDeclaredClasses().entrySet()) {
147147
JetClassOrObject classOrObject = entry.getKey();
148148
MutableClassDescriptor classDescriptor = (MutableClassDescriptor) entry.getValue();
149149

@@ -206,7 +206,7 @@ public void visitProperty(@NotNull JetProperty property) {
206206
}
207207

208208
private void createFunctionsForDataClasses(@NotNull TopDownAnalysisContext c) {
209-
for (Map.Entry<JetClassOrObject, ClassDescriptorWithResolutionScopes> entry : c.getClasses().entrySet()) {
209+
for (Map.Entry<JetClassOrObject, ClassDescriptorWithResolutionScopes> entry : c.getDeclaredClasses().entrySet()) {
210210
JetClassOrObject klass = entry.getKey();
211211
MutableClassDescriptor classDescriptor = (MutableClassDescriptor) entry.getValue();
212212

@@ -337,7 +337,7 @@ public PsiElement apply(@Nullable JetFile file) {
337337
}
338338

339339
public void checkRedeclarationsInInnerClassNames(@NotNull TopDownAnalysisContext c) {
340-
for (ClassDescriptorWithResolutionScopes classDescriptor : c.getClasses().values()) {
340+
for (ClassDescriptorWithResolutionScopes classDescriptor : c.getDeclaredClasses().values()) {
341341
if (classDescriptor.getKind() == ClassKind.CLASS_OBJECT) {
342342
// Class objects should be considered during analysing redeclarations in classes
343343
continue;

‎compiler/frontend/src/org/jetbrains/jet/lang/resolve/DeclarationsChecker.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public void process(@NotNull BodiesResolveContext bodiesResolveContext) {
6262
checkModifiersAndAnnotationsInPackageDirective(file);
6363
}
6464

65-
Map<JetClassOrObject, ClassDescriptorWithResolutionScopes> classes = bodiesResolveContext.getClasses();
65+
Map<JetClassOrObject, ClassDescriptorWithResolutionScopes> classes = bodiesResolveContext.getDeclaredClasses();
6666
for (Map.Entry<JetClassOrObject, ClassDescriptorWithResolutionScopes> entry : classes.entrySet()) {
6767
JetClassOrObject classOrObject = entry.getKey();
6868
ClassDescriptorWithResolutionScopes classDescriptor = entry.getValue();

‎compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverloadResolver.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ private void checkOverloads(@NotNull BodiesResolveContext c) {
5454
MultiMap<FqNameUnsafe, ConstructorDescriptor> inPackages = MultiMap.create();
5555
fillGroupedConstructors(c, inClasses, inPackages);
5656

57-
for (Map.Entry<JetClassOrObject, ClassDescriptorWithResolutionScopes> entry : c.getClasses().entrySet()) {
57+
for (Map.Entry<JetClassOrObject, ClassDescriptorWithResolutionScopes> entry : c.getDeclaredClasses().entrySet()) {
5858
checkOverloadsInAClass(entry.getValue(), entry.getKey(), inClasses.get(entry.getValue()));
5959
}
6060
checkOverloadsInPackages(c, inPackages);
@@ -65,7 +65,7 @@ private void fillGroupedConstructors(
6565
@NotNull MultiMap<ClassDescriptor, ConstructorDescriptor> inClasses,
6666
@NotNull MultiMap<FqNameUnsafe, ConstructorDescriptor> inPackages
6767
) {
68-
for (ClassDescriptorWithResolutionScopes klass : c.getClasses().values()) {
68+
for (ClassDescriptorWithResolutionScopes klass : c.getDeclaredClasses().values()) {
6969
if (klass.getKind().isSingleton()) {
7070
// Constructors of singletons aren't callable from the code, so they shouldn't participate in overload name checking
7171
continue;

‎compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ private static List<CallableMemberDescriptor> getCallableMembersFromType(JetScop
208208
}
209209

210210
private void checkOverrides(@NotNull TopDownAnalysisContext c) {
211-
for (Map.Entry<JetClassOrObject, ClassDescriptorWithResolutionScopes> entry : c.getClasses().entrySet()) {
211+
for (Map.Entry<JetClassOrObject, ClassDescriptorWithResolutionScopes> entry : c.getDeclaredClasses().entrySet()) {
212212
checkOverridesInAClass(c, entry.getValue(), entry.getKey());
213213
}
214214
}
@@ -621,7 +621,7 @@ private CallableMemberDescriptor findInvisibleOverriddenDescriptor(CallableMembe
621621
}
622622

623623
private void checkParameterOverridesForAllClasses(@NotNull TopDownAnalysisContext c) {
624-
for (ClassDescriptorWithResolutionScopes classDescriptor : c.getClasses().values()) {
624+
for (ClassDescriptorWithResolutionScopes classDescriptor : c.getDeclaredClasses().values()) {
625625
for (DeclarationDescriptor member : classDescriptor.getDefaultType().getMemberScope().getAllDescriptors()) {
626626
if (member instanceof CallableMemberDescriptor) {
627627
checkOverridesForParameters((CallableMemberDescriptor) member);

‎compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalysisContext.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public boolean completeAnalysisNeeded(@NotNull PsiElement element) {
110110
}
111111

112112
@Override
113-
public Map<JetClassOrObject, ClassDescriptorWithResolutionScopes> getClasses() {
113+
public Map<JetClassOrObject, ClassDescriptorWithResolutionScopes> getDeclaredClasses() {
114114
return classes;
115115
}
116116

@@ -213,6 +213,6 @@ public ClassDescriptorWithResolutionScopes invoke(ScriptDescriptor scriptDescrip
213213
}
214214
}
215215
);
216-
return KotlinPackage.plus(getClasses().values(), scriptClasses);
216+
return KotlinPackage.plus(getDeclaredClasses().values(), scriptClasses);
217217
}
218218
}

‎compiler/frontend/src/org/jetbrains/jet/lang/resolve/TopDownAnalyzer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ private void visitClassOrObject(@NotNull JetClassOrObject classOrObject) {
209209
(ClassDescriptorWithResolutionScopes) resolveSession.getClassDescriptor(classOrObject)
210210
);
211211

212-
c.getClasses().put(classOrObject, descriptor);
212+
c.getDeclaredClasses().put(classOrObject, descriptor);
213213
registerDeclarations(classOrObject.getDeclarations());
214214
registerTopLevelFqName(classOrObject, descriptor);
215215

@@ -328,7 +328,7 @@ public JetFile invoke(PsiElement element) {
328328
}
329329

330330
private void lockScopes(@NotNull TopDownAnalysisContext c) {
331-
for (ClassDescriptorWithResolutionScopes mutableClassDescriptor : c.getClasses().values()) {
331+
for (ClassDescriptorWithResolutionScopes mutableClassDescriptor : c.getDeclaredClasses().values()) {
332332
((MutableClassDescriptor) mutableClassDescriptor).lockScopes();
333333
}
334334

‎compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeHierarchyResolver.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ private static ClassKind getClassKind(@NotNull JetClass jetClass) {
166166
}
167167

168168
private void createTypeConstructors(@NotNull TopDownAnalysisContext c) {
169-
for (Map.Entry<JetClassOrObject, ClassDescriptorWithResolutionScopes> entry : c.getClasses().entrySet()) {
169+
for (Map.Entry<JetClassOrObject, ClassDescriptorWithResolutionScopes> entry : c.getDeclaredClasses().entrySet()) {
170170
JetClassOrObject classOrObject = entry.getKey();
171171
MutableClassDescriptor descriptor = (MutableClassDescriptor) entry.getValue();
172172
if (classOrObject instanceof JetClass) {
@@ -203,7 +203,7 @@ else if (classOrObject instanceof JetObjectDeclaration) {
203203
}
204204

205205
private void resolveTypesInClassHeaders(@NotNull TopDownAnalysisContext c) {
206-
for (Map.Entry<JetClassOrObject, ClassDescriptorWithResolutionScopes> entry : c.getClasses().entrySet()) {
206+
for (Map.Entry<JetClassOrObject, ClassDescriptorWithResolutionScopes> entry : c.getDeclaredClasses().entrySet()) {
207207
JetClassOrObject classOrObject = entry.getKey();
208208
if (classOrObject instanceof JetClass) {
209209
ClassDescriptorWithResolutionScopes descriptor = entry.getValue();
@@ -213,7 +213,7 @@ private void resolveTypesInClassHeaders(@NotNull TopDownAnalysisContext c) {
213213
}
214214
}
215215

216-
for (Map.Entry<JetClassOrObject, ClassDescriptorWithResolutionScopes> entry : c.getClasses().entrySet()) {
216+
for (Map.Entry<JetClassOrObject, ClassDescriptorWithResolutionScopes> entry : c.getDeclaredClasses().entrySet()) {
217217
descriptorResolver.resolveSupertypesForMutableClassDescriptor(entry.getKey(), (MutableClassDescriptor) entry.getValue(), trace);
218218
}
219219
}
@@ -467,7 +467,7 @@ private MutableClassDescriptor createClassDescriptorForClass(
467467
boolean isInner = kind == ClassKind.CLASS && klass.isInner();
468468
MutableClassDescriptor mutableClassDescriptor = new MutableClassDescriptor(
469469
containingDeclaration, outerScope, kind, isInner, JetPsiUtil.safeName(klass.getName()));
470-
c.getClasses().put(klass, mutableClassDescriptor);
470+
c.getDeclaredClasses().put(klass, mutableClassDescriptor);
471471
trace.record(FQNAME_TO_CLASS_DESCRIPTOR, JetNamedDeclarationUtil.getUnsafeFQName(klass), mutableClassDescriptor);
472472

473473
createClassObjectForEnumClass(mutableClassDescriptor);
@@ -492,7 +492,7 @@ private MutableClassDescriptor createClassDescriptorForSingleton(
492492
createPrimaryConstructorForObject(declaration, descriptor);
493493
trace.record(BindingContext.CLASS, declaration, descriptor);
494494

495-
c.getClasses().put(declaration, descriptor);
495+
c.getDeclaredClasses().put(declaration, descriptor);
496496

497497
return descriptor;
498498
}

‎idea/src/org/jetbrains/jet/plugin/project/ResolveElementCache.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ public Collection<JetFile> getFiles() {
456456
}
457457

458458
@Override
459-
public Map<JetClassOrObject, ClassDescriptorWithResolutionScopes> getClasses() {
459+
public Map<JetClassOrObject, ClassDescriptorWithResolutionScopes> getDeclaredClasses() {
460460
return Collections.emptyMap();
461461
}
462462

0 commit comments

Comments
 (0)