Store presence of spread operator for value argument in stubs

compiler/psi/src/org/jetbrains/kotlin/psi/KtLambdaArgument.kt

@@ -6,13 +6,13 @@
 package org.jetbrains.kotlin.psi
 
 import com.intellij.lang.ASTNode
-import org.jetbrains.kotlin.psi.stubs.KotlinPlaceHolderStub
+import org.jetbrains.kotlin.psi.stubs.KotlinValueArgumentStub
 import org.jetbrains.kotlin.psi.stubs.elements.KtStubElementTypes
 
 class KtLambdaArgument : KtValueArgument, LambdaArgument {
-    constructor(node: ASTNode) : super(node) {}
+    constructor(node: ASTNode) : super(node)
 
-    constructor(stub: KotlinPlaceHolderStub<KtLambdaArgument>) : super(stub, KtStubElementTypes.LAMBDA_ARGUMENT) {}
+    constructor(stub: KotlinValueArgumentStub<KtLambdaArgument>) : super(stub, KtStubElementTypes.LAMBDA_ARGUMENT) {}
 
     override fun getLambdaExpression(): KtLambdaExpression? = getArgumentExpression()?.unpackFunctionLiteral()
 }

compiler/psi/src/org/jetbrains/kotlin/psi/KtValueArgument.java

@@ -19,24 +19,25 @@ package org.jetbrains.kotlin.psi;
 import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.impl.source.tree.LeafPsiElement;
+import com.intellij.psi.stubs.IStubElementType;
 import com.intellij.psi.tree.TokenSet;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.lexer.KtTokens;
 import org.jetbrains.kotlin.psi.stubs.KotlinPlaceHolderStub;
-import org.jetbrains.kotlin.psi.stubs.elements.KtPlaceHolderStubElementType;
+import org.jetbrains.kotlin.psi.stubs.KotlinValueArgumentStub;
 import org.jetbrains.kotlin.psi.stubs.elements.KtStubElementTypes;
 
-public class KtValueArgument extends KtElementImplStub<KotlinPlaceHolderStub<? extends KtValueArgument>> implements ValueArgument {
+public class KtValueArgument extends KtElementImplStub<KotlinValueArgumentStub<? extends KtValueArgument>> implements ValueArgument {
     public KtValueArgument(@NotNull ASTNode node) {
         super(node);
     }
 
-    public KtValueArgument(@NotNull KotlinPlaceHolderStub<KtValueArgument> stub) {
+    public KtValueArgument(@NotNull KotlinValueArgumentStub<KtValueArgument> stub) {
         super(stub, KtStubElementTypes.VALUE_ARGUMENT);
     }
 
-    protected KtValueArgument(KotlinPlaceHolderStub<? extends KtValueArgument> stub, KtPlaceHolderStubElementType<?> nodeType) {
+    protected KtValueArgument(KotlinValueArgumentStub<? extends KtValueArgument> stub, IStubElementType nodeType) {
         super(stub, nodeType);
     }
 
@@ -96,10 +97,24 @@ public class KtValueArgument extends KtElementImplStub<KotlinPlaceHolderStub<? e
 
     @Override
     public LeafPsiElement getSpreadElement() {
+        KotlinValueArgumentStub stub = getStub();
+        if (stub != null && !stub.isSpread()) {
+            return null;
+        }
+
         ASTNode node = getNode().findChildByType(KtTokens.MUL);
         return node == null ? null : (LeafPsiElement) node.getPsi();
     }
 
+    public boolean isSpread() {
+        KotlinValueArgumentStub stub = getStub();
+        if (stub != null) {
+            return stub.isSpread();
+        }
+
+        return getSpreadElement() != null;
+    }
+
     @Override
     public boolean isExternal() {
         return false;

compiler/psi/src/org/jetbrains/kotlin/psi/stubs/KotlinStubVersions.kt

@@ -23,7 +23,7 @@ object KotlinStubVersions {
     // Though only kotlin declarations (no code in the bodies) are stubbed, please do increase this version
     //      if you are not 100% sure it can be avoided.
     // Increasing this version will lead to reindexing of all kotlin source files on the first IDE startup with the new version.
-    const val SOURCE_STUB_VERSION = 134
+    const val SOURCE_STUB_VERSION = 135
 
     // Binary stub version should be increased if stub format (org.jetbrains.kotlin.psi.stubs.impl) is changed
     //      or changes are made to the core stub building code (org.jetbrains.kotlin.idea.decompiler.stubBuilder).

compiler/psi/src/org/jetbrains/kotlin/psi/stubs/StubInterfaces.kt

@@ -60,6 +60,10 @@ interface KotlinObjectStub : KotlinClassOrObjectStub<KtObjectDeclaration> {
     fun isObjectLiteral(): Boolean
 }
 
+interface KotlinValueArgumentStub<T : KtValueArgument> : KotlinPlaceHolderStub<T> {
+    fun isSpread(): Boolean
+}
+
 interface KotlinAnnotationEntryStub : StubElement<KtAnnotationEntry> {
     fun getShortName(): String?
     fun hasValueArguments(): Boolean

compiler/psi/src/org/jetbrains/kotlin/psi/stubs/elements/KtStubElementTypes.java

@@ -104,11 +104,11 @@ public interface KtStubElementTypes {
     KtPlaceHolderStubElementType<KtValueArgumentList> VALUE_ARGUMENT_LIST =
             new KtValueArgumentListElementType("VALUE_ARGUMENT_LIST");
 
-    KtPlaceHolderStubElementType<KtValueArgument> VALUE_ARGUMENT =
+    KtValueArgumentElementType<KtValueArgument> VALUE_ARGUMENT =
-            new KtPlaceHolderStubElementType<>("VALUE_ARGUMENT", KtValueArgument.class);
+            new KtValueArgumentElementType<>("VALUE_ARGUMENT", KtValueArgument.class);
 
-    KtPlaceHolderStubElementType<KtLambdaArgument> LAMBDA_ARGUMENT =
+    KtValueArgumentElementType<KtLambdaArgument> LAMBDA_ARGUMENT =
-            new KtPlaceHolderStubElementType<>("LAMBDA_ARGUMENT", KtLambdaArgument.class);
+            new KtValueArgumentElementType<>("LAMBDA_ARGUMENT", KtLambdaArgument.class);
 
     KtPlaceHolderStubElementType<KtValueArgumentName> VALUE_ARGUMENT_NAME =
             new KtPlaceHolderStubElementType<>("VALUE_ARGUMENT_NAME", KtValueArgumentName.class);

compiler/psi/src/org/jetbrains/kotlin/psi/stubs/elements/KtValueArgumentElementType.kt

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.psi.stubs.elements
+
+import com.intellij.psi.PsiElement
+import com.intellij.psi.stubs.StubElement
+import com.intellij.psi.stubs.StubInputStream
+import com.intellij.psi.stubs.StubOutputStream
+import org.jetbrains.kotlin.psi.KtValueArgument
+import org.jetbrains.kotlin.psi.stubs.KotlinValueArgumentStub
+import org.jetbrains.kotlin.psi.stubs.impl.KotlinValueArgumentStubImpl
+
+class KtValueArgumentElementType<T : KtValueArgument>(debugName: String, psiClass: Class<T>) :
+    KtStubElementType<KotlinValueArgumentStub<T>, T>(debugName, psiClass, KotlinValueArgumentStub::class.java) {
+
+    override fun createStub(psi: T, parentStub: StubElement<PsiElement>?): KotlinValueArgumentStub<T> {
+        return KotlinValueArgumentStubImpl(parentStub, this, psi.isSpread)
+    }
+
+    override fun serialize(stub: KotlinValueArgumentStub<T>, dataStream: StubOutputStream) {
+        dataStream.writeBoolean(stub.isSpread())
+    }
+
+    override fun deserialize(dataStream: StubInputStream, parentStub: StubElement<PsiElement>?): KotlinValueArgumentStub<T> {
+        val isSpread = dataStream.readBoolean()
+        return KotlinValueArgumentStubImpl(parentStub, this, isSpread)
+    }
+}

compiler/psi/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinValueArgumentStubImpl.kt

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license
+ * that can be found in the license/LICENSE.txt file.
+ */
+
+package org.jetbrains.kotlin.psi.stubs.impl
+
+import com.intellij.psi.PsiElement
+import com.intellij.psi.stubs.StubElement
+import org.jetbrains.kotlin.psi.KtValueArgument
+import org.jetbrains.kotlin.psi.stubs.KotlinValueArgumentStub
+import org.jetbrains.kotlin.psi.stubs.elements.KtValueArgumentElementType
+
+class KotlinValueArgumentStubImpl<T : KtValueArgument>(
+    parent: StubElement<out PsiElement>?,
+    elementType: KtValueArgumentElementType<T>,
+    private val isSpread: Boolean
+) : KotlinPlaceHolderStubImpl<T>(parent, elementType), KotlinValueArgumentStub<T> {
+    override fun isSpread(): Boolean = isSpread
+}

idea/testData/stubs/AnnotationValues.expected

@@ -58,27 +58,27 @@ PsiJetFileStubImpl[package=test]
             USER_TYPE
               REFERENCE_EXPRESSION[referencedName=Simple]
         VALUE_ARGUMENT_LIST
-          VALUE_ARGUMENT
+          VALUE_ARGUMENT[isSpread=false]
             INTEGER_CONSTANT[kind=INTEGER_CONSTANT, value=12]
-          VALUE_ARGUMENT
+          VALUE_ARGUMENT[isSpread=false]
             INTEGER_CONSTANT[kind=INTEGER_CONSTANT, value=12L]
-          VALUE_ARGUMENT
+          VALUE_ARGUMENT[isSpread=false]
             INTEGER_CONSTANT[kind=INTEGER_CONSTANT, value=12]
-          VALUE_ARGUMENT
+          VALUE_ARGUMENT[isSpread=false]
             FLOAT_CONSTANT[kind=FLOAT_CONSTANT, value=3.3]
-          VALUE_ARGUMENT
+          VALUE_ARGUMENT[isSpread=false]
             VALUE_ARGUMENT_NAME
               REFERENCE_EXPRESSION[referencedName=f]
             FLOAT_CONSTANT[kind=FLOAT_CONSTANT, value=3.3F]
-          VALUE_ARGUMENT
+          VALUE_ARGUMENT[isSpread=false]
             VALUE_ARGUMENT_NAME
               REFERENCE_EXPRESSION[referencedName=c]
             CHARACTER_CONSTANT[kind=CHARACTER_CONSTANT, value='a']
-          VALUE_ARGUMENT
+          VALUE_ARGUMENT[isSpread=false]
             VALUE_ARGUMENT_NAME
               REFERENCE_EXPRESSION[referencedName=b1]
             BOOLEAN_CONSTANT[kind=BOOLEAN_CONSTANT, value=true]
-          VALUE_ARGUMENT
+          VALUE_ARGUMENT[isSpread=false]
             VALUE_ARGUMENT_NAME
               REFERENCE_EXPRESSION[referencedName=b2]
             BOOLEAN_CONSTANT[kind=BOOLEAN_CONSTANT, value=false]
@@ -108,12 +108,12 @@ PsiJetFileStubImpl[package=test]
             USER_TYPE
               REFERENCE_EXPRESSION[referencedName=StringLiteral]
         VALUE_ARGUMENT_LIST
-          VALUE_ARGUMENT
+          VALUE_ARGUMENT[isSpread=false]
             STRING_TEMPLATE
               LITERAL_STRING_TEMPLATE_ENTRY[text=some]
-          VALUE_ARGUMENT
+          VALUE_ARGUMENT[isSpread=false]
             STRING_TEMPLATE
-          VALUE_ARGUMENT
+          VALUE_ARGUMENT[isSpread=false]
             STRING_TEMPLATE
               LITERAL_STRING_TEMPLATE_ENTRY[text=H]
               SHORT_STRING_TEMPLATE_ENTRY[text=$CONSTANT]
@@ -147,13 +147,13 @@ PsiJetFileStubImpl[package=test]
             USER_TYPE
               REFERENCE_EXPRESSION[referencedName=EnumLiteral]
         VALUE_ARGUMENT_LIST
-          VALUE_ARGUMENT
+          VALUE_ARGUMENT[isSpread=false]
             REFERENCE_EXPRESSION[referencedName=E1]
-          VALUE_ARGUMENT
+          VALUE_ARGUMENT[isSpread=false]
             DOT_QUALIFIED_EXPRESSION
               REFERENCE_EXPRESSION[referencedName=E]
               REFERENCE_EXPRESSION[referencedName=E2]
-          VALUE_ARGUMENT
+          VALUE_ARGUMENT[isSpread=false]
             VALUE_ARGUMENT_NAME
               REFERENCE_EXPRESSION[referencedName=e3]
             DOT_QUALIFIED_EXPRESSION
@@ -178,11 +178,11 @@ PsiJetFileStubImpl[package=test]
             USER_TYPE
               REFERENCE_EXPRESSION[referencedName=VarArg]
         VALUE_ARGUMENT_LIST
-          VALUE_ARGUMENT
+          VALUE_ARGUMENT[isSpread=false]
             INTEGER_CONSTANT[kind=INTEGER_CONSTANT, value=1]
-          VALUE_ARGUMENT
+          VALUE_ARGUMENT[isSpread=false]
             INTEGER_CONSTANT[kind=INTEGER_CONSTANT, value=2]
-          VALUE_ARGUMENT
+          VALUE_ARGUMENT[isSpread=false]
             INTEGER_CONSTANT[kind=INTEGER_CONSTANT, value=3]
   CLASS[fqName=test.Arrays, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Arrays, superNames=[]]
     MODIFIER_LIST[annotation]
@@ -220,12 +220,12 @@ PsiJetFileStubImpl[package=test]
             USER_TYPE
               REFERENCE_EXPRESSION[referencedName=Arrays]
         VALUE_ARGUMENT_LIST
-          VALUE_ARGUMENT
+          VALUE_ARGUMENT[isSpread=false]
-          VALUE_ARGUMENT
+          VALUE_ARGUMENT[isSpread=false]
-          VALUE_ARGUMENT
+          VALUE_ARGUMENT[isSpread=false]
-          VALUE_ARGUMENT
+          VALUE_ARGUMENT[isSpread=false]
-          VALUE_ARGUMENT
+          VALUE_ARGUMENT[isSpread=false]
-          VALUE_ARGUMENT
+          VALUE_ARGUMENT[isSpread=false]
   CLASS[fqName=test.ClassLiteral, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=ClassLiteral, superNames=[]]
     MODIFIER_LIST[annotation]
     PRIMARY_CONSTRUCTOR
@@ -256,9 +256,9 @@ PsiJetFileStubImpl[package=test]
             USER_TYPE
               REFERENCE_EXPRESSION[referencedName=ClassLiteral]
         VALUE_ARGUMENT_LIST
-          VALUE_ARGUMENT
+          VALUE_ARGUMENT[isSpread=false]
-          VALUE_ARGUMENT
+          VALUE_ARGUMENT[isSpread=false]
-          VALUE_ARGUMENT
+          VALUE_ARGUMENT[isSpread=false]
     TYPE_PARAMETER_LIST
       TYPE_PARAMETER[fqName=null, isInVariance=false, isOutVariance=false, name=T]
   CLASS[fqName=test.Nested, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=Nested, superNames=[]]
@@ -293,9 +293,27 @@ PsiJetFileStubImpl[package=test]
             USER_TYPE
               REFERENCE_EXPRESSION[referencedName=Outer]
         VALUE_ARGUMENT_LIST
-          VALUE_ARGUMENT
+          VALUE_ARGUMENT[isSpread=false]
             STRING_TEMPLATE
               LITERAL_STRING_TEMPLATE_ENTRY[text=value]
-          VALUE_ARGUMENT
+          VALUE_ARGUMENT[isSpread=false]
             VALUE_ARGUMENT_NAME
               REFERENCE_EXPRESSION[referencedName=nested]
+  CLASS[fqName=test.ArraysSpread, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=ArraysSpread, superNames=[]]
+    MODIFIER_LIST[annotation]
+    PRIMARY_CONSTRUCTOR
+      VALUE_PARAMETER_LIST
+        VALUE_PARAMETER[fqName=test.ArraysSpread.ia, hasDefaultValue=false, hasValOrVar=true, isMutable=false, name=ia]
+          MODIFIER_LIST[vararg]
+          TYPE_REFERENCE
+            USER_TYPE
+              REFERENCE_EXPRESSION[referencedName=Int]
+  CLASS[fqName=test.WithSpreadOperatorArrays, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=WithSpreadOperatorArrays, superNames=[]]
+    MODIFIER_LIST[]
+      ANNOTATION_ENTRY[hasValueArguments=true, shortName=ArraysSpread]
+        CONSTRUCTOR_CALLEE
+          TYPE_REFERENCE
+            USER_TYPE
+              REFERENCE_EXPRESSION[referencedName=ArraysSpread]
+        VALUE_ARGUMENT_LIST
+          VALUE_ARGUMENT[isSpread=true]

idea/testData/stubs/AnnotationValues.kt

@@ -117,4 +117,15 @@ annotation class Outer(
 )
 
 @Outer("value", nested = Nested(12, "nested value"))
-class WithNested
+class WithNested
+
+// ==============================
+
+annotation class ArraysSpread(
+    vararg val ia: Int
+)
+
+@ArraysSpread(
+    *[1, 2, 3]
+)
+class WithSpreadOperatorArrays

idea/testData/stubs/AnnotationWithValue.expected

@@ -21,9 +21,9 @@ PsiJetFileStubImpl[package=]
             USER_TYPE
               REFERENCE_EXPRESSION[referencedName=Test]
         VALUE_ARGUMENT_LIST
-          VALUE_ARGUMENT
+          VALUE_ARGUMENT[isSpread=false]
             STRING_TEMPLATE
-          VALUE_ARGUMENT
+          VALUE_ARGUMENT[isSpread=false]
             VALUE_ARGUMENT_NAME
               REFERENCE_EXPRESSION[referencedName=other]
             STRING_TEMPLATE

idea/testData/stubs/Contracts.expected

@@ -7,7 +7,7 @@ PsiJetFileStubImpl[package=test]
           USER_TYPE
             REFERENCE_EXPRESSION[referencedName=Suppress]
       VALUE_ARGUMENT_LIST
-        VALUE_ARGUMENT
+        VALUE_ARGUMENT[isSpread=false]
           STRING_TEMPLATE
             LITERAL_STRING_TEMPLATE_ENTRY[text=INVISIBLE_MEMBER]
   PACKAGE_DIRECTIVE

idea/testData/stubs/DynamicType.expected

@@ -35,11 +35,11 @@ PsiJetFileStubImpl[package=]
             USER_TYPE
               REFERENCE_EXPRESSION[referencedName=Target]
         VALUE_ARGUMENT_LIST
-          VALUE_ARGUMENT
+          VALUE_ARGUMENT[isSpread=false]
             DOT_QUALIFIED_EXPRESSION
               REFERENCE_EXPRESSION[referencedName=AnnotationTarget]
               REFERENCE_EXPRESSION[referencedName=TYPE]
-          VALUE_ARGUMENT
+          VALUE_ARGUMENT[isSpread=false]
             DOT_QUALIFIED_EXPRESSION
               REFERENCE_EXPRESSION[referencedName=AnnotationTarget]
               REFERENCE_EXPRESSION[referencedName=TYPE_PARAMETER]

idea/testData/stubs/TypeAnnotation.expected

@@ -34,7 +34,7 @@ PsiJetFileStubImpl[package=]
                     USER_TYPE
                       REFERENCE_EXPRESSION[referencedName=b]
                 VALUE_ARGUMENT_LIST
-                  VALUE_ARGUMENT
+                  VALUE_ARGUMENT[isSpread=false]
                     DOT_QUALIFIED_EXPRESSION
                       REFERENCE_EXPRESSION[referencedName=E]
                       REFERENCE_EXPRESSION[referencedName=E1]
@@ -55,7 +55,7 @@ PsiJetFileStubImpl[package=]
                 USER_TYPE
                   REFERENCE_EXPRESSION[referencedName=b]
             VALUE_ARGUMENT_LIST
-              VALUE_ARGUMENT
+              VALUE_ARGUMENT[isSpread=false]
                 DOT_QUALIFIED_EXPRESSION
                   REFERENCE_EXPRESSION[referencedName=E]
                   REFERENCE_EXPRESSION[referencedName=E2]