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

Remove TestOnly annotation from JetScope#printScopeStructure

Browse Source 
Because this method is located in core/ which will be present at runtime, and
this annotation is not needed at runtime
This commit is contained in:
Alexander Udalov
2014-08-14 16:14:05 +04:00
parent df2c8889d4
commit eab0342d39
10 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.java
-2
View File
@@ -22,7 +22,6 @@ import kotlin.Function0;
import kotlin.Function1;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.psi.JetCodeFragment;
import org.jetbrains.jet.lang.psi.JetFile;
@@ -341,7 +340,6 @@ public class LazyImportScope implements JetScope, LazyEntity {
return "LazyImportScope: " + debugName;
}
@TestOnly
@Override
public void printScopeStructure(@NotNull Printer p) {
p.println(getClass().getSimpleName(), ": ", debugName, " {");
compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java
-2
View File
@@ -19,7 +19,6 @@ package org.jetbrains.jet.lang.resolve.scopes;
import com.google.common.collect.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
@@ -427,7 +426,6 @@ public class WritableScopeImpl extends WritableScopeWithImports {
return declaredDescriptorsAccessibleBySimpleName.values();
}
@TestOnly
@Override
protected void printAdditionalScopeStructure(@NotNull Printer p) {
p.println("allDescriptorsDone = ", allDescriptorsDone);
compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeWithImports.java
-3
View File
@@ -20,7 +20,6 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.utils.Printer;
@@ -245,7 +244,6 @@ public abstract class WritableScopeWithImports extends AbstractScopeAdapter impl
return getClass().getSimpleName() + "@" + Integer.toHexString(System.identityHashCode(this)) + " " + debugName + " for " + getContainingDeclaration();
}
@TestOnly
@Override
public void printScopeStructure(@NotNull Printer p) {
p.println(getClass().getSimpleName(), ": ", debugName, " for ", getContainingDeclaration(), " {");
@@ -275,6 +273,5 @@ public abstract class WritableScopeWithImports extends AbstractScopeAdapter impl
p.println("}");
}
@TestOnly
protected abstract void printAdditionalScopeStructure(@NotNull Printer p);
}
compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WriteThroughScope.java
-2
View File
@@ -21,7 +21,6 @@ import com.google.common.collect.Multimap;
import com.google.common.collect.Sets;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.utils.Printer;
@@ -219,7 +218,6 @@ public class WriteThroughScope extends WritableScopeWithImports {
return allDescriptors;
}
@TestOnly
@Override
protected void printAdditionalScopeStructure(@NotNull Printer p) {
p.print("writableWorker = ");
core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/AbstractScopeAdapter.java
-2
View File
@@ -17,7 +17,6 @@
package org.jetbrains.jet.lang.resolve.scopes;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.TestOnly;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.utils.Printer;
@@ -89,7 +88,6 @@ public abstract class AbstractScopeAdapter implements JetScope {
return getWorkerScope().getOwnDeclaredDescriptors();
}
@TestOnly
@Override
public void printScopeStructure(@NotNull Printer p) {
p.println(getClass().getSimpleName(), " {");
core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/ChainedScope.java
-2
View File
@@ -17,7 +17,6 @@
package org.jetbrains.jet.lang.resolve.scopes;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.TestOnly;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.utils.Printer;
@@ -121,7 +120,6 @@ public class ChainedScope implements JetScope {
return debugName;
}
@TestOnly
@Override
public void printScopeStructure(@NotNull Printer p) {
p.println(getClass().getSimpleName(), ": ", debugName, " {");
core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/FilteringScope.java
-2
View File
@@ -20,7 +20,6 @@ import kotlin.Function1;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.utils.Printer;
@@ -100,7 +99,6 @@ public class FilteringScope implements JetScope {
return KotlinPackage.filter(workerScope.getOwnDeclaredDescriptors(), predicate);
}
@TestOnly
@Override
public void printScopeStructure(@NotNull Printer p) {
p.println(getClass().getSimpleName(), " {");
core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScope.java
+3 -2
View File
@@ -19,7 +19,6 @@ package org.jetbrains.jet.lang.resolve.scopes;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.ReadOnly;
import org.jetbrains.annotations.TestOnly;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.utils.Printer;
@@ -93,6 +92,8 @@ public interface JetScope {
@ReadOnly
Collection<DeclarationDescriptor> getOwnDeclaredDescriptors();
@TestOnly
/**
* Is supposed to be used in tests and debug only
*/
void printScopeStructure(@NotNull Printer p);
}
core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/JetScopeImpl.java
-2
View File
@@ -18,7 +18,6 @@ package org.jetbrains.jet.lang.resolve.scopes;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.utils.Printer;
@@ -81,7 +80,6 @@ public abstract class JetScopeImpl implements JetScope {
}
// This method should not be implemented here by default: every scope class has its unique structure pattern
@TestOnly
@Override
public abstract void printScopeStructure(@NotNull Printer p);
}
core/descriptors/src/org/jetbrains/jet/lang/resolve/scopes/SubstitutingScope.java
-2
View File
@@ -18,7 +18,6 @@ package org.jetbrains.jet.lang.resolve.scopes;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.annotations.TestOnly;
import org.jetbrains.jet.lang.descriptors.*;
import org.jetbrains.jet.lang.resolve.name.Name;
import org.jetbrains.jet.lang.types.TypeSubstitutor;
@@ -137,7 +136,6 @@ public class SubstitutingScope implements JetScope {
return substitute(workerScope.getOwnDeclaredDescriptors());
}
@TestOnly
@Override
public void printScopeStructure(@NotNull Printer p) {
p.println(getClass().getSimpleName(), " {");