From 2abe15ffda908f48e2354444273162d8fe077e92 Mon Sep 17 00:00:00 2001 From: Yuriy Artamonov Date: Tue, 28 Jun 2022 10:36:57 +0200 Subject: [PATCH] [jsonpath] IDEA-295978 Do not load JsonPathTypes class eagerly on parser definition load GitOrigin-RevId: bb3479db8368ba4c8df19e1a26e7cf5aa3ff66c8 --- .../intellij/jsonpath/psi/JsonPathParserDefinition.java | 8 +++----- json/src/com/intellij/jsonpath/psi/JsonPathTokenSets.java | 4 ++++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/json/src/com/intellij/jsonpath/psi/JsonPathParserDefinition.java b/json/src/com/intellij/jsonpath/psi/JsonPathParserDefinition.java index a01b2be0bf33..b6b87383580c 100644 --- a/json/src/com/intellij/jsonpath/psi/JsonPathParserDefinition.java +++ b/json/src/com/intellij/jsonpath/psi/JsonPathParserDefinition.java @@ -16,12 +16,10 @@ import com.intellij.psi.tree.IFileElementType; import com.intellij.psi.tree.TokenSet; import org.jetbrains.annotations.NotNull; +import static com.intellij.jsonpath.psi.JsonPathTokenSets.JSONPATH_STRINGS_SET; + public final class JsonPathParserDefinition implements ParserDefinition { public static final IFileElementType FILE = new IFileElementType(JsonPathLanguage.INSTANCE); - public static final TokenSet STRINGS = TokenSet.create( - JsonPathTypes.SINGLE_QUOTED_STRING, - JsonPathTypes.DOUBLE_QUOTED_STRING - ); @Override public @NotNull Lexer createLexer(Project project) { @@ -50,7 +48,7 @@ public final class JsonPathParserDefinition implements ParserDefinition { @Override public @NotNull TokenSet getStringLiteralElements() { - return STRINGS; + return JSONPATH_STRINGS_SET; } @Override diff --git a/json/src/com/intellij/jsonpath/psi/JsonPathTokenSets.java b/json/src/com/intellij/jsonpath/psi/JsonPathTokenSets.java index 666e4781bc9f..7125b8c5d047 100644 --- a/json/src/com/intellij/jsonpath/psi/JsonPathTokenSets.java +++ b/json/src/com/intellij/jsonpath/psi/JsonPathTokenSets.java @@ -6,6 +6,10 @@ import com.intellij.psi.tree.TokenSet; public final class JsonPathTokenSets { private JsonPathTokenSets() { } + public static final TokenSet JSONPATH_STRINGS_SET = TokenSet.create( + JsonPathTypes.SINGLE_QUOTED_STRING, + JsonPathTypes.DOUBLE_QUOTED_STRING + ); public static final TokenSet JSONPATH_DOT_NAVIGATION_SET = TokenSet.create(JsonPathTypes.DOT, JsonPathTypes.RECURSIVE_DESCENT); public static final TokenSet JSONPATH_EQUALITY_OPERATOR_SET = TokenSet.create( JsonPathTypes.EQ_OP,