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

Unused method getPropertyByFieldReference() removed from JetScope and its implementations

Browse Source
This commit is contained in:
Andrey Breslav
2013-09-23 23:18:11 -07:00
parent 1f340e3a7a
commit 2954af1b12
12 changed files with 0 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/serialization/src/org/jetbrains/jet/descriptors/serialization/descriptors/DeserializedMemberScope.java
-6
View File
@@ -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<DeclarationDescriptor> computeAllDescriptors() {
Collection<DeclarationDescriptor> result = new LinkedHashSet<DeclarationDescriptor>(0);
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.java
-6
View File
@@ -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<DeclarationDescriptor> getAllDescriptors() {
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/AbstractLazyMemberScope.java
-5
View File
@@ -245,11 +245,6 @@ public abstract class AbstractLazyMemberScope<D extends DeclarationDescriptor, D
return Collections.emptySet();
}
@Override
public PropertyDescriptor getPropertyByFieldReference(@NotNull Name fieldName) {
throw new UnsupportedOperationException(); // TODO
}
@NotNull
@Override
public Collection<DeclarationDescriptor> getAllDescriptors() {
compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WriteThroughScope.java
-8
View File
@@ -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<DeclarationDescriptor> getDeclarationsByLabel(LabelName labelName) {
core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/AbstractScopeAdapter.java
-5
View File
@@ -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<DeclarationDescriptor> getAllDescriptors() {
core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/ChainedScope.java
-11
View File
@@ -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<DeclarationDescriptor> getAllDescriptors() {
core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/FilteringScope.java
-5
View File
@@ -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<DeclarationDescriptor> getOwnDeclaredDescriptors() {
core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScope.java
-7
View File
@@ -69,13 +69,6 @@ public interface JetScope {
@NotNull
Collection<DeclarationDescriptor> 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.
*
core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeImpl.java
-5
View File
@@ -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<DeclarationDescriptor> getAllDescriptors() {
core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/SubstitutingScope.java
-5
View File
@@ -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<DeclarationDescriptor> getAllDescriptors() {
core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java
-26
View File
@@ -38,10 +38,6 @@ public class WritableScopeImpl extends WritableScopeWithImports {
@NotNull
private final DeclarationDescriptor ownerDeclarationDescriptor;
// FieldNames include "$"
@Nullable
private Map<Name, PropertyDescriptor> propertyDescriptorsByFieldNames;
@Nullable
private SetMultimap<Name, FunctionDescriptor> functionGroups;
@@ -483,28 +479,6 @@ public class WritableScopeImpl extends WritableScopeWithImports {
return implicitReceiverHierarchy;
}
// @SuppressWarnings({"NullableProblems"})
@NotNull
private Map<Name, PropertyDescriptor> getPropertyDescriptorsByFieldNames() {
if (propertyDescriptorsByFieldNames == null) {
propertyDescriptorsByFieldNames = new HashMap<Name, PropertyDescriptor>();
}
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<VariableDescriptor> getDeclaredVariables() {
checkMayRead();
core/descriptors/src/org/jetbrains/jet/lang/types/ErrorUtils.java
-11
View File
@@ -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<DeclarationDescriptor> 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<DeclarationDescriptor> getAllDescriptors() {