From 1102dc1d0eb56081fdeecc436feab6903d7101df Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Wed, 29 Mar 2023 14:29:37 +0200
Subject: [PATCH] [psi] define common constant expressions types

---
 .../psi/KtCollectionLiteralExpression.java    |  2 +-
 .../jetbrains/kotlin/psi/KtValueArgument.java | 19 +------------------
 .../stubs/elements/KtStubElementTypes.java    | 18 ++++++++++++++++++
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/KtCollectionLiteralExpression.java b/compiler/psi/src/org/jetbrains/kotlin/psi/KtCollectionLiteralExpression.java
index cb1737f7ad6..2f1c6af4b07 100644
--- a/compiler/psi/src/org/jetbrains/kotlin/psi/KtCollectionLiteralExpression.java
+++ b/compiler/psi/src/org/jetbrains/kotlin/psi/KtCollectionLiteralExpression.java
@@ -65,7 +65,7 @@ public class KtCollectionLiteralExpression extends KtElementImplStub<KotlinColle
     public List<KtExpression> getInnerExpressions() {
         KotlinCollectionLiteralExpressionStub stub = getStub();
         if (stub != null) {
-            return Arrays.asList(stub.getChildrenByType(KtValueArgument.CONSTANT_EXPRESSIONS_TYPES, KtExpression.EMPTY_ARRAY));
+            return Arrays.asList(stub.getChildrenByType(KtStubElementTypes.CONSTANT_EXPRESSIONS_TYPES, KtExpression.EMPTY_ARRAY));
         }
         return PsiTreeUtil.getChildrenOfTypeAsList(this, KtExpression.class);
     }
diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/KtValueArgument.java b/compiler/psi/src/org/jetbrains/kotlin/psi/KtValueArgument.java
index 7a5b3ca1c73..26091c30e68 100644
--- a/compiler/psi/src/org/jetbrains/kotlin/psi/KtValueArgument.java
+++ b/compiler/psi/src/org/jetbrains/kotlin/psi/KtValueArgument.java
@@ -46,23 +46,6 @@ public class KtValueArgument extends KtElementImplStub<KotlinValueArgumentStub<?
         return visitor.visitArgument(this, data);
     }
 
-    public static final TokenSet CONSTANT_EXPRESSIONS_TYPES = TokenSet.create(
-            KtStubElementTypes.NULL,
-            KtStubElementTypes.BOOLEAN_CONSTANT,
-            KtStubElementTypes.FLOAT_CONSTANT,
-            KtStubElementTypes.CHARACTER_CONSTANT,
-            KtStubElementTypes.INTEGER_CONSTANT,
-
-            KtStubElementTypes.REFERENCE_EXPRESSION,
-            KtStubElementTypes.DOT_QUALIFIED_EXPRESSION,
-
-            KtStubElementTypes.STRING_TEMPLATE,
-
-            KtStubElementTypes.CLASS_LITERAL_EXPRESSION,
-
-            KtStubElementTypes.COLLECTION_LITERAL_EXPRESSION
-    );
-
     private static final TokenSet STRING_TEMPLATE_EXPRESSIONS_TYPES = TokenSet.create(
             KtStubElementTypes.STRING_TEMPLATE
     );
@@ -72,7 +55,7 @@ public class KtValueArgument extends KtElementImplStub<KotlinValueArgumentStub<?
     public KtExpression getArgumentExpression() {
         KotlinPlaceHolderStub<? extends KtValueArgument> stub = getStub();
         if (stub != null) {
-            KtExpression[] constantExpressions = stub.getChildrenByType(CONSTANT_EXPRESSIONS_TYPES, KtExpression.EMPTY_ARRAY);
+            KtExpression[] constantExpressions = stub.getChildrenByType(KtStubElementTypes.CONSTANT_EXPRESSIONS_TYPES, KtExpression.EMPTY_ARRAY);
             if (constantExpressions.length != 0) {
                 return constantExpressions[0];
             }
diff --git a/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/elements/KtStubElementTypes.java b/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/elements/KtStubElementTypes.java
index 4497d686170..51adc5c4872 100644
--- a/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/elements/KtStubElementTypes.java
+++ b/compiler/psi/src/org/jetbrains/kotlin/psi/stubs/elements/KtStubElementTypes.java
@@ -16,6 +16,7 @@
 
 package org.jetbrains.kotlin.psi.stubs.elements;
 
+import com.intellij.psi.tree.TokenSet;
 import org.jetbrains.kotlin.psi.*;
 
 public interface KtStubElementTypes {
@@ -165,6 +166,23 @@ public interface KtStubElementTypes {
     KtPlaceHolderStubElementType<KtStringTemplateExpression> STRING_TEMPLATE =
             new KtStringTemplateExpressionElementType("STRING_TEMPLATE");
 
+    TokenSet CONSTANT_EXPRESSIONS_TYPES = TokenSet.create(
+            NULL,
+            BOOLEAN_CONSTANT,
+            FLOAT_CONSTANT,
+            CHARACTER_CONSTANT,
+            INTEGER_CONSTANT,
+
+            REFERENCE_EXPRESSION,
+            DOT_QUALIFIED_EXPRESSION,
+
+            STRING_TEMPLATE,
+
+            CLASS_LITERAL_EXPRESSION,
+
+            COLLECTION_LITERAL_EXPRESSION
+    );
+
     KtPlaceHolderWithTextStubElementType<KtBlockStringTemplateEntry> LONG_STRING_TEMPLATE_ENTRY =
             new KtPlaceHolderWithTextStubElementType<>("LONG_STRING_TEMPLATE_ENTRY", KtBlockStringTemplateEntry.class);