From 8508e2cc5f3dbb355436fcbbb5667eb4c20884be Mon Sep 17 00:00:00 2001 From: Sergey Malenkov Date: Tue, 20 Dec 2016 21:26:15 +0300 Subject: [PATCH] allows null key key for the root node --- .../src/com/intellij/ui/tree/MapBasedTree.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ui/tree/MapBasedTree.java b/platform/platform-impl/src/com/intellij/ui/tree/MapBasedTree.java index 4dcdebf431cb..64a8876c4b9a 100644 --- a/platform/platform-impl/src/com/intellij/ui/tree/MapBasedTree.java +++ b/platform/platform-impl/src/com/intellij/ui/tree/MapBasedTree.java @@ -79,17 +79,15 @@ public final class MapBasedTree { public boolean updateRoot(N node) { if (node == (root == null ? null : root.node)) return false; - K key = getKey(node); - Entry entry = null; - if (key != null) { - entry = new Entry<>(null, node); - } - else if (root == null) { - return false; - } - root = entry; map.clear(); - if (key != null) map.put(key, entry); + if (node == null) { + root = null; + } + else { + root = new Entry<>(null, node); + K key = keyFunction.apply(node); + if (key != null) map.put(key, root); + } return true; }