Remove redundant LibraryUtil.kt

This commit is contained in:
Vitaliy.Bibaev
2018-08-15 15:32:28 +03:00
committed by Yan Zhulanow
parent c1ebc2788d
commit 55055ce3aa
5 changed files with 8 additions and 17 deletions
@@ -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"
}
@@ -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.trace.dsl.impl.DslImpl
import com.intellij.debugger.streams.wrapper.StreamChainBuilder import com.intellij.debugger.streams.wrapper.StreamChainBuilder
import com.intellij.openapi.project.Project 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.psi.collections.KotlinCollectionChainBuilder
import org.jetbrains.kotlin.idea.debugger.sequence.trace.dsl.KotlinCollectionsPeekCallFactory 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.dsl.KotlinStatementFactory
@@ -23,7 +23,7 @@ class KotlinCollectionSupportProvider : LibrarySupportProvider {
val dsl = DslImpl(KotlinStatementFactory(KotlinCollectionsPeekCallFactory())) 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 override fun getChainBuilder(): StreamChainBuilder = builder
@@ -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.trace.dsl.impl.DslImpl
import com.intellij.debugger.streams.wrapper.StreamChainBuilder import com.intellij.debugger.streams.wrapper.StreamChainBuilder
import com.intellij.openapi.project.Project 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.KotlinChainTransformerImpl
import org.jetbrains.kotlin.idea.debugger.sequence.psi.impl.PackageBasedCallChecker 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.impl.TerminatedChainBuilder
@@ -30,7 +30,7 @@ class JavaStandardLibrarySupportProvider : LibrarySupportProvider {
val dsl = DslImpl(KotlinStatementFactory(JavaPeekCallFactory())) 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 override fun getChainBuilder(): StreamChainBuilder = builder
@@ -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.trace.dsl.impl.DslImpl
import com.intellij.debugger.streams.wrapper.StreamChainBuilder import com.intellij.debugger.streams.wrapper.StreamChainBuilder
import com.intellij.openapi.project.Project 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.KotlinChainTransformerImpl
import org.jetbrains.kotlin.idea.debugger.sequence.psi.impl.PackageBasedCallChecker 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.impl.TerminatedChainBuilder
@@ -31,7 +31,7 @@ class StreamExLibrarySupportProvider : LibrarySupportProvider {
val expressionBuilder = KotlinTraceExpressionBuilder(dsl, support.createHandlerFactory(dsl)) 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 override fun getChainBuilder(): StreamChainBuilder = streamChainBuilder
@@ -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.trace.dsl.impl.DslImpl
import com.intellij.debugger.streams.wrapper.StreamChainBuilder import com.intellij.debugger.streams.wrapper.StreamChainBuilder
import com.intellij.openapi.project.Project 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.KotlinChainTransformerImpl
import org.jetbrains.kotlin.idea.debugger.sequence.psi.impl.TerminatedChainBuilder 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.SequenceCallChecker
@@ -20,7 +20,7 @@ import org.jetbrains.kotlin.idea.debugger.sequence.trace.impl.KotlinTraceExpress
* @author Vitaliy.Bibaev * @author Vitaliy.Bibaev
*/ */
class KotlinSequenceSupportProvider : LibrarySupportProvider { class KotlinSequenceSupportProvider : LibrarySupportProvider {
override fun getLanguageId(): String = LibraryUtil.KOTLIN_LANGUAGE_ID override fun getLanguageId(): String = KotlinLanguage.INSTANCE.id
private companion object { private companion object {
val builder: StreamChainBuilder = TerminatedChainBuilder( val builder: StreamChainBuilder = TerminatedChainBuilder(