Compilation errors fixed

compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/InstructionWithNext.kt

@@ -17,7 +17,7 @@
 package org.jetbrains.jet.lang.cfg.pseudocode.instructions
 
 import org.jetbrains.jet.lang.psi.JetElement
-import com.intellij.util.containers.ContainerUtil
+import org.jetbrains.jet.utils.emptyOrSingletonList
 
 public abstract class InstructionWithNext(
         element: JetElement,
@@ -29,5 +29,5 @@ public abstract class InstructionWithNext(
         }
 
     override val nextInstructions: Collection<Instruction>
-        get() = ContainerUtil.createMaybeSingletonList(next)
+        get() = emptyOrSingletonList(next)
 }

compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/AbstractJumpInstruction.kt

@@ -18,11 +18,11 @@ package org.jetbrains.jet.lang.cfg.pseudocode.instructions.jumps
 
 import org.jetbrains.jet.lang.psi.JetElement
 import org.jetbrains.jet.lang.cfg.Label
-import java.util.Collections
 import org.jetbrains.jet.lang.cfg.pseudocode.instructions.LexicalScope
 import org.jetbrains.jet.lang.cfg.pseudocode.instructions.JetElementInstructionImpl
 import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionImpl
 import org.jetbrains.jet.lang.cfg.pseudocode.instructions.Instruction
+import org.jetbrains.jet.utils.emptyOrSingletonList
 
 public abstract class AbstractJumpInstruction(
         element: JetElement,
@@ -45,5 +45,5 @@ public abstract class AbstractJumpInstruction(
     }
 
     override val nextInstructions: Collection<Instruction>
-        get() = Collections.singleton(resolvedTarget)
+        get() = emptyOrSingletonList(resolvedTarget)
 }

compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/ConditionalJumpInstruction.kt

@@ -20,11 +20,11 @@ import org.jetbrains.jet.lang.cfg.pseudocode.PseudoValue
 import org.jetbrains.jet.lang.psi.JetElement
 import org.jetbrains.jet.lang.cfg.Label
 import java.util.Arrays
-import com.intellij.util.containers.ContainerUtil
 import org.jetbrains.jet.lang.cfg.pseudocode.instructions.LexicalScope
 import org.jetbrains.jet.lang.cfg.pseudocode.instructions.Instruction
 import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitorWithResult
 import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitor
+import org.jetbrains.jet.utils.emptyOrSingletonList
 
 public class ConditionalJumpInstruction(
         element: JetElement,
@@ -51,7 +51,7 @@ public class ConditionalJumpInstruction(
         get() = Arrays.asList(nextOnFalse, nextOnTrue)
 
     override val inputValues: List<PseudoValue>
-        get() = ContainerUtil.createMaybeSingletonList(conditionValue)
+        get() = emptyOrSingletonList(conditionValue)
 
     override fun accept(visitor: InstructionVisitor) {
         visitor.visitConditionalJump(this)

compiler/frontend/src/org/jetbrains/jet/lang/cfg/pseudocode/instructions/jumps/NondeterministicJumpInstruction.kt

@@ -21,13 +21,13 @@ import org.jetbrains.jet.lang.psi.JetElement
 import org.jetbrains.jet.lang.cfg.Label
 import com.google.common.collect.Maps
 import com.google.common.collect.Lists
-import com.intellij.util.containers.ContainerUtil
 import org.jetbrains.jet.lang.cfg.pseudocode.instructions.LexicalScope
 import org.jetbrains.jet.lang.cfg.pseudocode.instructions.JetElementInstructionImpl
 import org.jetbrains.jet.lang.cfg.pseudocode.instructions.Instruction
 import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitor
 import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionVisitorWithResult
 import org.jetbrains.jet.lang.cfg.pseudocode.instructions.InstructionImpl
+import org.jetbrains.jet.utils.emptyOrSingletonList
 
 public class NondeterministicJumpInstruction(
         element: JetElement,
@@ -60,7 +60,7 @@ public class NondeterministicJumpInstruction(
         }
 
     override val inputValues: List<PseudoValue>
-        get() = ContainerUtil.createMaybeSingletonList(inputValue)
+        get() = emptyOrSingletonList(inputValue)
 
     override fun accept(visitor: InstructionVisitor) {
         visitor.visitNondeterministicJump(this)

idea/idea-analysis/src/org/jetbrains/jet/plugin/references/referenceUtil.kt

@@ -24,16 +24,15 @@ import org.jetbrains.jet.lang.psi.JetPropertyAccessor
 import org.jetbrains.jet.lang.psi.psiUtil.getParentByType
 import org.jetbrains.jet.lang.psi.JetProperty
 import java.util.HashSet
-import com.intellij.util.containers.ContainerUtil
 import org.jetbrains.jet.lang.psi.JetExpression
 import org.jetbrains.jet.plugin.intentions.OperatorToFunctionIntention
 import org.jetbrains.jet.lang.psi.JetQualifiedExpression
 import org.jetbrains.jet.lang.psi.JetCallExpression
 import com.intellij.psi.util.PsiTreeUtil
 import org.jetbrains.jet.lang.psi.JetObjectDeclaration
-import org.jetbrains.jet.lang.psi.JetClassObject
 import org.jetbrains.jet.lang.psi.JetClass
 import com.intellij.psi.PsiPolyVariantReference
+import org.jetbrains.jet.utils.emptyOrSingletonList
 
 // Navigation element of the resolved reference
 // For property accessor return enclosing property
@@ -51,7 +50,7 @@ public val PsiReference.unwrappedTargets: Set<PsiElement>
 
         return when (this) {
             is PsiPolyVariantReference -> multiResolve(false).map { it.getElement()?.adjust() }.filterNotNullTo(HashSet<PsiElement>())
-            else -> ContainerUtil.createMaybeSingletonSet(resolve()?.adjust())
+            else -> emptyOrSingletonList(resolve()?.adjust()).toSet()
         }
     }
 

idea/tests/org/jetbrains/jet/plugin/refactoring/introduce/introduceVariable/AbstractJetExtractionTest.kt

@@ -33,19 +33,17 @@ import com.intellij.psi.PsiWhiteSpace
 import org.jetbrains.jet.lang.psi.JetPackageDirective
 import org.jetbrains.jet.InTextDirectivesUtils
 import org.jetbrains.jet.renderer.DescriptorRenderer
-import java.util.ArrayList
-import com.intellij.util.containers.ContainerUtil
 import kotlin.test.assertEquals
 import org.jetbrains.jet.plugin.JetLightCodeInsightFixtureTestCase
 import com.intellij.testFramework.fixtures.LightCodeInsightFixtureTestCase
 import org.jetbrains.jet.plugin.refactoring.extractFunction.ExtractKotlinFunctionHandlerHelper
 import org.jetbrains.jet.plugin.refactoring.extractFunction.ExtractionGeneratorOptions
 import org.jetbrains.jet.plugin.refactoring.extractFunction.ExtractableCodeDescriptor
-import com.intellij.testFramework.LightPlatformTestCase
 import org.jetbrains.jet.testing.ConfigLibraryUtil
 import org.jetbrains.jet.plugin.PluginTestCaseBase
 import org.jetbrains.jet.plugin.refactoring.extractFunction.ExtractionData
 import org.jetbrains.jet.plugin.refactoring.extractFunction.ExtractionOptions
+import org.jetbrains.jet.utils.emptyOrSingletonList
 
 public abstract class AbstractJetExtractionTest() : JetLightCodeInsightFixtureTestCase() {
     override fun getProjectDescriptor() = LightCodeInsightFixtureTestCase.JAVA_LATEST
@@ -111,7 +109,7 @@ public abstract class AbstractJetExtractionTest() : JetLightCodeInsightFixtureTe
                             }
 
                             override fun adjustDescriptor(descriptor: ExtractableCodeDescriptor): ExtractableCodeDescriptor {
-                                val allParameters = ContainerUtil.createMaybeSingletonList(descriptor.receiverParameter) + descriptor.parameters
+                                val allParameters = emptyOrSingletonList(descriptor.receiverParameter) + descriptor.parameters
                                 val actualDescriptors = allParameters.map { renderer.render(it.originalDescriptor) }.joinToString()
                                 val actualTypes = allParameters.map {
                                     it.parameterTypeCandidates.map { renderer.renderType(it) }.joinToString(", ", "[", "]")