From 25b174b8f7921ac45b3171b9f6f8b59db4fe5faa Mon Sep 17 00:00:00 2001 From: "Vitaliy.Bibaev" Date: Thu, 19 Oct 2017 10:42:32 +0300 Subject: [PATCH] Minor: optimize imports --- .../streams/kotlin/psi/impl/KotlinChainTransformerImpl.kt | 4 +--- .../streams/kotlin/psi/impl/KotlinCollectionChainBuilder.kt | 2 -- .../streams/kotlin/psi/impl/KotlinSequenceChainBuilder.kt | 2 -- .../debugger/streams/kotlin/trace/dsl/KotlinArrayVariable.kt | 1 - .../debugger/streams/kotlin/trace/dsl/KotlinForEachLoop.kt | 5 ++++- .../debugger/streams/kotlin/trace/dsl/KotlinForLoop.kt | 5 ++++- .../debugger/streams/kotlin/trace/dsl/KotlinForLoopBody.kt | 5 ++++- .../debugger/streams/kotlin/trace/dsl/KotlinLambdaBody.kt | 1 - .../debugger/streams/kotlin/trace/dsl/KotlinListVariable.kt | 1 - .../debugger/streams/kotlin/KotlinPsiChainBuilderTestCase.kt | 1 - 10 files changed, 13 insertions(+), 14 deletions(-) diff --git a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/impl/KotlinChainTransformerImpl.kt b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/impl/KotlinChainTransformerImpl.kt index 784aa54d892..47c12fc6733 100644 --- a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/impl/KotlinChainTransformerImpl.kt +++ b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/psi/impl/KotlinChainTransformerImpl.kt @@ -16,11 +16,9 @@ package com.intellij.debugger.streams.kotlin.psi.impl import com.intellij.debugger.streams.kotlin.psi.callName -import com.intellij.debugger.streams.kotlin.psi.getPackage -import com.intellij.debugger.streams.kotlin.psi.receiverType import com.intellij.debugger.streams.kotlin.psi.resolveType -import com.intellij.debugger.streams.psi.* import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinTypes +import com.intellij.debugger.streams.psi.ChainTransformer import com.intellij.debugger.streams.wrapper.CallArgument import com.intellij.debugger.streams.wrapper.IntermediateStreamCall import com.intellij.debugger.streams.wrapper.StreamChain 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/impl/KotlinCollectionChainBuilder.kt index d64230f15a4..143e58eb3e3 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/impl/KotlinCollectionChainBuilder.kt @@ -15,8 +15,6 @@ */ package com.intellij.debugger.streams.kotlin.psi.impl -import com.intellij.debugger.streams.kotlin.psi.impl.KotlinChainBuilderBase - /** * @author Vitaliy.Bibaev */ 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/impl/KotlinSequenceChainBuilder.kt index 3659ab152c5..f8144956752 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/impl/KotlinSequenceChainBuilder.kt @@ -15,8 +15,6 @@ */ package com.intellij.debugger.streams.kotlin.psi.impl -import com.intellij.debugger.streams.kotlin.psi.impl.KotlinChainBuilderBase - /** * @author Vitaliy.Bibaev */ diff --git a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/dsl/KotlinArrayVariable.kt b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/dsl/KotlinArrayVariable.kt index 2d9fec262e1..2f28f1d7c6b 100644 --- a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/dsl/KotlinArrayVariable.kt +++ b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/dsl/KotlinArrayVariable.kt @@ -15,7 +15,6 @@ */ package com.intellij.debugger.streams.kotlin.trace.dsl -import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinVariableDeclaration import com.intellij.debugger.streams.trace.dsl.ArrayVariable import com.intellij.debugger.streams.trace.dsl.Expression import com.intellij.debugger.streams.trace.dsl.VariableDeclaration diff --git a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/dsl/KotlinForEachLoop.kt b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/dsl/KotlinForEachLoop.kt index f2aab4b7478..e7a20f285d0 100644 --- a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/dsl/KotlinForEachLoop.kt +++ b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/dsl/KotlinForEachLoop.kt @@ -15,7 +15,10 @@ */ package com.intellij.debugger.streams.kotlin.trace.dsl -import com.intellij.debugger.streams.trace.dsl.* +import com.intellij.debugger.streams.trace.dsl.Convertable +import com.intellij.debugger.streams.trace.dsl.Expression +import com.intellij.debugger.streams.trace.dsl.ForLoopBody +import com.intellij.debugger.streams.trace.dsl.Variable /** * @author Vitaliy.Bibaev diff --git a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/dsl/KotlinForLoop.kt b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/dsl/KotlinForLoop.kt index 80f172bd6b7..e687de15dce 100644 --- a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/dsl/KotlinForLoop.kt +++ b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/dsl/KotlinForLoop.kt @@ -15,7 +15,10 @@ */ package com.intellij.debugger.streams.kotlin.trace.dsl -import com.intellij.debugger.streams.trace.dsl.* +import com.intellij.debugger.streams.trace.dsl.Convertable +import com.intellij.debugger.streams.trace.dsl.Expression +import com.intellij.debugger.streams.trace.dsl.ForLoopBody +import com.intellij.debugger.streams.trace.dsl.VariableDeclaration /** * @author Vitaliy.Bibaev diff --git a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/dsl/KotlinForLoopBody.kt b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/dsl/KotlinForLoopBody.kt index 9861e2cc1ab..e25913e0ea0 100644 --- a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/dsl/KotlinForLoopBody.kt +++ b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/dsl/KotlinForLoopBody.kt @@ -15,7 +15,10 @@ */ package com.intellij.debugger.streams.kotlin.trace.dsl -import com.intellij.debugger.streams.trace.dsl.* +import com.intellij.debugger.streams.trace.dsl.Expression +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 /** diff --git a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/dsl/KotlinLambdaBody.kt b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/dsl/KotlinLambdaBody.kt index 5bc374e5d8c..791d41e8ccc 100644 --- a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/dsl/KotlinLambdaBody.kt +++ b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/dsl/KotlinLambdaBody.kt @@ -15,7 +15,6 @@ */ package com.intellij.debugger.streams.kotlin.trace.dsl -import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinCodeBlock import com.intellij.debugger.streams.trace.dsl.Expression import com.intellij.debugger.streams.trace.dsl.LambdaBody import com.intellij.debugger.streams.trace.dsl.StatementFactory diff --git a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/dsl/KotlinListVariable.kt b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/dsl/KotlinListVariable.kt index 98faf643e3a..1a63b61f3f2 100644 --- a/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/dsl/KotlinListVariable.kt +++ b/idea/idea-jvm/src/com/intellij/debugger/streams/kotlin/trace/dsl/KotlinListVariable.kt @@ -15,7 +15,6 @@ */ package com.intellij.debugger.streams.kotlin.trace.dsl -import com.intellij.debugger.streams.kotlin.trace.dsl.KotlinVariableDeclaration import com.intellij.debugger.streams.trace.dsl.Expression import com.intellij.debugger.streams.trace.dsl.ListVariable import com.intellij.debugger.streams.trace.dsl.VariableDeclaration diff --git a/idea/tests/com/intellij/debugger/streams/kotlin/KotlinPsiChainBuilderTestCase.kt b/idea/tests/com/intellij/debugger/streams/kotlin/KotlinPsiChainBuilderTestCase.kt index fe794fa764e..e9bf9a41ce2 100644 --- a/idea/tests/com/intellij/debugger/streams/kotlin/KotlinPsiChainBuilderTestCase.kt +++ b/idea/tests/com/intellij/debugger/streams/kotlin/KotlinPsiChainBuilderTestCase.kt @@ -4,7 +4,6 @@ import com.intellij.debugger.streams.test.StreamChainBuilderTestCase import com.intellij.debugger.streams.wrapper.StreamChain import com.intellij.debugger.streams.wrapper.StreamChainBuilder import com.intellij.openapi.projectRoots.Sdk -import com.intellij.pom.java.LanguageLevel import junit.framework.TestCase import java.io.File import java.nio.file.Paths