From 7f57730c45e8b87b3043998d5da65703bb5278a7 Mon Sep 17 00:00:00 2001
From: "Vitaliy.Bibaev" <vitaliy.bibaev@jetbrains.com>
Date: Tue, 19 Dec 2017 20:40:19 +0300
Subject: [PATCH] Move classes into packages java/sequence/collections where
 needed

---
 .../lib/{ => collections}/KotlinCollectionLibrarySupport.kt  | 2 +-
 .../lib/{ => collections}/KotlinCollectionSupportProvider.kt | 5 +++--
 .../lib/{ => java}/JavaStandardLibrarySupportProvider.kt     | 5 +++--
 .../kotlin/lib/{ => java}/StreamExLibrarySupportProvider.kt  | 5 +++--
 .../lib/{ => sequence}/KotlinSequenceSupportProvider.kt      | 5 +++--
 .../kotlin/lib/{ => sequence}/KotlinSequencesSupport.kt      | 2 +-
 .../{impl => collections}/KotlinCollectionChainBuilder.kt    | 4 +++-
 .../{impl => collections}/KotlinCollectionsTypeExtractor.kt  | 2 +-
 .../psi/{impl => java}/JavaStreamChainTypeExtractor.kt       | 2 +-
 .../psi/{impl => java}/KotlinJavaStreamChainBuilder.kt       | 4 +++-
 .../psi/{impl => sequence}/KotlinSequenceChainBuilder.kt     | 5 ++++-
 .../streams/kotlin/exec/collection/CollectionTestCase.kt     | 2 +-
 .../debugger/streams/kotlin/exec/java/JavaStreamTest.kt      | 2 +-
 .../kotlin/psi/collection/PositiveCollectionBuildTest.kt     | 2 +-
 .../kotlin/psi/collection/TypedCollectionChainTest.kt        | 2 +-
 .../streams/kotlin/psi/java/NegativeJavaStreamTest.kt        | 2 +-
 .../streams/kotlin/psi/java/PositiveJavaStreamTest.kt        | 2 +-
 .../debugger/streams/kotlin/psi/java/PositiveStreamExTest.kt | 2 +-
 .../debugger/streams/kotlin/psi/java/TypedJavaChainTest.kt   | 2 +-
 19 files changed, 34 insertions(+), 23 deletions(-)
 rename idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/{ => collections}/KotlinCollectionLibrarySupport.kt (97%)
 rename idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/{ => collections}/KotlinCollectionSupportProvider.kt (87%)
 rename idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/{ => java}/JavaStandardLibrarySupportProvider.kt (89%)
 rename idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/{ => java}/StreamExLibrarySupportProvider.kt (90%)
 rename idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/{ => sequence}/KotlinSequenceSupportProvider.kt (87%)
 rename idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/{ => sequence}/KotlinSequencesSupport.kt (85%)
 rename idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/{impl => collections}/KotlinCollectionChainBuilder.kt (93%)
 rename idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/{impl => collections}/KotlinCollectionsTypeExtractor.kt (98%)
 rename idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/{impl => java}/JavaStreamChainTypeExtractor.kt (97%)
 rename idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/{impl => java}/KotlinJavaStreamChainBuilder.kt (92%)
 rename idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/{impl => sequence}/KotlinSequenceChainBuilder.kt (73%)

diff --git a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/KotlinCollectionLibrarySupport.kt b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/collections/KotlinCollectionLibrarySupport.kt
similarity index 97%
rename from idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/KotlinCollectionLibrarySupport.kt
rename to idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/collections/KotlinCollectionLibrarySupport.kt
index 6f5ef943f2a..82c30a16b8f 100644
--- a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/KotlinCollectionLibrarySupport.kt
+++ b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/collections/KotlinCollectionLibrarySupport.kt
@@ -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 com.intellij.debugger.streams.kotlin.lib.collections
 
 import com.intellij.debugger.streams.kotlin.trace.impl.handler.collections.*
 import com.intellij.debugger.streams.kotlin.trace.impl.interpret.FilterTraceInterpreter
diff --git a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/KotlinCollectionSupportProvider.kt b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/collections/KotlinCollectionSupportProvider.kt
similarity index 87%
rename from idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/KotlinCollectionSupportProvider.kt
rename to idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/collections/KotlinCollectionSupportProvider.kt
index 088383ff137..d668df9b9e9 100644
--- a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/KotlinCollectionSupportProvider.kt
+++ b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/collections/KotlinCollectionSupportProvider.kt
@@ -1,7 +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.lib
+package com.intellij.debugger.streams.kotlin.lib.collections
 
-import com.intellij.debugger.streams.kotlin.psi.impl.KotlinCollectionChainBuilder
+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
diff --git a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/JavaStandardLibrarySupportProvider.kt b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/java/JavaStandardLibrarySupportProvider.kt
similarity index 89%
rename from idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/JavaStandardLibrarySupportProvider.kt
rename to idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/java/JavaStandardLibrarySupportProvider.kt
index e9a15728656..285e1ad97e0 100644
--- a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/JavaStandardLibrarySupportProvider.kt
+++ b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/java/JavaStandardLibrarySupportProvider.kt
@@ -1,7 +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.lib
+package com.intellij.debugger.streams.kotlin.lib.java
 
-import com.intellij.debugger.streams.kotlin.psi.impl.KotlinJavaStreamChainBuilder
+import com.intellij.debugger.streams.kotlin.lib.LibraryUtil
+import com.intellij.debugger.streams.kotlin.psi.java.KotlinJavaStreamChainBuilder
 import com.intellij.debugger.streams.kotlin.psi.impl.PackageBasedCallChecker
 import com.intellij.debugger.streams.kotlin.trace.dsl.JavaPeekCallFactory
 import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinStatementFactory
diff --git a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/StreamExLibrarySupportProvider.kt b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/java/StreamExLibrarySupportProvider.kt
similarity index 90%
rename from idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/StreamExLibrarySupportProvider.kt
rename to idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/java/StreamExLibrarySupportProvider.kt
index d672aa24923..d9f7a37173d 100644
--- a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/StreamExLibrarySupportProvider.kt
+++ b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/java/StreamExLibrarySupportProvider.kt
@@ -1,7 +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.lib
+package com.intellij.debugger.streams.kotlin.lib.java
 
-import com.intellij.debugger.streams.kotlin.psi.impl.KotlinJavaStreamChainBuilder
+import com.intellij.debugger.streams.kotlin.lib.LibraryUtil
+import com.intellij.debugger.streams.kotlin.psi.java.KotlinJavaStreamChainBuilder
 import com.intellij.debugger.streams.kotlin.psi.impl.PackageBasedCallChecker
 import com.intellij.debugger.streams.kotlin.trace.dsl.JavaPeekCallFactory
 import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinStatementFactory
diff --git a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/KotlinSequenceSupportProvider.kt b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/sequence/KotlinSequenceSupportProvider.kt
similarity index 87%
rename from idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/KotlinSequenceSupportProvider.kt
rename to idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/sequence/KotlinSequenceSupportProvider.kt
index 926a1781525..eaabca3328d 100644
--- a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/KotlinSequenceSupportProvider.kt
+++ b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/sequence/KotlinSequenceSupportProvider.kt
@@ -1,7 +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.lib
+package com.intellij.debugger.streams.kotlin.lib.sequence
 
-import com.intellij.debugger.streams.kotlin.psi.impl.KotlinSequenceChainBuilder
+import com.intellij.debugger.streams.kotlin.lib.LibraryUtil
+import com.intellij.debugger.streams.kotlin.psi.sequence.KotlinSequenceChainBuilder
 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
diff --git a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/KotlinSequencesSupport.kt b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/sequence/KotlinSequencesSupport.kt
similarity index 85%
rename from idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/KotlinSequencesSupport.kt
rename to idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/sequence/KotlinSequencesSupport.kt
index f035a8b5ec6..1b6c8acaf61 100644
--- a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/KotlinSequencesSupport.kt
+++ b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/sequence/KotlinSequencesSupport.kt
@@ -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 com.intellij.debugger.streams.kotlin.lib.sequence
 
 import com.intellij.debugger.streams.lib.impl.LibrarySupportBase
 
diff --git a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/impl/KotlinCollectionChainBuilder.kt b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/collections/KotlinCollectionChainBuilder.kt
similarity index 93%
rename from idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/impl/KotlinCollectionChainBuilder.kt
rename to idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/collections/KotlinCollectionChainBuilder.kt
index b645700cb0f..3c8ad7e368b 100644
--- a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/impl/KotlinCollectionChainBuilder.kt
+++ b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/collections/KotlinCollectionChainBuilder.kt
@@ -1,7 +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.impl
+package com.intellij.debugger.streams.kotlin.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.impl.KotlinChainTransformerImpl
 import com.intellij.debugger.streams.kotlin.psi.previousCall
 import com.intellij.debugger.streams.kotlin.psi.receiverType
 import org.jetbrains.kotlin.psi.KtCallExpression
diff --git a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/impl/KotlinCollectionsTypeExtractor.kt b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/collections/KotlinCollectionsTypeExtractor.kt
similarity index 98%
rename from idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/impl/KotlinCollectionsTypeExtractor.kt
rename to idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/collections/KotlinCollectionsTypeExtractor.kt
index 10d7d75b1c7..7342f5e5d12 100644
--- a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/impl/KotlinCollectionsTypeExtractor.kt
+++ b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/collections/KotlinCollectionsTypeExtractor.kt
@@ -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 com.intellij.debugger.streams.kotlin.psi.collections
 
 import com.intellij.debugger.streams.kotlin.psi.CallTypeExtractor
 import com.intellij.debugger.streams.kotlin.psi.CallTypeExtractor.IntermediateCallTypes
diff --git a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/impl/JavaStreamChainTypeExtractor.kt b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/java/JavaStreamChainTypeExtractor.kt
similarity index 97%
rename from idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/impl/JavaStreamChainTypeExtractor.kt
rename to idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/java/JavaStreamChainTypeExtractor.kt
index 107dd0054f9..c1e324142ec 100644
--- a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/impl/JavaStreamChainTypeExtractor.kt
+++ b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/java/JavaStreamChainTypeExtractor.kt
@@ -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 com.intellij.debugger.streams.kotlin.psi.java
 
 import com.intellij.debugger.streams.kotlin.psi.CallTypeExtractor
 import com.intellij.debugger.streams.kotlin.psi.CallTypeExtractor.IntermediateCallTypes
diff --git a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/impl/KotlinJavaStreamChainBuilder.kt b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/java/KotlinJavaStreamChainBuilder.kt
similarity index 92%
rename from idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/impl/KotlinJavaStreamChainBuilder.kt
rename to idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/java/KotlinJavaStreamChainBuilder.kt
index 6695bb08467..025b9e86cfc 100644
--- a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/impl/KotlinJavaStreamChainBuilder.kt
+++ b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/java/KotlinJavaStreamChainBuilder.kt
@@ -1,7 +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.impl
+package com.intellij.debugger.streams.kotlin.psi.java
 
 import com.intellij.debugger.streams.kotlin.psi.StreamCallChecker
+import com.intellij.debugger.streams.kotlin.psi.impl.KotlinChainBuilderBase
+import com.intellij.debugger.streams.kotlin.psi.impl.KotlinChainTransformerImpl
 import com.intellij.debugger.streams.kotlin.psi.previousCall
 import org.jetbrains.kotlin.psi.KtCallExpression
 import java.util.*
diff --git a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/impl/KotlinSequenceChainBuilder.kt b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/sequence/KotlinSequenceChainBuilder.kt
similarity index 73%
rename from idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/impl/KotlinSequenceChainBuilder.kt
rename to idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/sequence/KotlinSequenceChainBuilder.kt
index 7ccdc49ea80..de4a54feb30 100644
--- a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/impl/KotlinSequenceChainBuilder.kt
+++ b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/sequence/KotlinSequenceChainBuilder.kt
@@ -1,5 +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 com.intellij.debugger.streams.kotlin.psi.sequence
+
+import com.intellij.debugger.streams.kotlin.psi.impl.KotlinChainBuilderBase
+import com.intellij.debugger.streams.kotlin.psi.impl.KotlinChainTransformerImpl
 
 /**
  * @author Vitaliy.Bibaev
diff --git a/idea/tests/com/intellij/debugger/streams/kotlin/exec/collection/CollectionTestCase.kt b/idea/tests/com/intellij/debugger/streams/kotlin/exec/collection/CollectionTestCase.kt
index 1410bfa4fc0..fc48e702d42 100644
--- a/idea/tests/com/intellij/debugger/streams/kotlin/exec/collection/CollectionTestCase.kt
+++ b/idea/tests/com/intellij/debugger/streams/kotlin/exec/collection/CollectionTestCase.kt
@@ -2,7 +2,7 @@
 package com.intellij.debugger.streams.kotlin.exec.collection
 
 import com.intellij.debugger.streams.kotlin.exec.KotlinTraceEvaluationTestCase
-import com.intellij.debugger.streams.kotlin.lib.KotlinCollectionSupportProvider
+import com.intellij.debugger.streams.kotlin.lib.collections.KotlinCollectionSupportProvider
 import com.intellij.debugger.streams.lib.LibrarySupportProvider
 
 /**
diff --git a/idea/tests/com/intellij/debugger/streams/kotlin/exec/java/JavaStreamTest.kt b/idea/tests/com/intellij/debugger/streams/kotlin/exec/java/JavaStreamTest.kt
index 16b34e691bb..d4d6f08ee8f 100644
--- a/idea/tests/com/intellij/debugger/streams/kotlin/exec/java/JavaStreamTest.kt
+++ b/idea/tests/com/intellij/debugger/streams/kotlin/exec/java/JavaStreamTest.kt
@@ -2,7 +2,7 @@
 package com.intellij.debugger.streams.kotlin.exec.java
 
 import com.intellij.debugger.streams.kotlin.exec.KotlinTraceEvaluationTestCase
-import com.intellij.debugger.streams.kotlin.lib.JavaStandardLibrarySupportProvider
+import com.intellij.debugger.streams.kotlin.lib.java.JavaStandardLibrarySupportProvider
 import com.intellij.debugger.streams.lib.LibrarySupportProvider
 
 
diff --git a/idea/tests/com/intellij/debugger/streams/kotlin/psi/collection/PositiveCollectionBuildTest.kt b/idea/tests/com/intellij/debugger/streams/kotlin/psi/collection/PositiveCollectionBuildTest.kt
index 02dac02490a..d3c06e70583 100644
--- a/idea/tests/com/intellij/debugger/streams/kotlin/psi/collection/PositiveCollectionBuildTest.kt
+++ b/idea/tests/com/intellij/debugger/streams/kotlin/psi/collection/PositiveCollectionBuildTest.kt
@@ -2,7 +2,7 @@
 package com.intellij.debugger.streams.kotlin.psi.collection
 
 import com.intellij.debugger.streams.kotlin.KotlinPsiChainBuilderTestCase
-import com.intellij.debugger.streams.kotlin.lib.KotlinCollectionSupportProvider
+import com.intellij.debugger.streams.kotlin.lib.collections.KotlinCollectionSupportProvider
 import com.intellij.debugger.streams.wrapper.StreamChainBuilder
 
 /**
diff --git a/idea/tests/com/intellij/debugger/streams/kotlin/psi/collection/TypedCollectionChainTest.kt b/idea/tests/com/intellij/debugger/streams/kotlin/psi/collection/TypedCollectionChainTest.kt
index 6f4d1157a28..f13b624e16c 100644
--- a/idea/tests/com/intellij/debugger/streams/kotlin/psi/collection/TypedCollectionChainTest.kt
+++ b/idea/tests/com/intellij/debugger/streams/kotlin/psi/collection/TypedCollectionChainTest.kt
@@ -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.collection
 
-import com.intellij.debugger.streams.kotlin.lib.KotlinCollectionSupportProvider
+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 com.intellij.debugger.streams.wrapper.StreamChainBuilder
diff --git a/idea/tests/com/intellij/debugger/streams/kotlin/psi/java/NegativeJavaStreamTest.kt b/idea/tests/com/intellij/debugger/streams/kotlin/psi/java/NegativeJavaStreamTest.kt
index f4eb301ea21..f69fb88cb1e 100644
--- a/idea/tests/com/intellij/debugger/streams/kotlin/psi/java/NegativeJavaStreamTest.kt
+++ b/idea/tests/com/intellij/debugger/streams/kotlin/psi/java/NegativeJavaStreamTest.kt
@@ -2,7 +2,7 @@
 package com.intellij.debugger.streams.kotlin.psi.java
 
 import com.intellij.debugger.streams.kotlin.KotlinPsiChainBuilderTestCase
-import com.intellij.debugger.streams.kotlin.lib.JavaStandardLibrarySupportProvider
+import com.intellij.debugger.streams.kotlin.lib.java.JavaStandardLibrarySupportProvider
 import com.intellij.debugger.streams.wrapper.StreamChainBuilder
 
 /**
diff --git a/idea/tests/com/intellij/debugger/streams/kotlin/psi/java/PositiveJavaStreamTest.kt b/idea/tests/com/intellij/debugger/streams/kotlin/psi/java/PositiveJavaStreamTest.kt
index 9c6e3480762..85004d8f17a 100644
--- a/idea/tests/com/intellij/debugger/streams/kotlin/psi/java/PositiveJavaStreamTest.kt
+++ b/idea/tests/com/intellij/debugger/streams/kotlin/psi/java/PositiveJavaStreamTest.kt
@@ -2,7 +2,7 @@
 package com.intellij.debugger.streams.kotlin.psi.java
 
 import com.intellij.debugger.streams.kotlin.KotlinPsiChainBuilderTestCase
-import com.intellij.debugger.streams.kotlin.lib.JavaStandardLibrarySupportProvider
+import com.intellij.debugger.streams.kotlin.lib.java.JavaStandardLibrarySupportProvider
 import com.intellij.debugger.streams.wrapper.StreamChainBuilder
 
 /**
diff --git a/idea/tests/com/intellij/debugger/streams/kotlin/psi/java/PositiveStreamExTest.kt b/idea/tests/com/intellij/debugger/streams/kotlin/psi/java/PositiveStreamExTest.kt
index f4feb0ab21c..256a59f5a2f 100644
--- a/idea/tests/com/intellij/debugger/streams/kotlin/psi/java/PositiveStreamExTest.kt
+++ b/idea/tests/com/intellij/debugger/streams/kotlin/psi/java/PositiveStreamExTest.kt
@@ -3,7 +3,7 @@ package com.intellij.debugger.streams.kotlin.psi.java
 
 import com.intellij.debugger.streams.kotlin.KotlinPsiChainBuilderTestCase
 import com.intellij.debugger.streams.kotlin.LibraryUtil
-import com.intellij.debugger.streams.kotlin.lib.StreamExLibrarySupportProvider
+import com.intellij.debugger.streams.kotlin.lib.java.StreamExLibrarySupportProvider
 import com.intellij.debugger.streams.wrapper.StreamChainBuilder
 import com.intellij.openapi.application.ApplicationManager
 import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess
diff --git a/idea/tests/com/intellij/debugger/streams/kotlin/psi/java/TypedJavaChainTest.kt b/idea/tests/com/intellij/debugger/streams/kotlin/psi/java/TypedJavaChainTest.kt
index 7accb21bb89..dd9fee8ffa3 100644
--- a/idea/tests/com/intellij/debugger/streams/kotlin/psi/java/TypedJavaChainTest.kt
+++ b/idea/tests/com/intellij/debugger/streams/kotlin/psi/java/TypedJavaChainTest.kt
@@ -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.java
 
-import com.intellij.debugger.streams.kotlin.lib.JavaStandardLibrarySupportProvider
+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