Commit 37a7c0ed authored by Viktor Shatrov's avatar Viktor Shatrov Committed by intellij-monorepo-bot
Browse files

WEB-39670 Take into account object properties sorting option

(cherry picked from commit ee14f414b9f523e215c13c263aed70e703f25ec2)

GitOrigin-RevId: aafa5bb9d387a05d5bdd5c58b70aac812ffd5e1e
parent a80c6bc8
Branches unavailable Tags unavailable
No related merge requests found
Showing with 11 additions and 6 deletions
+11 -6
......@@ -19,6 +19,7 @@ import com.intellij.openapi.util.text.StringUtil
import com.intellij.util.SmartList
import com.intellij.xdebugger.frame.XCompositeNode
import com.intellij.xdebugger.frame.XValueChildrenList
import com.intellij.xdebugger.settings.XDebuggerSettingsManager
import org.jetbrains.concurrency.Obsolescent
import org.jetbrains.concurrency.Promise
import org.jetbrains.concurrency.then
......@@ -75,12 +76,14 @@ fun processScopeVariables(scope: Scope,
addAditionalVariables(additionalVariables, properties, memberFilter)
val comparator = if (memberFilter.hasNameMappings()) Comparator { o1, o2 ->
naturalCompare(memberFilter.rawNameToSource(o1), memberFilter.rawNameToSource(o2))
if (XDebuggerSettingsManager.getInstance().dataViewSettings.isSortValues) {
val comparator = if (memberFilter.hasNameMappings()) Comparator { o1, o2 ->
naturalCompare(memberFilter.rawNameToSource(o1), memberFilter.rawNameToSource(o2))
}
else NATURAL_NAME_COMPARATOR
properties.sortWith(comparator)
functions.sortWith(comparator)
}
else NATURAL_NAME_COMPARATOR
properties.sortWith(comparator)
functions.sortWith(comparator)
if (!properties.isEmpty()) {
node.addChildren(createVariablesList(properties, context, memberFilter), functions.isEmpty() && isLast)
......@@ -133,7 +136,9 @@ fun filterAndSort(variables: List<Variable>, memberFilter: MemberFilter): List<V
result.add(variable)
}
}
result.sortWith(NATURAL_NAME_COMPARATOR)
if (XDebuggerSettingsManager.getInstance().dataViewSettings.isSortValues) {
result.sortWith(NATURAL_NAME_COMPARATOR)
}
addAditionalVariables(additionalVariables, result, memberFilter)
return result
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment