From 7726921d075869bc3f46ae00a403efd750c169d3 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Thu, 24 Mar 2016 16:42:22 +0100 Subject: [PATCH] cleanup --- .../debugger/sourcemap/SourceMapDecoder.kt | 20 +++++++------------ .../util/resources/misc/registry.properties | 1 - 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/platform/script-debugger/backend/src/org/jetbrains/debugger/sourcemap/SourceMapDecoder.kt b/platform/script-debugger/backend/src/org/jetbrains/debugger/sourcemap/SourceMapDecoder.kt index 5af5c07aa3b6..1e1784ec8901 100644 --- a/platform/script-debugger/backend/src/org/jetbrains/debugger/sourcemap/SourceMapDecoder.kt +++ b/platform/script-debugger/backend/src/org/jetbrains/debugger/sourcemap/SourceMapDecoder.kt @@ -284,32 +284,26 @@ private fun isSeparator(charIterator: CharSequenceIterator): Boolean { /** * Not mapped to a section in the original source. */ -private open class UnmappedEntry internal constructor(private val line: Int, private val column: Int) : MappingEntry() { - override fun getGeneratedColumn() = column +private open class UnmappedEntry(line: Int, column: Int) : MappingEntry { + override val generatedColumn = column - override fun getGeneratedLine() = line + override val generatedLine = line - override fun getSourceLine() = UNMAPPED + override val sourceLine = UNMAPPED - override fun getSourceColumn() = UNMAPPED + override val sourceColumn = UNMAPPED } /** * Mapped to a section in the original source. */ -private open class UnnamedEntry internal constructor(line: Int, column: Int, private val source: Int, private val sourceLine: Int, private val sourceColumn: Int) : UnmappedEntry(line, column) { - override fun getSource() = source - - override fun getSourceLine() = sourceLine - - override fun getSourceColumn() = sourceColumn +private open class UnnamedEntry(line: Int, column: Int, override val source: Int, override val sourceLine: Int, override val sourceColumn: Int) : UnmappedEntry(line, column) { } /** * Mapped to a section in the original source, and is associated with a name. */ -private class NamedEntry(private val name: String, line: Int, column: Int, source: Int, sourceLine: Int, sourceColumn: Int) : UnnamedEntry(line, column, source, sourceLine, sourceColumn) { - override fun getName() = name +private class NamedEntry(override val name: String, line: Int, column: Int, source: Int, sourceLine: Int, sourceColumn: Int) : UnnamedEntry(line, column, source, sourceLine, sourceColumn) { } // java CharacterIterator is ugly, next() impl, so, we reinvent diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties index 3d527c0747ab..a659d299107a 100644 --- a/platform/util/resources/misc/registry.properties +++ b/platform/util/resources/misc/registry.properties @@ -556,7 +556,6 @@ nodejs.debugger.use.jb.support=true js.debugger.name.mappings.by.source.code=false js.debugger.v8.log= js.debugger.wip.log= -js.debugger.member.filter.prefer.vm.source=false js.index.node.submodules=false