From b90ce009a01cbd2d1572ccad608d87c118d9fe83 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 10 Oct 2019 18:18:01 +0200 Subject: [PATCH] Remove unnecessary cache of ExtendWordSelectionHandlers GitOrigin-RevId: d7cd85ff148cecbf6fe8f80123c6a6670618accd --- .../editorActions/SelectWordUtil.java | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/SelectWordUtil.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/SelectWordUtil.java index 69142b01db1f..6a12613f482c 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/SelectWordUtil.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/SelectWordUtil.java @@ -14,7 +14,6 @@ import com.intellij.psi.FileViewProvider; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.StringEscapesTokenTypes; -import com.intellij.util.ArrayUtil; import com.intellij.util.Processor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -26,24 +25,9 @@ import java.util.List; * @author Mike */ public class SelectWordUtil { - private static ExtendWordSelectionHandler[] SELECTIONERS = new ExtendWordSelectionHandler[]{ - }; - - private static boolean ourExtensionsLoaded = false; - private SelectWordUtil() { } - static ExtendWordSelectionHandler[] getExtendWordSelectionHandlers() { - if (!ourExtensionsLoaded) { - ourExtensionsLoaded = true; - for (ExtendWordSelectionHandler handler : ExtendWordSelectionHandler.EP_NAME.getExtensionList()) { - SELECTIONERS = ArrayUtil.append(SELECTIONERS, handler); - } - } - return SELECTIONERS; - } - public static final CharCondition JAVA_IDENTIFIER_PART_CONDITION = ch -> Character.isJavaIdentifierPart(ch); public static void addWordSelection(boolean camel, CharSequence editorText, int cursorOffset, @NotNull List ranges) { @@ -216,7 +200,7 @@ public class SelectWordUtil { @NotNull CharSequence text, int cursorOffset, @NotNull Editor editor) { - ExtendWordSelectionHandler[] extendWordSelectionHandlers = getExtendWordSelectionHandlers(); + ExtendWordSelectionHandler[] extendWordSelectionHandlers = ExtendWordSelectionHandler.EP_NAME.getExtensions(); int minimalTextRangeLength = 0; List availableSelectioners = new LinkedList<>(); for (ExtendWordSelectionHandler selectioner : extendWordSelectionHandlers) {