Move files to the correct packages

2018-03-13 16:28:37 +03:00
parent f90b33424a
commit aa34d84487
93 changed files with 255 additions and 222 deletions
@@ -48,6 +48,7 @@ dependencies {
    compileOnly(intellijPluginDep("copyright"))
    compileOnly(intellijPluginDep("properties"))
    compileOnly(intellijPluginDep("java-i18n"))
+    compileOnly(intellijPluginDep("stream-debugger"))

    testCompile(project(":kotlin-test:kotlin-test-junit"))
    testCompile(projectTests(":compiler:tests-common"))
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.lib
+package org.jetbrains.kotlin.idea.debugger.sequence.lib

 /**
 * @author Vitaliy.Bibaev
@@ -1,8 +1,7 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.lib.collections
+package org.jetbrains.kotlin.idea.debugger.sequence.lib.collections

-import com.intellij.debugger.streams.kotlin.trace.impl.handler.collections.*
-import com.intellij.debugger.streams.kotlin.trace.impl.interpret.FilterTraceInterpreter
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.interpret.FilterTraceInterpreter
 import com.intellij.debugger.streams.lib.IntermediateOperation
 import com.intellij.debugger.streams.lib.TerminalOperation
 import com.intellij.debugger.streams.lib.impl.LibrarySupportBase
@@ -14,6 +13,9 @@ import com.intellij.debugger.streams.trace.TerminatorCallHandler
 import com.intellij.debugger.streams.trace.dsl.Dsl
 import com.intellij.debugger.streams.wrapper.IntermediateStreamCall
 import com.intellij.debugger.streams.wrapper.TerminatorStreamCall
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.handler.collections.BothSemanticHandlerWrapper
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.handler.collections.BothSemanticsHandler
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.handler.collections.FilterCallHandler

 /**
 * @author Vitaliy.Bibaev
@@ -30,7 +32,8 @@ class KotlinCollectionLibrarySupport : LibrarySupportBase() {
  }

  private abstract class CollectionOperation(override val name: String,
-                                             handler: BothSemanticsHandler)
+                                             handler: BothSemanticsHandler
+  )
    : IntermediateOperation, TerminalOperation {

    private val wrapper = BothSemanticHandlerWrapper(handler)
@@ -1,11 +1,11 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.lib.collections
+package org.jetbrains.kotlin.idea.debugger.sequence.lib.collections

-import com.intellij.debugger.streams.kotlin.lib.LibraryUtil
-import com.intellij.debugger.streams.kotlin.psi.collections.KotlinCollectionChainBuilder
-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinCollectionsPeekCallFactory
-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinStatementFactory
-import com.intellij.debugger.streams.kotlin.trace.impl.KotlinTraceExpressionBuilder
+import org.jetbrains.kotlin.idea.debugger.sequence.lib.LibraryUtil
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.collections.KotlinCollectionChainBuilder
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinCollectionsPeekCallFactory
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinStatementFactory
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.KotlinTraceExpressionBuilder
 import com.intellij.debugger.streams.lib.LibrarySupport
 import com.intellij.debugger.streams.lib.LibrarySupportProvider
 import com.intellij.debugger.streams.trace.TraceExpressionBuilder
@@ -1,14 +1,14 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.lib.java
+package org.jetbrains.kotlin.idea.debugger.sequence.lib.java

-import com.intellij.debugger.streams.kotlin.lib.LibraryUtil
-import com.intellij.debugger.streams.kotlin.psi.impl.KotlinChainTransformerImpl
-import com.intellij.debugger.streams.kotlin.psi.impl.PackageBasedCallChecker
-import com.intellij.debugger.streams.kotlin.psi.impl.TerminatedChainBuilder
-import com.intellij.debugger.streams.kotlin.psi.java.JavaStreamChainTypeExtractor
-import com.intellij.debugger.streams.kotlin.trace.dsl.JavaPeekCallFactory
-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinStatementFactory
-import com.intellij.debugger.streams.kotlin.trace.impl.KotlinTraceExpressionBuilder
+import org.jetbrains.kotlin.idea.debugger.sequence.lib.LibraryUtil
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.impl.KotlinChainTransformerImpl
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.impl.PackageBasedCallChecker
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.impl.TerminatedChainBuilder
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.java.JavaStreamChainTypeExtractor
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.JavaPeekCallFactory
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinStatementFactory
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.KotlinTraceExpressionBuilder
 import com.intellij.debugger.streams.lib.LibrarySupport
 import com.intellij.debugger.streams.lib.LibrarySupportProvider
 import com.intellij.debugger.streams.lib.impl.StandardLibrarySupport
@@ -24,7 +24,8 @@ class JavaStandardLibrarySupportProvider : LibrarySupportProvider {
  private companion object {
    val builder = TerminatedChainBuilder(
        KotlinChainTransformerImpl(JavaStreamChainTypeExtractor()),
-        PackageBasedCallChecker("java.util.stream"))
+        PackageBasedCallChecker("java.util.stream")
+    )
    val support = StandardLibrarySupport()
    val dsl = DslImpl(KotlinStatementFactory(JavaPeekCallFactory()))
  }
@@ -1,14 +1,14 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.lib.java
+package org.jetbrains.kotlin.idea.debugger.sequence.lib.java

-import com.intellij.debugger.streams.kotlin.lib.LibraryUtil
-import com.intellij.debugger.streams.kotlin.psi.impl.KotlinChainTransformerImpl
-import com.intellij.debugger.streams.kotlin.psi.impl.PackageBasedCallChecker
-import com.intellij.debugger.streams.kotlin.psi.impl.TerminatedChainBuilder
-import com.intellij.debugger.streams.kotlin.psi.java.JavaStreamChainTypeExtractor
-import com.intellij.debugger.streams.kotlin.trace.dsl.JavaPeekCallFactory
-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinStatementFactory
-import com.intellij.debugger.streams.kotlin.trace.impl.KotlinTraceExpressionBuilder
+import org.jetbrains.kotlin.idea.debugger.sequence.lib.LibraryUtil
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.impl.KotlinChainTransformerImpl
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.impl.PackageBasedCallChecker
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.impl.TerminatedChainBuilder
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.java.JavaStreamChainTypeExtractor
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.JavaPeekCallFactory
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinStatementFactory
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.KotlinTraceExpressionBuilder
 import com.intellij.debugger.streams.lib.LibrarySupport
 import com.intellij.debugger.streams.lib.LibrarySupportProvider
 import com.intellij.debugger.streams.lib.impl.StreamExLibrarySupport
@@ -22,8 +22,10 @@ import com.intellij.openapi.project.Project
 */
 class StreamExLibrarySupportProvider : LibrarySupportProvider {
  private companion object {
-    val streamChainBuilder = TerminatedChainBuilder(KotlinChainTransformerImpl(JavaStreamChainTypeExtractor()),
-        PackageBasedCallChecker("one.util.streamex"))
+    val streamChainBuilder = TerminatedChainBuilder(
+      KotlinChainTransformerImpl(JavaStreamChainTypeExtractor()),
+      PackageBasedCallChecker("one.util.streamex")
+    )
    val support = StreamExLibrarySupport()
    val dsl = DslImpl(KotlinStatementFactory(JavaPeekCallFactory()))
    val expressionBuilder = KotlinTraceExpressionBuilder(dsl, support.createHandlerFactory(dsl))
@@ -1,14 +1,14 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.lib.sequence
+package org.jetbrains.kotlin.idea.debugger.sequence.lib.sequence

-import com.intellij.debugger.streams.kotlin.lib.LibraryUtil
-import com.intellij.debugger.streams.kotlin.psi.impl.KotlinChainTransformerImpl
-import com.intellij.debugger.streams.kotlin.psi.impl.TerminatedChainBuilder
-import com.intellij.debugger.streams.kotlin.psi.sequence.SequenceCallChecker
-import com.intellij.debugger.streams.kotlin.psi.sequence.SequenceTypeExtractor
-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinCollectionsPeekCallFactory
-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinStatementFactory
-import com.intellij.debugger.streams.kotlin.trace.impl.KotlinTraceExpressionBuilder
+import org.jetbrains.kotlin.idea.debugger.sequence.lib.LibraryUtil
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.impl.KotlinChainTransformerImpl
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.impl.TerminatedChainBuilder
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.sequence.SequenceCallChecker
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.sequence.SequenceTypeExtractor
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinCollectionsPeekCallFactory
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinStatementFactory
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.KotlinTraceExpressionBuilder
 import com.intellij.debugger.streams.lib.LibrarySupport
 import com.intellij.debugger.streams.lib.LibrarySupportProvider
 import com.intellij.debugger.streams.trace.TraceExpressionBuilder
@@ -24,8 +24,9 @@ class KotlinSequenceSupportProvider : LibrarySupportProvider {

  private companion object {
    val builder: StreamChainBuilder = TerminatedChainBuilder(
-        KotlinChainTransformerImpl(SequenceTypeExtractor()),
-        SequenceCallChecker())
+      KotlinChainTransformerImpl(SequenceTypeExtractor()),
+      SequenceCallChecker()
+    )
    val support = KotlinSequencesSupport()
    val dsl = DslImpl(KotlinStatementFactory(KotlinCollectionsPeekCallFactory()))
    val expressionBuilder = KotlinTraceExpressionBuilder(dsl, support.createHandlerFactory(dsl))
@@ -1,11 +1,11 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.lib.sequence
+package org.jetbrains.kotlin.idea.debugger.sequence.lib.sequence

-import com.intellij.debugger.streams.kotlin.resolve.ChunkedResolver
-import com.intellij.debugger.streams.kotlin.resolve.FilteredMapResolver
-import com.intellij.debugger.streams.kotlin.resolve.WindowedResolver
-import com.intellij.debugger.streams.kotlin.trace.impl.handler.sequence.FilterIsInstanceHandler
-import com.intellij.debugger.streams.kotlin.trace.impl.handler.sequence.KotlinDistinctByHandler
+import org.jetbrains.kotlin.idea.debugger.sequence.resolve.ChunkedResolver
+import org.jetbrains.kotlin.idea.debugger.sequence.resolve.FilteredMapResolver
+import org.jetbrains.kotlin.idea.debugger.sequence.resolve.WindowedResolver
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.handler.sequence.FilterIsInstanceHandler
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.handler.sequence.KotlinDistinctByHandler
 import com.intellij.debugger.streams.lib.IntermediateOperation
 import com.intellij.debugger.streams.lib.impl.*
 import com.intellij.debugger.streams.resolve.AppendResolver
@@ -57,5 +57,6 @@ class KotlinSequencesSupport : LibrarySupportBase() {

  private class FilterIsInstanceOperationHandler()
    : IntermediateOperationBase("filterIsInstance", ::FilterIsInstanceHandler,
-      SimplePeekCallTraceInterpreter(), FilteredMapResolver())
+      SimplePeekCallTraceInterpreter(), FilteredMapResolver()
+  )
 }
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi
+package org.jetbrains.kotlin.idea.debugger.sequence.psi

 import com.intellij.debugger.streams.trace.impl.handler.type.GenericType
 import org.jetbrains.kotlin.psi.KtCallExpression
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi
+package org.jetbrains.kotlin.idea.debugger.sequence.psi

 import org.jetbrains.kotlin.idea.caches.resolve.analyze
 import org.jetbrains.kotlin.idea.util.approximateFlexibleTypes
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi
+package org.jetbrains.kotlin.idea.debugger.sequence.psi

 import org.jetbrains.kotlin.psi.KtCallExpression

@@ -1,8 +1,8 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi.collections
+package org.jetbrains.kotlin.idea.debugger.sequence.psi.collections

-import com.intellij.debugger.streams.kotlin.psi.impl.KotlinChainTransformerImpl
-import com.intellij.debugger.streams.kotlin.psi.resolveType
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.impl.KotlinChainTransformerImpl
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.resolveType
 import com.intellij.debugger.streams.psi.ChainTransformer
 import com.intellij.debugger.streams.wrapper.QualifierExpression
 import com.intellij.debugger.streams.wrapper.StreamChain
@@ -1,10 +1,10 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi.collections
+package org.jetbrains.kotlin.idea.debugger.sequence.psi.collections

-import com.intellij.debugger.streams.kotlin.psi.KotlinPsiUtil
-import com.intellij.debugger.streams.kotlin.psi.impl.KotlinChainBuilderBase
-import com.intellij.debugger.streams.kotlin.psi.previousCall
-import com.intellij.debugger.streams.kotlin.psi.receiverType
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.KotlinPsiUtil
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.impl.KotlinChainBuilderBase
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.previousCall
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.receiverType
 import org.jetbrains.kotlin.psi.KtCallExpression
 import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.types.typeUtil.supertypes
@@ -1,11 +1,11 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi.collections
+package org.jetbrains.kotlin.idea.debugger.sequence.psi.collections

-import com.intellij.debugger.streams.kotlin.psi.CallTypeExtractor
-import com.intellij.debugger.streams.kotlin.psi.KotlinPsiUtil
-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinTypes
-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinTypes.ANY
-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinTypes.NULLABLE_ANY
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.CallTypeExtractor
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.KotlinPsiUtil
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinTypes
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinTypes.ANY
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinTypes.NULLABLE_ANY
 import com.intellij.debugger.streams.trace.impl.handler.type.GenericType
 import com.intellij.openapi.diagnostic.Logger
 import org.jetbrains.kotlin.types.KotlinType
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi.impl
+package org.jetbrains.kotlin.idea.debugger.sequence.psi.impl

 import com.intellij.debugger.streams.psi.ChainTransformer
 import com.intellij.debugger.streams.psi.PsiUtil
@@ -1,10 +1,10 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi.impl
+package org.jetbrains.kotlin.idea.debugger.sequence.psi.impl

-import com.intellij.debugger.streams.kotlin.psi.CallTypeExtractor
-import com.intellij.debugger.streams.kotlin.psi.KotlinPsiUtil
-import com.intellij.debugger.streams.kotlin.psi.callName
-import com.intellij.debugger.streams.kotlin.psi.resolveType
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.CallTypeExtractor
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.KotlinPsiUtil
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.callName
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.resolveType
 import com.intellij.debugger.streams.psi.ChainTransformer
 import com.intellij.debugger.streams.trace.impl.handler.type.GenericType
 import com.intellij.debugger.streams.wrapper.CallArgument
@@ -1,10 +1,10 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi.impl
+package org.jetbrains.kotlin.idea.debugger.sequence.psi.impl

-import com.intellij.debugger.streams.kotlin.psi.KotlinPsiUtil
-import com.intellij.debugger.streams.kotlin.psi.StreamCallChecker
-import com.intellij.debugger.streams.kotlin.psi.receiverType
-import com.intellij.debugger.streams.kotlin.psi.resolveType
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.KotlinPsiUtil
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.StreamCallChecker
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.receiverType
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.resolveType
 import com.intellij.openapi.util.text.StringUtil
 import org.jetbrains.kotlin.psi.KtCallExpression
 import org.jetbrains.kotlin.types.KotlinType
@@ -1,8 +1,8 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi.impl
+package org.jetbrains.kotlin.idea.debugger.sequence.psi.impl

-import com.intellij.debugger.streams.kotlin.psi.StreamCallChecker
-import com.intellij.debugger.streams.kotlin.psi.previousCall
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.StreamCallChecker
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.previousCall
 import com.intellij.debugger.streams.psi.ChainTransformer
 import org.jetbrains.kotlin.psi.KtCallExpression
 import java.util.*
@@ -11,7 +11,8 @@ import java.util.*
 * @author Vitaliy.Bibaev
 */
 open class TerminatedChainBuilder(transformer: ChainTransformer<KtCallExpression>,
-                                  private val callChecker: StreamCallChecker)
+                                  private val callChecker: StreamCallChecker
+)
  : KotlinChainBuilderBase(transformer) {
  override val existenceChecker: ExistenceChecker = MyExistenceChecker()

@@ -1,9 +1,9 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi.java
+package org.jetbrains.kotlin.idea.debugger.sequence.psi.java

-import com.intellij.debugger.streams.kotlin.psi.CallTypeExtractor
-import com.intellij.debugger.streams.kotlin.psi.KotlinPsiUtil
-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinTypes
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.CallTypeExtractor
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.KotlinPsiUtil
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinTypes
 import com.intellij.debugger.streams.trace.impl.handler.type.ClassTypeImpl
 import com.intellij.debugger.streams.trace.impl.handler.type.GenericType
 import com.intellij.psi.CommonClassNames
@@ -1,10 +1,10 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi.sequence
+package org.jetbrains.kotlin.idea.debugger.sequence.psi.sequence

-import com.intellij.debugger.streams.kotlin.psi.KotlinPsiUtil
-import com.intellij.debugger.streams.kotlin.psi.StreamCallChecker
-import com.intellij.debugger.streams.kotlin.psi.receiverType
-import com.intellij.debugger.streams.kotlin.psi.resolveType
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.KotlinPsiUtil
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.StreamCallChecker
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.receiverType
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.resolveType
 import org.jetbrains.kotlin.psi.KtCallExpression
 import org.jetbrains.kotlin.types.KotlinType
 import org.jetbrains.kotlin.types.typeUtil.supertypes
@@ -1,9 +1,9 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi.sequence
+package org.jetbrains.kotlin.idea.debugger.sequence.psi.sequence

-import com.intellij.debugger.streams.kotlin.psi.CallTypeExtractor
-import com.intellij.debugger.streams.kotlin.psi.KotlinPsiUtil
-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinTypes
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.CallTypeExtractor
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.KotlinPsiUtil
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinTypes
 import com.intellij.debugger.streams.trace.impl.handler.type.ClassTypeImpl
 import com.intellij.debugger.streams.trace.impl.handler.type.GenericType
 import com.intellij.openapi.diagnostic.Logger
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.resolve
+package org.jetbrains.kotlin.idea.debugger.sequence.resolve

 import com.intellij.debugger.streams.resolve.ValuesOrderResolver
 import com.intellij.debugger.streams.trace.TraceElement
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.resolve
+package org.jetbrains.kotlin.idea.debugger.sequence.resolve

 import com.intellij.debugger.streams.resolve.ValuesOrderResolver
 import com.intellij.debugger.streams.trace.TraceElement
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.resolve
+package org.jetbrains.kotlin.idea.debugger.sequence.resolve

 import com.intellij.debugger.streams.resolve.ValuesOrderResolver
 import com.intellij.debugger.streams.trace.TraceElement
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.dsl
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl

 import com.intellij.debugger.streams.trace.impl.handler.PeekCall
 import com.intellij.debugger.streams.trace.impl.handler.type.GenericType
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.dsl
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl

 import com.intellij.debugger.streams.trace.dsl.ArrayVariable
 import com.intellij.debugger.streams.trace.dsl.Expression
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.dsl
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl

 import com.intellij.debugger.streams.trace.dsl.Expression
 import com.intellij.debugger.streams.trace.dsl.Variable
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.dsl
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl

 import com.intellij.debugger.streams.trace.dsl.Expression
 import com.intellij.debugger.streams.trace.dsl.StatementFactory
@@ -1,7 +1,7 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.dsl
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl

-import com.intellij.debugger.streams.kotlin.trace.impl.handler.OnEachCall
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.handler.OnEachCall
 import com.intellij.debugger.streams.trace.impl.handler.type.GenericType
 import com.intellij.debugger.streams.wrapper.IntermediateStreamCall

@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.dsl
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl

 import com.intellij.debugger.streams.trace.dsl.Convertable
 import com.intellij.debugger.streams.trace.dsl.Expression
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.dsl
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl

 import com.intellij.debugger.streams.trace.dsl.Convertable
 import com.intellij.debugger.streams.trace.dsl.Expression
@@ -6,6 +6,7 @@ import com.intellij.debugger.streams.trace.dsl.ForLoopBody
 import com.intellij.debugger.streams.trace.dsl.StatementFactory
 import com.intellij.debugger.streams.trace.dsl.Variable
 import com.intellij.debugger.streams.trace.dsl.impl.TextExpression
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinCodeBlock

 /**
 * @author Vitaliy.Bibaev
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.dsl
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl

 import com.intellij.debugger.streams.trace.dsl.CodeBlock
 import com.intellij.debugger.streams.trace.dsl.Expression
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.dsl
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl

 import com.intellij.debugger.streams.trace.dsl.CodeBlock
 import com.intellij.debugger.streams.trace.dsl.Expression
@@ -1,9 +1,10 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.dsl
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl

 import com.intellij.debugger.streams.trace.dsl.Expression
 import com.intellij.debugger.streams.trace.dsl.LambdaBody
 import com.intellij.debugger.streams.trace.dsl.StatementFactory
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinCodeBlock

 /**
 * @author Vitaliy.Bibaev
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.dsl
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl

 import com.intellij.debugger.streams.trace.dsl.Expression
 import com.intellij.debugger.streams.trace.dsl.ListVariable
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.dsl
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl

 import com.intellij.debugger.streams.trace.dsl.*
 import com.intellij.debugger.streams.trace.dsl.impl.TextExpression
@@ -1,12 +1,14 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.dsl
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl

+import com.intellij.debugger.streams.kotlin.trace.dsl.*
 import com.intellij.debugger.streams.trace.dsl.*
 import com.intellij.debugger.streams.trace.dsl.impl.AssignmentStatement
 import com.intellij.debugger.streams.trace.dsl.impl.TextExpression
 import com.intellij.debugger.streams.trace.dsl.impl.VariableImpl
 import com.intellij.debugger.streams.trace.impl.handler.type.GenericType
 import com.intellij.debugger.streams.wrapper.IntermediateStreamCall
+
 /**
 * @author Vitaliy.Bibaev
 */
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.dsl
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl

 import com.intellij.debugger.streams.trace.dsl.CodeBlock
 import com.intellij.debugger.streams.trace.dsl.StatementFactory
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.dsl
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl

 import com.intellij.debugger.streams.trace.dsl.Types
 import com.intellij.debugger.streams.trace.impl.handler.type.*
@@ -40,7 +40,7 @@ object KotlinTypes : Types {
    FLOAT -> ArrayTypeImpl(FLOAT, { "kotlin.FloatArray" }, { "kotlin.FloatArray($it)" })
    DOUBLE -> ArrayTypeImpl(DOUBLE, { "kotlin.DoubleArray" }, { "kotlin.DoubleArray($it)" })
    else -> ArrayTypeImpl(nullable { elementType }, { "kotlin.Array<$it>" },
-        { "kotlin.arrayOfNulls<${elementType.genericTypeName}>($it)" })
+                          { "kotlin.arrayOfNulls<${elementType.genericTypeName}>($it)" })
  }

  override fun map(keyType: GenericType, valueType: GenericType): MapType =
@@ -66,8 +66,10 @@ object KotlinTypes : Types {
  }

  private val primitiveTypesIndex: Map<String, GenericType> =
-      listOf(KotlinTypes.BOOLEAN, KotlinTypes.BYTE, KotlinTypes.INT, KotlinTypes.SHORT,
-          KotlinTypes.CHAR, KotlinTypes.LONG, KotlinTypes.FLOAT, KotlinTypes.DOUBLE)
+      listOf(
+          BOOLEAN, BYTE, INT, SHORT,
+          CHAR, LONG, FLOAT, DOUBLE
+      )
          .associate { it.genericTypeName to it }

  private val primitiveArraysIndex: Map<String, ArrayType> = primitiveTypesIndex.asSequence()
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.dsl
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl

 import com.intellij.debugger.streams.trace.dsl.Variable
 import com.intellij.debugger.streams.trace.dsl.VariableDeclaration
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.dsl
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl

 import com.intellij.debugger.streams.trace.impl.handler.type.GenericType
 import com.intellij.debugger.streams.wrapper.IntermediateStreamCall
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.impl
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.impl

 import com.intellij.debugger.streams.lib.HandlerFactory
 import com.intellij.debugger.streams.trace.dsl.Dsl
@@ -1,10 +1,10 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.impl.handler
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.handler

-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinTypes
 import com.intellij.debugger.streams.wrapper.*
 import com.intellij.debugger.streams.wrapper.impl.IntermediateStreamCallImpl
 import com.intellij.debugger.streams.wrapper.impl.TerminatorStreamCallImpl
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinTypes

 /**
 * @author Vitaliy.Bibaev
@@ -1,7 +1,7 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.impl.handler
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.handler

-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinTypes
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinTypes
 import com.intellij.debugger.streams.trace.impl.handler.type.GenericType
 import com.intellij.debugger.streams.wrapper.CallArgument
 import com.intellij.debugger.streams.wrapper.IntermediateStreamCall
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.impl.handler.collections
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.handler.collections

 import com.intellij.debugger.streams.trace.IntermediateCallHandler
 import com.intellij.debugger.streams.trace.TerminatorCallHandler
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.impl.handler.collections
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.handler.collections

 import com.intellij.debugger.streams.trace.dsl.*
 import com.intellij.debugger.streams.wrapper.IntermediateStreamCall
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.impl.handler.collections
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.handler.collections

 import com.intellij.debugger.streams.trace.TraceHandler
 import com.intellij.debugger.streams.trace.dsl.Dsl
@@ -12,7 +12,8 @@ import com.intellij.debugger.streams.wrapper.StreamCall
 * @author Vitaliy.Bibaev
 */
 abstract class CollectionHandlerBase(order: Int, private val dsl: Dsl,
-                                     private val call: StreamCall, private val internalHandler: BothSemanticsHandler)
+                                     private val call: StreamCall, private val internalHandler: BothSemanticsHandler
+)
  : TraceHandler {
  private val declarations: List<VariableDeclaration> = internalHandler.variablesDeclaration(call, order, dsl)
  protected val variables: List<Variable> = declarations.map(VariableDeclaration::variable)
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.impl.handler.collections
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.handler.collections

 import com.intellij.debugger.streams.trace.IntermediateCallHandler
 import com.intellij.debugger.streams.trace.dsl.*
@@ -12,7 +12,8 @@ class CollectionIntermediateHandler(
    order: Int,
    private val call: IntermediateStreamCall,
    private val dsl: Dsl,
-    private val internalHandler: BothSemanticsHandler)
+    private val internalHandler: BothSemanticsHandler
+)
  : IntermediateCallHandler, CollectionHandlerBase(order, dsl, call, internalHandler) {

  override fun prepareResult(): CodeBlock {
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.impl.handler.collections
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.handler.collections

 import com.intellij.debugger.streams.trace.TerminatorCallHandler
 import com.intellij.debugger.streams.trace.dsl.CodeBlock
@@ -8,6 +8,8 @@ import com.intellij.debugger.streams.trace.dsl.Expression
 import com.intellij.debugger.streams.trace.dsl.impl.TextExpression
 import com.intellij.debugger.streams.wrapper.IntermediateStreamCall
 import com.intellij.debugger.streams.wrapper.TerminatorStreamCall
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.handler.collections.BothSemanticsHandler
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.handler.collections.CollectionHandlerBase

 /**
 * @author Vitaliy.Bibaev
@@ -15,7 +17,8 @@ import com.intellij.debugger.streams.wrapper.TerminatorStreamCall
 class CollectionTerminatorHandler(private val call: TerminatorStreamCall,
                                  private val resultExpression: String,
                                  private val dsl: Dsl,
-                                  private val internalHandler: BothSemanticsHandler)
+                                  private val internalHandler: BothSemanticsHandler
+)
  : TerminatorCallHandler, CollectionHandlerBase(Int.MAX_VALUE, dsl, call, internalHandler) {

  override fun prepareResult(): CodeBlock {
@@ -1,8 +1,6 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.impl.handler.collections
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.handler.collections

-import com.intellij.debugger.streams.kotlin.trace.impl.handler.typeBefore
-import com.intellij.debugger.streams.kotlin.trace.impl.handler.withArgs
 import com.intellij.debugger.streams.trace.dsl.*
 import com.intellij.debugger.streams.trace.dsl.impl.TextExpression
 import com.intellij.debugger.streams.trace.impl.handler.type.ClassTypeImpl
@@ -11,6 +9,8 @@ import com.intellij.debugger.streams.wrapper.IntermediateStreamCall
 import com.intellij.debugger.streams.wrapper.StreamCall
 import com.intellij.debugger.streams.wrapper.TerminatorStreamCall
 import com.intellij.debugger.streams.wrapper.impl.CallArgumentImpl
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.handler.typeBefore
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.handler.withArgs

 /**
 * @author Vitaliy.Bibaev
@@ -1,7 +1,7 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.impl.handler.sequence
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.handler.sequence

-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinTypes
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinTypes
 import com.intellij.debugger.streams.trace.dsl.CodeBlock
 import com.intellij.debugger.streams.trace.dsl.Dsl
 import com.intellij.debugger.streams.trace.dsl.Expression
@@ -1,7 +1,7 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.impl.handler.sequence
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.handler.sequence

-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinTypes
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinTypes
 import com.intellij.debugger.streams.trace.dsl.*
 import com.intellij.debugger.streams.trace.dsl.impl.TextExpression
 import com.intellij.debugger.streams.trace.impl.handler.type.ClassTypeImpl
@@ -11,7 +11,6 @@ import com.intellij.debugger.streams.wrapper.CallArgument
 import com.intellij.debugger.streams.wrapper.IntermediateStreamCall
 import com.intellij.debugger.streams.wrapper.impl.CallArgumentImpl
 import com.intellij.debugger.streams.wrapper.impl.IntermediateStreamCallImpl
-import one.util.streamex.StreamEx

 /**
 * Based on com.intellij.debugger.streams.trace.impl.handler.unified.DistinctByKeyHandler
@@ -64,7 +63,6 @@ class KotlinDistinctByHandler(callNumber: Int, private val call: IntermediateStr
  override fun prepareResult(): CodeBlock {
    val keys2TimesBefore = dsl.map(KotlinTypes.NULLABLE_ANY, dsl.types.list(dsl.types.INT), "keys2Times")
    val transitions = dsl.map(dsl.types.INT, dsl.types.INT, "transitionsMap")
-    StreamEx.of(1).distinct().toList()
    return dsl.block {
      add(peekHandler.prepareResult())
      declare(keys2TimesBefore.defaultDeclaration())
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.impl.interpret
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.interpret

 import com.intellij.debugger.streams.trace.CallTraceInterpreter
 import com.intellij.debugger.streams.trace.TraceElement
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.impl.interpret
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.interpret

 import com.intellij.debugger.streams.trace.TraceElement
 import com.intellij.debugger.streams.trace.impl.interpret.ex.UnexpectedValueException
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.trace.impl.interpret
+package org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.interpret

 import com.intellij.debugger.streams.trace.TraceElement
 import com.intellij.debugger.streams.trace.TraceInfo
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin
+package org.jetbrains.kotlin.idea.debugger.sequence

 import com.intellij.openapi.projectRoots.JavaSdk
 import com.intellij.openapi.projectRoots.Sdk
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin
+package org.jetbrains.kotlin.idea.debugger.sequence

 import com.intellij.debugger.streams.test.StreamChainBuilderTestCase
 import com.intellij.debugger.streams.wrapper.StreamChain
@@ -17,7 +17,7 @@ import com.intellij.psi.impl.source.PsiFileImpl
 import com.intellij.testFramework.LightPlatformTestCase
 import com.intellij.testFramework.PsiTestUtil
 import junit.framework.TestCase
-import org.jetbrains.kotlin.idea.caches.resolve.LibraryModificationTracker
+import org.jetbrains.kotlin.idea.caches.project.LibraryModificationTracker
 import org.jetbrains.kotlin.idea.decompiler.KotlinDecompiledFileViewProvider
 import org.jetbrains.kotlin.idea.decompiler.KtDecompiledFile
 import java.io.File
@@ -48,7 +48,8 @@ abstract class KotlinPsiChainBuilderTestCase(private val relativePath: String) :
      if (ProjectLibraryTable.getInstance(LightPlatformTestCase.getProject()).getLibraryByName(stdLibName) == null) {
        VfsRootAccess.allowRootAccess(LibraryUtil.LIBRARIES_DIRECTORY)
        PsiTestUtil.addLibrary(testRootDisposable, LightPlatformTestCase.getModule(), stdLibName,
-            LibraryUtil.LIBRARIES_DIRECTORY, LibraryUtil.KOTLIN_STD_LIBRARY_JAR_NAME)
+                               LibraryUtil.LIBRARIES_DIRECTORY, LibraryUtil.KOTLIN_STD_LIBRARY_JAR_NAME
+        )
      }
    }
    LibraryModificationTracker.getInstance(LightPlatformTestCase.getProject()).incModificationCount()
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin
+package org.jetbrains.kotlin.idea.debugger.sequence

 import java.io.File

@@ -1,16 +1,16 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.dsl
+package org.jetbrains.kotlin.idea.debugger.sequence.dsl

-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinCollectionsPeekCallFactory
-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinStatementFactory
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinCollectionsPeekCallFactory
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinStatementFactory
 import com.intellij.debugger.streams.test.DslTestCase
 import com.intellij.debugger.streams.trace.dsl.impl.DslImpl

 /**
 * @author Vitaliy.Bibaev
 */
-class KotlinDslTest : DslTestCase(DslImpl(KotlinStatementFactory(KotlinCollectionsPeekCallFactory()))) {
-  override fun getTestDataPath(): String {
-    return "testData/dsl"
-  }
-}
+//class KotlinDslTest : DslTestCase(DslImpl(KotlinStatementFactory(KotlinCollectionsPeekCallFactory()))) {
+//  override fun getTestDataPath(): String {
+//    return "testData/dsl"
+//  }
+//}
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec
+package org.jetbrains.kotlin.idea.debugger.sequence.exec

 import com.intellij.debugger.impl.OutputChecker
 import com.intellij.idea.IdeaLogger
@@ -1,8 +1,8 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec
+package org.jetbrains.kotlin.idea.debugger.sequence.exec

 import com.intellij.debugger.impl.OutputChecker
-import com.intellij.debugger.streams.kotlin.LibraryUtil
+import org.jetbrains.kotlin.idea.debugger.sequence.LibraryUtil
 import com.intellij.debugger.streams.lib.LibrarySupportProvider
 import com.intellij.debugger.streams.test.TraceExecutionTestCase
 import com.intellij.execution.configurations.JavaParameters
@@ -35,13 +35,13 @@ abstract class KotlinTraceEvaluationTestCase : TraceExecutionTestCase() {
    super.setUpModule()
    ApplicationManager.getApplication().runWriteAction {
      VfsRootAccess.allowRootAccess(LibraryUtil.LIBRARIES_DIRECTORY)
-      PsiTestUtil.addLibrary(myModule, "${LibraryUtil.LIBRARIES_DIRECTORY}/$STDLIB_JAR_NAME")
+      PsiTestUtil.addLibrary(myModule, "${LibraryUtil.LIBRARIES_DIRECTORY}/${STDLIB_JAR_NAME}")
    }
  }

  override fun createJavaParameters(mainClass: String?): JavaParameters {
    val javaParameters = super.createJavaParameters(mainClass)
-    javaParameters.classPath.add("${LibraryUtil.LIBRARIES_DIRECTORY}/$STDLIB_JAR_NAME")
+    javaParameters.classPath.add("${LibraryUtil.LIBRARIES_DIRECTORY}/${STDLIB_JAR_NAME}")
    return javaParameters
  }

@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec.collection
+package org.jetbrains.kotlin.idea.debugger.sequence.exec.collection

 import org.junit.Ignore

@@ -1,8 +1,8 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec.collection
+package org.jetbrains.kotlin.idea.debugger.sequence.exec.collection

-import com.intellij.debugger.streams.kotlin.exec.KotlinTraceEvaluationTestCase
-import com.intellij.debugger.streams.kotlin.lib.collections.KotlinCollectionSupportProvider
+import org.jetbrains.kotlin.idea.debugger.sequence.exec.KotlinTraceEvaluationTestCase
+import org.jetbrains.kotlin.idea.debugger.sequence.lib.collections.KotlinCollectionSupportProvider
 import com.intellij.debugger.streams.lib.LibrarySupportProvider

 /**
@@ -1,6 +1,7 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec.collection
+package org.jetbrains.kotlin.idea.debugger.sequence.exec.collection

+import org.jetbrains.kotlin.idea.debugger.sequence.exec.collection.CollectionTestCase
 import org.junit.Ignore

 /**
@@ -1,6 +1,7 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec.collection
+package org.jetbrains.kotlin.idea.debugger.sequence.exec.collection

+import org.jetbrains.kotlin.idea.debugger.sequence.exec.collection.CollectionTestCase
 import org.junit.Ignore

 /**
@@ -1,6 +1,7 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec.collection
+package org.jetbrains.kotlin.idea.debugger.sequence.exec.collection

+import org.jetbrains.kotlin.idea.debugger.sequence.exec.collection.CollectionTestCase
 import org.junit.Ignore

 /**
@@ -1,6 +1,7 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec.collection
+package org.jetbrains.kotlin.idea.debugger.sequence.exec.collection

+import org.jetbrains.kotlin.idea.debugger.sequence.exec.collection.CollectionTestCase
 import org.junit.Ignore

 /**
@@ -1,6 +1,7 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec.collection
+package org.jetbrains.kotlin.idea.debugger.sequence.exec.collection

+import org.jetbrains.kotlin.idea.debugger.sequence.exec.collection.CollectionTestCase
 import org.junit.Ignore

 /**
@@ -1,6 +1,7 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec.collection
+package org.jetbrains.kotlin.idea.debugger.sequence.exec.collection

+import org.jetbrains.kotlin.idea.debugger.sequence.exec.collection.CollectionTestCase
 import org.junit.Ignore

 /**
@@ -1,6 +1,7 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec.collection
+package org.jetbrains.kotlin.idea.debugger.sequence.exec.collection

+import org.jetbrains.kotlin.idea.debugger.sequence.exec.collection.CollectionTestCase
 import org.junit.Ignore

 /**
@@ -1,6 +1,7 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec.collection
+package org.jetbrains.kotlin.idea.debugger.sequence.exec.collection

+import org.jetbrains.kotlin.idea.debugger.sequence.exec.collection.CollectionTestCase
 import org.junit.Ignore

 /**
@@ -1,6 +1,7 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec.collection
+package org.jetbrains.kotlin.idea.debugger.sequence.exec.collection

+import org.jetbrains.kotlin.idea.debugger.sequence.exec.collection.CollectionTestCase
 import org.junit.Ignore

 /**
@@ -1,8 +1,8 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec.java
+package org.jetbrains.kotlin.idea.debugger.sequence.exec.java

-import com.intellij.debugger.streams.kotlin.exec.KotlinTraceEvaluationTestCase
-import com.intellij.debugger.streams.kotlin.lib.java.JavaStandardLibrarySupportProvider
+import org.jetbrains.kotlin.idea.debugger.sequence.exec.KotlinTraceEvaluationTestCase
+import org.jetbrains.kotlin.idea.debugger.sequence.lib.java.JavaStandardLibrarySupportProvider
 import com.intellij.debugger.streams.lib.LibrarySupportProvider


@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec.sequence
+package org.jetbrains.kotlin.idea.debugger.sequence.exec.sequence

 /**
 * @author Vitaliy.Bibaev
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec.sequence
+package org.jetbrains.kotlin.idea.debugger.sequence.exec.sequence

 /**
 * @author Vitaliy.Bibaev
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec.sequence
+package org.jetbrains.kotlin.idea.debugger.sequence.exec.sequence

 class FilterOperationsTest : OperationsTestCase("filter") {
    fun testFilter() = doTestWithResult()
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec.sequence
+package org.jetbrains.kotlin.idea.debugger.sequence.exec.sequence

 /**
 * @author Vitaliy.Bibaev
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec.sequence
+package org.jetbrains.kotlin.idea.debugger.sequence.exec.sequence

 /**
 * @author Vitaliy.Bibaev
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec.sequence
+package org.jetbrains.kotlin.idea.debugger.sequence.exec.sequence

 /**
 * @author Vitaliy.Bibaev
@@ -1,8 +1,8 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec.sequence
+package org.jetbrains.kotlin.idea.debugger.sequence.exec.sequence

-import com.intellij.debugger.streams.kotlin.exec.KotlinTraceEvaluationTestCase
-import com.intellij.debugger.streams.kotlin.lib.sequence.KotlinSequenceSupportProvider
+import org.jetbrains.kotlin.idea.debugger.sequence.exec.KotlinTraceEvaluationTestCase
+import org.jetbrains.kotlin.idea.debugger.sequence.lib.sequence.KotlinSequenceSupportProvider
 import com.intellij.debugger.streams.lib.LibrarySupportProvider

 abstract class OperationsTestCase(private val packageName: String) : KotlinTraceEvaluationTestCase() {
@@ -1,5 +1,7 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec.sequence
+package org.jetbrains.kotlin.idea.debugger.sequence.exec.sequence
+
+import org.jetbrains.kotlin.idea.debugger.sequence.exec.sequence.OperationsTestCase

 /**
 * @author Vitaliy.Bibaev
@@ -1,5 +1,7 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.exec.sequence
+package org.jetbrains.kotlin.idea.debugger.sequence.exec.sequence
+
+import org.jetbrains.kotlin.idea.debugger.sequence.exec.sequence.OperationsTestCase

 /**
 * @author Vitaliy.Bibaev
@@ -1,7 +1,7 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi
+package org.jetbrains.kotlin.idea.debugger.sequence.psi

-import com.intellij.debugger.streams.kotlin.KotlinPsiChainBuilderTestCase
+import org.jetbrains.kotlin.idea.debugger.sequence.KotlinPsiChainBuilderTestCase
 import com.intellij.debugger.streams.trace.impl.handler.type.GenericType

 /**
@@ -1,8 +1,8 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi.collection
+package org.jetbrains.kotlin.idea.debugger.sequence.psi.collection

-import com.intellij.debugger.streams.kotlin.KotlinPsiChainBuilderTestCase
-import com.intellij.debugger.streams.kotlin.lib.collections.KotlinCollectionSupportProvider
+import org.jetbrains.kotlin.idea.debugger.sequence.KotlinPsiChainBuilderTestCase
+import org.jetbrains.kotlin.idea.debugger.sequence.lib.collections.KotlinCollectionSupportProvider
 import com.intellij.debugger.streams.wrapper.StreamChainBuilder

 /**
@@ -1,9 +1,9 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi.collection
+package org.jetbrains.kotlin.idea.debugger.sequence.psi.collection

-import com.intellij.debugger.streams.kotlin.lib.collections.KotlinCollectionSupportProvider
-import com.intellij.debugger.streams.kotlin.psi.TypedChainTestCase
-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinTypes
+import org.jetbrains.kotlin.idea.debugger.sequence.lib.collections.KotlinCollectionSupportProvider
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.TypedChainTestCase
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinTypes
 import com.intellij.debugger.streams.wrapper.StreamChainBuilder

 /**
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi.java
+package org.jetbrains.kotlin.idea.debugger.sequence.psi.java

 /**
 * @author Vitaliy.Bibaev
@@ -1,5 +1,5 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi.java
+package org.jetbrains.kotlin.idea.debugger.sequence.psi.java

 /**
 * @author Vitaliy.Bibaev
@@ -1,8 +1,8 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi.java
+package org.jetbrains.kotlin.idea.debugger.sequence.psi.java

-import com.intellij.debugger.streams.kotlin.KotlinPsiChainBuilderTestCase
-import com.intellij.debugger.streams.kotlin.lib.java.JavaStandardLibrarySupportProvider
+import org.jetbrains.kotlin.idea.debugger.sequence.KotlinPsiChainBuilderTestCase
+import org.jetbrains.kotlin.idea.debugger.sequence.lib.java.JavaStandardLibrarySupportProvider
 import com.intellij.debugger.streams.wrapper.StreamChainBuilder

 /**
@@ -1,8 +1,8 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi.java
+package org.jetbrains.kotlin.idea.debugger.sequence.psi.java

-import com.intellij.debugger.streams.kotlin.KotlinPsiChainBuilderTestCase
-import com.intellij.debugger.streams.kotlin.lib.java.JavaStandardLibrarySupportProvider
+import org.jetbrains.kotlin.idea.debugger.sequence.KotlinPsiChainBuilderTestCase
+import org.jetbrains.kotlin.idea.debugger.sequence.lib.java.JavaStandardLibrarySupportProvider
 import com.intellij.debugger.streams.wrapper.StreamChainBuilder

 /**
@@ -1,9 +1,9 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi.java
+package org.jetbrains.kotlin.idea.debugger.sequence.psi.java

-import com.intellij.debugger.streams.kotlin.KotlinPsiChainBuilderTestCase
-import com.intellij.debugger.streams.kotlin.LibraryUtil
-import com.intellij.debugger.streams.kotlin.lib.java.StreamExLibrarySupportProvider
+import org.jetbrains.kotlin.idea.debugger.sequence.KotlinPsiChainBuilderTestCase
+import org.jetbrains.kotlin.idea.debugger.sequence.LibraryUtil
+import org.jetbrains.kotlin.idea.debugger.sequence.lib.java.StreamExLibrarySupportProvider
 import com.intellij.debugger.streams.wrapper.StreamChainBuilder
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess
@@ -20,7 +20,7 @@ class PositiveStreamExTest : KotlinPsiChainBuilderTestCase.Positive("streams/pos
    ApplicationManager.getApplication().runWriteAction {
      VfsRootAccess.allowRootAccess(LibraryUtil.LIBRARIES_DIRECTORY)
      PsiTestUtil.addLibrary(testRootDisposable, LightPlatformTestCase.getModule(),
-          "StreamEx", LibraryUtil.LIBRARIES_DIRECTORY, "streamex-0.6.5.jar")
+                             "StreamEx", LibraryUtil.LIBRARIES_DIRECTORY, "streamex-0.6.5.jar")
    }
  }

@@ -1,12 +1,12 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi.java
+package org.jetbrains.kotlin.idea.debugger.sequence.psi.java

-import com.intellij.debugger.streams.kotlin.lib.java.JavaStandardLibrarySupportProvider
-import com.intellij.debugger.streams.kotlin.psi.TypedChainTestCase
-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinTypes.DOUBLE
-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinTypes.INT
-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinTypes.LONG
-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinTypes.NULLABLE_ANY
+import org.jetbrains.kotlin.idea.debugger.sequence.lib.java.JavaStandardLibrarySupportProvider
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.TypedChainTestCase
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinTypes.DOUBLE
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinTypes.INT
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinTypes.LONG
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinTypes.NULLABLE_ANY
 import com.intellij.debugger.streams.wrapper.StreamChainBuilder

 /**
@@ -1,9 +1,9 @@
 // Copyright 2000-2017 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
-package com.intellij.debugger.streams.kotlin.psi.sequence
+package org.jetbrains.kotlin.idea.debugger.sequence.psi.sequence

-import com.intellij.debugger.streams.kotlin.lib.sequence.KotlinSequenceSupportProvider
-import com.intellij.debugger.streams.kotlin.psi.TypedChainTestCase
-import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinTypes
+import org.jetbrains.kotlin.idea.debugger.sequence.lib.sequence.KotlinSequenceSupportProvider
+import org.jetbrains.kotlin.idea.debugger.sequence.psi.TypedChainTestCase
+import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinTypes
 import com.intellij.debugger.streams.wrapper.StreamChainBuilder

 /**