From 2954af1b12ffe431ae6a334cf9ee1e6250c92739 Mon Sep 17 00:00:00 2001 From: Andrey Breslav Date: Mon, 23 Sep 2013 23:18:11 -0700 Subject: [PATCH] Unused method getPropertyByFieldReference() removed from JetScope and its implementations --- .../descriptors/DeserializedMemberScope.java | 6 ----- .../lang/resolve/lazy/LazyImportScope.java | 6 ----- .../descriptors/AbstractLazyMemberScope.java | 5 ---- .../resolve/scopes/WriteThroughScope.java | 8 ------ .../resolve/scopes/AbstractScopeAdapter.java | 5 ---- .../jet/lang/resolve/scopes/ChainedScope.java | 11 -------- .../lang/resolve/scopes/FilteringScope.java | 5 ---- .../jet/lang/resolve/scopes/JetScope.java | 7 ----- .../jet/lang/resolve/scopes/JetScopeImpl.java | 5 ---- .../resolve/scopes/SubstitutingScope.java | 5 ---- .../resolve/scopes/WritableScopeImpl.java | 26 ------------------- .../jetbrains/jet/lang/types/ErrorUtils.java | 11 -------- 12 files changed, 100 deletions(-) diff --git a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedMemberScope.java b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedMemberScope.java index 4e33a9101f6..e93fe1019e2 100644 --- a/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedMemberScope.java +++ b/compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedMemberScope.java @@ -211,12 +211,6 @@ public abstract class DeserializedMemberScope implements JetScope { throw new UnsupportedOperationException("Should not be called"); } - @Nullable - @Override - public PropertyDescriptor getPropertyByFieldReference(@NotNull Name fieldName) { - throw new UnsupportedOperationException("Should not be called"); - } - private Collection computeAllDescriptors() { Collection result = new LinkedHashSet(0); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.java index d353953006f..933c644c2ce 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.java @@ -291,12 +291,6 @@ public class LazyImportScope implements JetScope { return Collections.emptyList(); } - @Nullable - @Override - public PropertyDescriptor getPropertyByFieldReference(@NotNull Name fieldName) { - return null; - } - @NotNull @Override public Collection getAllDescriptors() { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.java index a131f5632e0..90864a37158 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.java @@ -245,11 +245,6 @@ public abstract class AbstractLazyMemberScope getAllDescriptors() { diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WriteThroughScope.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WriteThroughScope.java index 2b3b11720bb..6a16e9064bf 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WriteThroughScope.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WriteThroughScope.java @@ -38,14 +38,6 @@ public class WriteThroughScope extends WritableScopeWithImports { this.writableWorker = scope; } - @Override - @Nullable - public PropertyDescriptor getPropertyByFieldReference(@NotNull Name fieldName) { - checkMayRead(); - - return writableWorker.getPropertyByFieldReference(fieldName); - } - @Override @NotNull public Collection getDeclarationsByLabel(LabelName labelName) { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/AbstractScopeAdapter.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/AbstractScopeAdapter.java index 2e4137490c6..a2c242b2e6c 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/AbstractScopeAdapter.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/AbstractScopeAdapter.java @@ -87,11 +87,6 @@ public abstract class AbstractScopeAdapter implements JetScope { return getWorkerScope().getDeclarationsByLabel(labelName); } - @Override - public PropertyDescriptor getPropertyByFieldReference(@NotNull Name fieldName) { - return getWorkerScope().getPropertyByFieldReference(fieldName); - } - @NotNull @Override public Collection getAllDescriptors() { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/ChainedScope.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/ChainedScope.java index 5a0b8322bf7..688a7012aaa 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/ChainedScope.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/ChainedScope.java @@ -148,17 +148,6 @@ public class ChainedScope implements JetScope { return Collections.emptyList(); } - @Override - public PropertyDescriptor getPropertyByFieldReference(@NotNull Name fieldName) { - for (JetScope jetScope : scopeChain) { - PropertyDescriptor propertyByFieldReference = jetScope.getPropertyByFieldReference(fieldName); - if (propertyByFieldReference != null) { - return propertyByFieldReference; - } - } - return null; - } - @NotNull @Override public Collection getAllDescriptors() { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/FilteringScope.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/FilteringScope.java index 7a1ddc843e3..0abfb11fcf5 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/FilteringScope.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/FilteringScope.java @@ -103,11 +103,6 @@ public class FilteringScope implements JetScope { return Collections2.filter(workerScope.getDeclarationsByLabel(labelName), predicate); } - @Override - public PropertyDescriptor getPropertyByFieldReference(@NotNull Name fieldName) { - return filterDescriptor(workerScope.getPropertyByFieldReference(fieldName)); - } - @NotNull @Override public Collection getOwnDeclaredDescriptors() { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScope.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScope.java index 30d89a46bb9..31e4d09af99 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScope.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScope.java @@ -69,13 +69,6 @@ public interface JetScope { @NotNull Collection getDeclarationsByLabel(@NotNull LabelName labelName); - /** - * @param fieldName includes the "$" - * @return the property declaring this field, if any - */ - @Nullable - PropertyDescriptor getPropertyByFieldReference(@NotNull Name fieldName); - /** * All visible descriptors from current scope. * diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeImpl.java index 44d81f4c888..7d8605af9b5 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeImpl.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeImpl.java @@ -71,11 +71,6 @@ public abstract class JetScopeImpl implements JetScope { return Collections.emptyList(); } - @Override - public PropertyDescriptor getPropertyByFieldReference(@NotNull Name fieldName) { - return null; - } - @NotNull @Override public Collection getAllDescriptors() { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/SubstitutingScope.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/SubstitutingScope.java index 470f6d41e50..9dee539339f 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/SubstitutingScope.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/SubstitutingScope.java @@ -136,11 +136,6 @@ public class SubstitutingScope implements JetScope { throw new UnsupportedOperationException(); // TODO } - @Override - public PropertyDescriptor getPropertyByFieldReference(@NotNull Name fieldName) { - throw new UnsupportedOperationException(); // TODO - } - @NotNull @Override public Collection getAllDescriptors() { diff --git a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java index 64a76a98a27..8953436d053 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java @@ -38,10 +38,6 @@ public class WritableScopeImpl extends WritableScopeWithImports { @NotNull private final DeclarationDescriptor ownerDeclarationDescriptor; - // FieldNames include "$" - @Nullable - private Map propertyDescriptorsByFieldNames; - @Nullable private SetMultimap functionGroups; @@ -483,28 +479,6 @@ public class WritableScopeImpl extends WritableScopeWithImports { return implicitReceiverHierarchy; } -// @SuppressWarnings({"NullableProblems"}) - @NotNull - private Map getPropertyDescriptorsByFieldNames() { - if (propertyDescriptorsByFieldNames == null) { - propertyDescriptorsByFieldNames = new HashMap(); - } - return propertyDescriptorsByFieldNames; - } - - @Override - public PropertyDescriptor getPropertyByFieldReference(@NotNull Name fieldName) { - checkMayRead(); - - if (!fieldName.asString().startsWith("$")) { - throw new IllegalStateException(); - } - - PropertyDescriptor descriptor = getPropertyDescriptorsByFieldNames().get(fieldName); - if (descriptor != null) return descriptor; - return super.getPropertyByFieldReference(fieldName); - } - public List getDeclaredVariables() { checkMayRead(); diff --git a/core/descriptors/src/org/jetbrains/jet/lang/types/ErrorUtils.java b/core/descriptors/src/org/jetbrains/jet/lang/types/ErrorUtils.java index c9904c0ba25..060a244cf10 100644 --- a/core/descriptors/src/org/jetbrains/jet/lang/types/ErrorUtils.java +++ b/core/descriptors/src/org/jetbrains/jet/lang/types/ErrorUtils.java @@ -139,11 +139,6 @@ public class ErrorUtils { return Collections.emptyList(); } - @Override - public PropertyDescriptor getPropertyByFieldReference(@NotNull Name fieldName) { - return null; // TODO : review - } - @NotNull @Override public Collection getAllDescriptors() { @@ -223,12 +218,6 @@ public class ErrorUtils { throw new IllegalStateException(); } - @Nullable - @Override - public PropertyDescriptor getPropertyByFieldReference(@NotNull Name fieldName) { - throw new IllegalStateException(); - } - @NotNull @Override public Collection getAllDescriptors() {