From 43596f7450bc2bb0c691f3f303e436e56e027cf7 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <Alexander.Udalov@jetbrains.com>
Date: Tue, 17 Sep 2013 23:06:43 +0400
Subject: [PATCH] Move utilities from 'frontend' to 'util'

They're also used in 'serialization'
---
 .../lang/descriptors/impl/TypeParameterDescriptorImpl.java | 2 +-
 .../src/org/jetbrains/jet/lang/resolve/BodyResolver.java   | 2 +-
 .../org/jetbrains/jet/lang/resolve/DescriptorResolver.java | 4 ++--
 .../org/jetbrains/jet/lang/resolve/OverrideResolver.java   | 2 +-
 .../src/org/jetbrains/jet/lang/resolve/TypeResolver.java   | 2 +-
 .../resolve/calls/autocasts/DelegatingDataFlowInfo.java    | 2 +-
 .../resolve/lazy/descriptors/LazyClassMemberScope.java     | 2 +-
 .../jet/lang/resolve/scopes/LazyScopeAdapter.java          | 2 +-
 .../jet/lang/resolve/scopes/WritableScopeImpl.java         | 2 +-
 .../src/org/jetbrains/jet/lang/types/DeferredType.java     | 4 ++--
 .../org/jetbrains/jet/lang/types/SubstitutionUtils.java    | 2 +-
 .../types/expressions/ClosureExpressionsTypingVisitor.java | 2 +-
 .../expressions/ExpressionTypingVisitorDispatcher.java     | 2 +-
 .../RecursionIntolerantLazyValueWithDefault.java           | 4 +++-
 .../org/jetbrains/jet/util/slicedmap/SlicedMapImpl.java    | 2 +-
 .../src/org/jetbrains/jet/utils}/CommonSuppliers.java      | 2 +-
 .../jetbrains/jet/utils}/RecursionIntolerantLazyValue.java | 2 +-
 .../utils}/ReenteringLazyValueComputationException.java    | 5 ++++-
 .../org/jetbrains/jet/plugin/libraries/MemberMatching.java | 7 +++++--
 19 files changed, 30 insertions(+), 22 deletions(-)
 rename compiler/frontend/src/org/jetbrains/jet/util/{lazy => }/RecursionIntolerantLazyValueWithDefault.java (91%)
 rename {compiler/frontend/src/org/jetbrains/jet/util => core/util.runtime/src/org/jetbrains/jet/utils}/CommonSuppliers.java (98%)
 rename {compiler/frontend/src/org/jetbrains/jet/util/lazy => core/util.runtime/src/org/jetbrains/jet/utils}/RecursionIntolerantLazyValue.java (97%)
 rename {compiler/frontend/src/org/jetbrains/jet/util/lazy => core/util.runtime/src/org/jetbrains/jet/utils}/ReenteringLazyValueComputationException.java (90%)

diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/TypeParameterDescriptorImpl.java b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/TypeParameterDescriptorImpl.java
index dbf5112a487..913636aa72c 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/TypeParameterDescriptorImpl.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/descriptors/impl/TypeParameterDescriptorImpl.java
@@ -30,7 +30,7 @@ import org.jetbrains.jet.lang.types.*;
 import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
 import org.jetbrains.jet.renderer.DescriptorRenderer;
-import org.jetbrains.jet.util.lazy.RecursionIntolerantLazyValue;
+import org.jetbrains.jet.utils.RecursionIntolerantLazyValue;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java
index 6541148a2fa..ee393e2e298 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/BodyResolver.java
@@ -47,8 +47,8 @@ import org.jetbrains.jet.lang.types.expressions.LabelResolver;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
 import org.jetbrains.jet.lexer.JetTokens;
 import org.jetbrains.jet.util.Box;
-import org.jetbrains.jet.util.lazy.ReenteringLazyValueComputationException;
 import org.jetbrains.jet.util.slicedmap.WritableSlice;
+import org.jetbrains.jet.utils.ReenteringLazyValueComputationException;
 
 import javax.inject.Inject;
 import java.util.*;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java
index a3f70d84de1..56dbc099ecc 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/DescriptorResolver.java
@@ -42,8 +42,8 @@ import org.jetbrains.jet.lang.types.expressions.ExpressionTypingServices;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
 import org.jetbrains.jet.lexer.JetKeywordToken;
 import org.jetbrains.jet.lexer.JetTokens;
-import org.jetbrains.jet.util.lazy.RecursionIntolerantLazyValue;
-import org.jetbrains.jet.util.lazy.RecursionIntolerantLazyValueWithDefault;
+import org.jetbrains.jet.util.RecursionIntolerantLazyValueWithDefault;
+import org.jetbrains.jet.utils.RecursionIntolerantLazyValue;
 
 import javax.inject.Inject;
 import java.util.*;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java
index d1ddf94320f..baa02e7ab01 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/OverrideResolver.java
@@ -39,7 +39,7 @@ import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
 import org.jetbrains.jet.lexer.JetTokens;
-import org.jetbrains.jet.util.CommonSuppliers;
+import org.jetbrains.jet.utils.CommonSuppliers;
 
 import javax.inject.Inject;
 import java.util.*;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.java
index 35ec03ab50e..a484a96e04c 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/TypeResolver.java
@@ -25,7 +25,7 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScope;
 import org.jetbrains.jet.lang.resolve.scopes.LazyScopeAdapter;
 import org.jetbrains.jet.lang.types.*;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
-import org.jetbrains.jet.util.lazy.RecursionIntolerantLazyValue;
+import org.jetbrains.jet.utils.RecursionIntolerantLazyValue;
 
 import javax.inject.Inject;
 import java.util.ArrayList;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/autocasts/DelegatingDataFlowInfo.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/autocasts/DelegatingDataFlowInfo.java
index 7678a74c119..f86992ebc1e 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/autocasts/DelegatingDataFlowInfo.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/calls/autocasts/DelegatingDataFlowInfo.java
@@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lang.types.TypeUtils;
-import org.jetbrains.jet.util.CommonSuppliers;
+import org.jetbrains.jet.utils.CommonSuppliers;
 
 import java.util.*;
 
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassMemberScope.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassMemberScope.java
index 86a57bd1957..d7158884c88 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassMemberScope.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/lazy/descriptors/LazyClassMemberScope.java
@@ -35,7 +35,7 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScope;
 import org.jetbrains.jet.lang.types.DeferredType;
 import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
-import org.jetbrains.jet.util.lazy.RecursionIntolerantLazyValue;
+import org.jetbrains.jet.utils.RecursionIntolerantLazyValue;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/LazyScopeAdapter.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/LazyScopeAdapter.java
index 752c2937e48..c190558e4d3 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/LazyScopeAdapter.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/scopes/LazyScopeAdapter.java
@@ -17,7 +17,7 @@
 package org.jetbrains.jet.lang.resolve.scopes;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.util.lazy.RecursionIntolerantLazyValue;
+import org.jetbrains.jet.utils.RecursionIntolerantLazyValue;
 
 public class LazyScopeAdapter extends AbstractScopeAdapter {
 
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 8aeb050d97a..64a76a98a27 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
@@ -23,7 +23,7 @@ import org.jetbrains.jet.lang.descriptors.*;
 import org.jetbrains.jet.lang.resolve.name.LabelName;
 import org.jetbrains.jet.lang.resolve.name.Name;
 import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
-import org.jetbrains.jet.util.CommonSuppliers;
+import org.jetbrains.jet.utils.CommonSuppliers;
 
 import java.util.*;
 
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/DeferredType.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/DeferredType.java
index e293342711c..d7bbdc40654 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/types/DeferredType.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/DeferredType.java
@@ -21,8 +21,8 @@ import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
 import org.jetbrains.jet.lang.resolve.BindingTrace;
 import org.jetbrains.jet.lang.resolve.scopes.JetScope;
 import org.jetbrains.jet.util.Box;
-import org.jetbrains.jet.util.lazy.RecursionIntolerantLazyValue;
-import org.jetbrains.jet.util.lazy.ReenteringLazyValueComputationException;
+import org.jetbrains.jet.utils.RecursionIntolerantLazyValue;
+import org.jetbrains.jet.utils.ReenteringLazyValueComputationException;
 
 import java.util.List;
 
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/SubstitutionUtils.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/SubstitutionUtils.java
index 5e439f03885..16794ee8e2d 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/types/SubstitutionUtils.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/SubstitutionUtils.java
@@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
-import org.jetbrains.jet.util.CommonSuppliers;
+import org.jetbrains.jet.utils.CommonSuppliers;
 
 import java.util.HashMap;
 import java.util.Iterator;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ClosureExpressionsTypingVisitor.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ClosureExpressionsTypingVisitor.java
index 0d94435239a..21d91d38c35 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ClosureExpressionsTypingVisitor.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ClosureExpressionsTypingVisitor.java
@@ -33,7 +33,7 @@ import org.jetbrains.jet.lang.resolve.scopes.JetScope;
 import org.jetbrains.jet.lang.types.*;
 import org.jetbrains.jet.lang.types.checker.JetTypeChecker;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
-import org.jetbrains.jet.util.lazy.RecursionIntolerantLazyValueWithDefault;
+import org.jetbrains.jet.util.RecursionIntolerantLazyValueWithDefault;
 import org.jetbrains.jet.util.slicedmap.WritableSlice;
 
 import java.util.Collection;
diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorDispatcher.java b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorDispatcher.java
index ad20dad21a0..43ae649fb79 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorDispatcher.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/types/expressions/ExpressionTypingVisitorDispatcher.java
@@ -27,7 +27,7 @@ import org.jetbrains.jet.lang.resolve.scopes.WritableScope;
 import org.jetbrains.jet.lang.types.DeferredType;
 import org.jetbrains.jet.lang.types.ErrorUtils;
 import org.jetbrains.jet.lang.types.JetTypeInfo;
-import org.jetbrains.jet.util.lazy.ReenteringLazyValueComputationException;
+import org.jetbrains.jet.utils.ReenteringLazyValueComputationException;
 
 import static org.jetbrains.jet.lang.diagnostics.Errors.TYPECHECKER_HAS_RUN_INTO_RECURSIVE_PROBLEM;
 
diff --git a/compiler/frontend/src/org/jetbrains/jet/util/lazy/RecursionIntolerantLazyValueWithDefault.java b/compiler/frontend/src/org/jetbrains/jet/util/RecursionIntolerantLazyValueWithDefault.java
similarity index 91%
rename from compiler/frontend/src/org/jetbrains/jet/util/lazy/RecursionIntolerantLazyValueWithDefault.java
rename to compiler/frontend/src/org/jetbrains/jet/util/RecursionIntolerantLazyValueWithDefault.java
index f75a863d13d..ae1e03126a6 100644
--- a/compiler/frontend/src/org/jetbrains/jet/util/lazy/RecursionIntolerantLazyValueWithDefault.java
+++ b/compiler/frontend/src/org/jetbrains/jet/util/RecursionIntolerantLazyValueWithDefault.java
@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.util.lazy;
+package org.jetbrains.jet.util;
+
+import org.jetbrains.jet.utils.RecursionIntolerantLazyValue;
 
 public abstract class RecursionIntolerantLazyValueWithDefault<T> extends RecursionIntolerantLazyValue<T> {
     private final T defaultValue;
diff --git a/compiler/frontend/src/org/jetbrains/jet/util/slicedmap/SlicedMapImpl.java b/compiler/frontend/src/org/jetbrains/jet/util/slicedmap/SlicedMapImpl.java
index e832c1854ae..7a9a7db2b28 100644
--- a/compiler/frontend/src/org/jetbrains/jet/util/slicedmap/SlicedMapImpl.java
+++ b/compiler/frontend/src/org/jetbrains/jet/util/slicedmap/SlicedMapImpl.java
@@ -21,7 +21,7 @@ import com.google.common.collect.Maps;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.util.CommonSuppliers;
+import org.jetbrains.jet.utils.CommonSuppliers;
 
 import java.util.Collection;
 import java.util.HashMap;
diff --git a/compiler/frontend/src/org/jetbrains/jet/util/CommonSuppliers.java b/core/util.runtime/src/org/jetbrains/jet/utils/CommonSuppliers.java
similarity index 98%
rename from compiler/frontend/src/org/jetbrains/jet/util/CommonSuppliers.java
rename to core/util.runtime/src/org/jetbrains/jet/utils/CommonSuppliers.java
index 1ffc7e95bdd..8987f70743b 100644
--- a/compiler/frontend/src/org/jetbrains/jet/util/CommonSuppliers.java
+++ b/core/util.runtime/src/org/jetbrains/jet/utils/CommonSuppliers.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.util;
+package org.jetbrains.jet.utils;
 
 import com.google.common.base.Supplier;
 import com.google.common.collect.*;
diff --git a/compiler/frontend/src/org/jetbrains/jet/util/lazy/RecursionIntolerantLazyValue.java b/core/util.runtime/src/org/jetbrains/jet/utils/RecursionIntolerantLazyValue.java
similarity index 97%
rename from compiler/frontend/src/org/jetbrains/jet/util/lazy/RecursionIntolerantLazyValue.java
rename to core/util.runtime/src/org/jetbrains/jet/utils/RecursionIntolerantLazyValue.java
index d171b43ca1e..26a449ca7a8 100644
--- a/compiler/frontend/src/org/jetbrains/jet/util/lazy/RecursionIntolerantLazyValue.java
+++ b/core/util.runtime/src/org/jetbrains/jet/utils/RecursionIntolerantLazyValue.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.util.lazy;
+package org.jetbrains.jet.utils;
 
 public abstract class RecursionIntolerantLazyValue<T> {
 
diff --git a/compiler/frontend/src/org/jetbrains/jet/util/lazy/ReenteringLazyValueComputationException.java b/core/util.runtime/src/org/jetbrains/jet/utils/ReenteringLazyValueComputationException.java
similarity index 90%
rename from compiler/frontend/src/org/jetbrains/jet/util/lazy/ReenteringLazyValueComputationException.java
rename to core/util.runtime/src/org/jetbrains/jet/utils/ReenteringLazyValueComputationException.java
index 524706eee65..aff0dda2fa8 100644
--- a/compiler/frontend/src/org/jetbrains/jet/util/lazy/ReenteringLazyValueComputationException.java
+++ b/core/util.runtime/src/org/jetbrains/jet/utils/ReenteringLazyValueComputationException.java
@@ -14,12 +14,15 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.util.lazy;
+package org.jetbrains.jet.utils;
+
+import org.jetbrains.annotations.NotNull;
 
 public class ReenteringLazyValueComputationException extends RuntimeException {
     public ReenteringLazyValueComputationException() {
     }
 
+    @NotNull
     @Override
     public synchronized Throwable fillInStackTrace() {
         return this;
diff --git a/idea/src/org/jetbrains/jet/plugin/libraries/MemberMatching.java b/idea/src/org/jetbrains/jet/plugin/libraries/MemberMatching.java
index d04da005cba..22b92fa7b66 100644
--- a/idea/src/org/jetbrains/jet/plugin/libraries/MemberMatching.java
+++ b/idea/src/org/jetbrains/jet/plugin/libraries/MemberMatching.java
@@ -24,14 +24,17 @@ import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.jet.lang.descriptors.*;
+import org.jetbrains.jet.lang.descriptors.CallableDescriptor;
+import org.jetbrains.jet.lang.descriptors.ReceiverParameterDescriptor;
+import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor;
+import org.jetbrains.jet.lang.descriptors.ValueParameterDescriptor;
 import org.jetbrains.jet.lang.psi.*;
 import org.jetbrains.jet.lang.resolve.name.Name;
 import org.jetbrains.jet.lang.types.JetType;
 import org.jetbrains.jet.lang.types.lang.KotlinBuiltIns;
 import org.jetbrains.jet.lexer.JetTokens;
 import org.jetbrains.jet.renderer.DescriptorRenderer;
-import org.jetbrains.jet.util.CommonSuppliers;
+import org.jetbrains.jet.utils.CommonSuppliers;
 
 import java.util.Collection;
 import java.util.Collections;