From ed49e504b6ecefb4d7d52193c497615f9bb6f6a0 Mon Sep 17 00:00:00 2001 From: Alexey Merkulov Date: Fri, 25 May 2018 17:33:30 +0300 Subject: [PATCH] Fixed possible assertion fail Removed premature optimization --- .../structureView/DuplicatedPsiTreeElementBase.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/plugins/yaml/src/org/jetbrains/yaml/structureView/DuplicatedPsiTreeElementBase.java b/plugins/yaml/src/org/jetbrains/yaml/structureView/DuplicatedPsiTreeElementBase.java index 2798cf9051d0..18be37dcdbc5 100644 --- a/plugins/yaml/src/org/jetbrains/yaml/structureView/DuplicatedPsiTreeElementBase.java +++ b/plugins/yaml/src/org/jetbrains/yaml/structureView/DuplicatedPsiTreeElementBase.java @@ -5,7 +5,6 @@ import com.intellij.ide.structureView.StructureViewTreeElement; import com.intellij.ide.structureView.impl.common.PsiTreeElementBase; import com.intellij.ide.util.treeView.AbstractTreeUi; import com.intellij.ide.util.treeView.NodeDescriptorProvidingKey; -import com.intellij.ide.util.treeView.TreeAnchorizer; import com.intellij.navigation.ItemPresentation; import com.intellij.pom.Navigatable; import com.intellij.psi.PsiElement; @@ -120,21 +119,19 @@ abstract class DuplicatedPsiTreeElementBase /** This class is a wrapper over PSI element with additional information */ private static class StoredData implements Navigatable { @NotNull - private final Object myAnchor; + private final T myElement; + @NotNull private final String myDetails; public StoredData(@NotNull T element, @NotNull String details) { - myAnchor = TreeAnchorizer.getService().createAnchor(element); + myElement = element; myDetails = details; } @NotNull public T getElement() { - @SuppressWarnings("unchecked") - T element = (T)TreeAnchorizer.getService().retrieveElement(myAnchor); - assert element != null; - return element; + return myElement; } @NotNull