From 416b15e42bf138d80cea59a0335947cbb2a6bd6c Mon Sep 17 00:00:00 2001 From: "Vitaliy.Bibaev" Date: Wed, 20 Dec 2017 15:53:28 +0300 Subject: [PATCH] Minor: move KotlinJavaStreamChainBuilder to the 'impl' package --- .../kotlin/lib/java/JavaStandardLibrarySupportProvider.kt | 2 +- .../kotlin/lib/java/StreamExLibrarySupportProvider.kt | 2 +- .../psi/{java => impl}/KotlinJavaStreamChainBuilder.kt | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) rename idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/{java => impl}/KotlinJavaStreamChainBuilder.kt (92%) diff --git a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/java/JavaStandardLibrarySupportProvider.kt b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/java/JavaStandardLibrarySupportProvider.kt index 285e1ad97e0..db67ff57e27 100644 --- a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/java/JavaStandardLibrarySupportProvider.kt +++ b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/java/JavaStandardLibrarySupportProvider.kt @@ -2,7 +2,7 @@ package com.intellij.debugger.streams.kotlin.lib.java 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.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/java/StreamExLibrarySupportProvider.kt b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/java/StreamExLibrarySupportProvider.kt index d9f7a37173d..e5a7b0028d0 100644 --- a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/java/StreamExLibrarySupportProvider.kt +++ b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/lib/java/StreamExLibrarySupportProvider.kt @@ -2,7 +2,7 @@ package com.intellij.debugger.streams.kotlin.lib.java 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.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/psi/java/KotlinJavaStreamChainBuilder.kt b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/impl/KotlinJavaStreamChainBuilder.kt similarity index 92% rename from idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/java/KotlinJavaStreamChainBuilder.kt rename to idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/impl/KotlinJavaStreamChainBuilder.kt index 025b9e86cfc..673aaf348ee 100644 --- a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/java/KotlinJavaStreamChainBuilder.kt +++ b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/impl/KotlinJavaStreamChainBuilder.kt @@ -1,9 +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 com.intellij.debugger.streams.kotlin.psi.impl 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.java.JavaStreamChainTypeExtractor import com.intellij.debugger.streams.kotlin.psi.previousCall import org.jetbrains.kotlin.psi.KtCallExpression import java.util.*