From 55055ce3aaf20b6940ab418adcc5444aecb9bfa3 Mon Sep 17 00:00:00 2001 From: "Vitaliy.Bibaev" Date: Wed, 15 Aug 2018 15:32:28 +0300 Subject: [PATCH] Remove redundant LibraryUtil.kt --- .../kotlin/idea/debugger/sequence/lib/LibraryUtil.kt | 9 --------- .../lib/collections/KotlinCollectionSupportProvider.kt | 4 ++-- .../lib/java/JavaStandardLibrarySupportProvider.kt | 4 ++-- .../sequence/lib/java/StreamExLibrarySupportProvider.kt | 4 ++-- .../lib/sequence/KotlinSequenceSupportProvider.kt | 4 ++-- 5 files changed, 8 insertions(+), 17 deletions(-) delete mode 100644 idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/LibraryUtil.kt diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/LibraryUtil.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/LibraryUtil.kt deleted file mode 100644 index 5483ac7fd59..00000000000 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/LibraryUtil.kt +++ /dev/null @@ -1,9 +0,0 @@ -// 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 org.jetbrains.kotlin.idea.debugger.sequence.lib - -/** - * @author Vitaliy.Bibaev - */ -object LibraryUtil { - const val KOTLIN_LANGUAGE_ID = "kotlin" -} \ No newline at end of file diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/collections/KotlinCollectionSupportProvider.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/collections/KotlinCollectionSupportProvider.kt index 310d6d90126..88176aad66f 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/collections/KotlinCollectionSupportProvider.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/collections/KotlinCollectionSupportProvider.kt @@ -7,7 +7,7 @@ import com.intellij.debugger.streams.trace.TraceExpressionBuilder import com.intellij.debugger.streams.trace.dsl.impl.DslImpl import com.intellij.debugger.streams.wrapper.StreamChainBuilder import com.intellij.openapi.project.Project -import org.jetbrains.kotlin.idea.debugger.sequence.lib.LibraryUtil +import org.jetbrains.kotlin.idea.KotlinLanguage 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 @@ -23,7 +23,7 @@ class KotlinCollectionSupportProvider : LibrarySupportProvider { val dsl = DslImpl(KotlinStatementFactory(KotlinCollectionsPeekCallFactory())) } - override fun getLanguageId(): String = LibraryUtil.KOTLIN_LANGUAGE_ID + override fun getLanguageId(): String = KotlinLanguage.INSTANCE.id override fun getChainBuilder(): StreamChainBuilder = builder diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/java/JavaStandardLibrarySupportProvider.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/java/JavaStandardLibrarySupportProvider.kt index 013483c5a18..b6ec405fc8b 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/java/JavaStandardLibrarySupportProvider.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/java/JavaStandardLibrarySupportProvider.kt @@ -8,7 +8,7 @@ import com.intellij.debugger.streams.trace.TraceExpressionBuilder import com.intellij.debugger.streams.trace.dsl.impl.DslImpl import com.intellij.debugger.streams.wrapper.StreamChainBuilder import com.intellij.openapi.project.Project -import org.jetbrains.kotlin.idea.debugger.sequence.lib.LibraryUtil +import org.jetbrains.kotlin.idea.KotlinLanguage 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 @@ -30,7 +30,7 @@ class JavaStandardLibrarySupportProvider : LibrarySupportProvider { val dsl = DslImpl(KotlinStatementFactory(JavaPeekCallFactory())) } - override fun getLanguageId(): String = LibraryUtil.KOTLIN_LANGUAGE_ID + override fun getLanguageId(): String = KotlinLanguage.INSTANCE.id override fun getChainBuilder(): StreamChainBuilder = builder diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/java/StreamExLibrarySupportProvider.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/java/StreamExLibrarySupportProvider.kt index 9a07afb27c0..b56a020396b 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/java/StreamExLibrarySupportProvider.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/java/StreamExLibrarySupportProvider.kt @@ -8,7 +8,7 @@ import com.intellij.debugger.streams.trace.TraceExpressionBuilder import com.intellij.debugger.streams.trace.dsl.impl.DslImpl import com.intellij.debugger.streams.wrapper.StreamChainBuilder import com.intellij.openapi.project.Project -import org.jetbrains.kotlin.idea.debugger.sequence.lib.LibraryUtil +import org.jetbrains.kotlin.idea.KotlinLanguage 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 @@ -31,7 +31,7 @@ class StreamExLibrarySupportProvider : LibrarySupportProvider { val expressionBuilder = KotlinTraceExpressionBuilder(dsl, support.createHandlerFactory(dsl)) } - override fun getLanguageId(): String = LibraryUtil.KOTLIN_LANGUAGE_ID + override fun getLanguageId(): String = KotlinLanguage.INSTANCE.id override fun getChainBuilder(): StreamChainBuilder = streamChainBuilder diff --git a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/sequence/KotlinSequenceSupportProvider.kt b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/sequence/KotlinSequenceSupportProvider.kt index 0eb46e36127..f773cb8da24 100644 --- a/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/sequence/KotlinSequenceSupportProvider.kt +++ b/idea/idea-jvm/src/org/jetbrains/kotlin/idea/debugger/sequence/lib/sequence/KotlinSequenceSupportProvider.kt @@ -7,7 +7,7 @@ import com.intellij.debugger.streams.trace.TraceExpressionBuilder import com.intellij.debugger.streams.trace.dsl.impl.DslImpl import com.intellij.debugger.streams.wrapper.StreamChainBuilder import com.intellij.openapi.project.Project -import org.jetbrains.kotlin.idea.debugger.sequence.lib.LibraryUtil +import org.jetbrains.kotlin.idea.KotlinLanguage 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 @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.KotlinTraceExpress * @author Vitaliy.Bibaev */ class KotlinSequenceSupportProvider : LibrarySupportProvider { - override fun getLanguageId(): String = LibraryUtil.KOTLIN_LANGUAGE_ID + override fun getLanguageId(): String = KotlinLanguage.INSTANCE.id private companion object { val builder: StreamChainBuilder = TerminatedChainBuilder(