Minor. Move helpers for javaslang to a separate package

compiler/frontend/src/org/jetbrains/kotlin/cfg/ControlFlowInfo.kt

@@ -16,11 +16,11 @@
 
 package org.jetbrains.kotlin.cfg
 
-import javaslang.Tuple2
 import org.jetbrains.kotlin.descriptors.VariableDescriptor
-
+import org.jetbrains.kotlin.util.javaslang.ImmutableHashMap
-typealias ImmutableMap<K, V> = javaslang.collection.Map<K, V>
+import org.jetbrains.kotlin.util.javaslang.ImmutableMap
-typealias ImmutableHashMap<K, V> = javaslang.collection.HashMap<K, V>
+import org.jetbrains.kotlin.util.javaslang.component1
+import org.jetbrains.kotlin.util.javaslang.component2
 
 abstract class ControlFlowInfo<S : ControlFlowInfo<S, D>, D : Any>
 internal constructor(
@@ -53,9 +53,6 @@ internal constructor(
     override fun toString() = map.toString()
 }
 
-operator fun <T> Tuple2<T, *>.component1(): T = _1()
-operator fun <T> Tuple2<*, T>.component2(): T = _2()
-
 interface ReadOnlyControlFlowInfo<D : Any> {
     fun getOrNull(variableDescriptor: VariableDescriptor): D?
     // Only used in tests

compiler/frontend/src/org/jetbrains/kotlin/cfg/PseudocodeVariablesData.kt

@@ -32,6 +32,10 @@ import org.jetbrains.kotlin.descriptors.VariableDescriptor
 import org.jetbrains.kotlin.psi.*
 import org.jetbrains.kotlin.resolve.BindingContext
 import org.jetbrains.kotlin.resolve.BindingContextUtils.variableDescriptorForDeclaration
+import org.jetbrains.kotlin.util.javaslang.ImmutableHashMap
+import org.jetbrains.kotlin.util.javaslang.ImmutableMap
+import org.jetbrains.kotlin.util.javaslang.component1
+import org.jetbrains.kotlin.util.javaslang.component2
 import org.jetbrains.kotlin.utils.addToStdlib.safeAs
 
 private typealias ImmutableSet<T> = javaslang.collection.Set<T>

compiler/frontend/src/org/jetbrains/kotlin/util/javaslang/javaslangAdapters.kt

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2010-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.util.javaslang
+
+import javaslang.Tuple2
+import javaslang.control.Option
+
+typealias ImmutableMap<K, V> = javaslang.collection.Map<K, V>
+typealias ImmutableHashMap<K, V> = javaslang.collection.HashMap<K, V>
+typealias ImmutableSet<E> = javaslang.collection.Set<E>
+typealias ImmutableHashSet<E> = javaslang.collection.HashSet<E>
+typealias ImmutableLinkedHashSet<E> = javaslang.collection.LinkedHashSet<E>
+
+operator fun <T> Tuple2<T, *>.component1(): T = _1()
+operator fun <T> Tuple2<*, T>.component2(): T = _2()
+
+fun <T> Option<T>.getOrNull(): T? = getOrElse(null as T?)