From eab0342d39a9f1f5d07708b7e0afaaee74d77050 Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Thu, 14 Aug 2014 16:14:05 +0400 Subject: [PATCH] Remove TestOnly annotation from JetScope#printScopeStructure Because this method is located in core/ which will be present at runtime, and this annotation is not needed at runtime --- .../org/jetbrains/jet/lang/resolve/lazy/LazyImportScope.java | 2 -- .../jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java | 2 -- .../jet/lang/resolve/scopes/WritableScopeWithImports.java | 3 --- .../jetbrains/jet/lang/resolve/scopes/WriteThroughScope.java | 2 -- .../jet/lang/resolve/scopes/AbstractScopeAdapter.java | 2 -- .../org/jetbrains/jet/lang/resolve/scopes/ChainedScope.java | 2 -- .../jetbrains/jet/lang/resolve/scopes/FilteringScope.java | 2 -- .../src/org/jetbrains/jet/lang/resolve/scopes/JetScope.java | 5 +++-- .../org/jetbrains/jet/lang/resolve/scopes/JetScopeImpl.java | 2 -- .../jetbrains/jet/lang/resolve/scopes/SubstitutingScope.java | 2 -- 10 files changed, 3 insertions(+), 21 deletions(-) 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 821590bfdca..04eeaa924b4 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 @@ -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, " {"); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java index 816fb52f8f3..d95f411c886 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeImpl.java @@ -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); diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeWithImports.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeWithImports.java index 2641d97b8e3..822b5d93917 100644 --- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeWithImports.java +++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/WritableScopeWithImports.java @@ -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); } 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 2676f611895..2eba63a1768 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 @@ -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 = "); 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 a5554111e38..6727ed7f1f4 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 @@ -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(), " {"); 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 bc4ce9c0248..e3578ba114b 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 @@ -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, " {"); 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 a7fa99430e4..0581c10f79f 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 @@ -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(), " {"); 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 3a36583d432..cadc3451cf1 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 @@ -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 getOwnDeclaredDescriptors(); - @TestOnly + /** + * Is supposed to be used in tests and debug only + */ void printScopeStructure(@NotNull Printer p); } 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 db74e479e92..fe1d05c647a 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 @@ -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); } 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 eb1cfb393b6..e09b2c66fe2 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 @@ -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(), " {");