Rename sparam to setparam

compiler/testData/psi/SoftKeywords.kt

@@ -58,7 +58,7 @@ ref
     val property
     val receiver
     val param
-    val sparam
+    val setparam
     val lateinit
     val const
       get() = a
@@ -93,7 +93,7 @@ ref
     fun property  () : property
     fun receiver  () : receiver
     fun param  () : param
-    fun sparam  () : sparam
+    fun setparam  () : setparam
     fun lateinit  () : lateinit
     fun const  () : const
 
@@ -125,7 +125,7 @@ ref
         property  : t,
         receiver  : t,
         param     : t,
-        sparam    : t,
+        setparam    : t,
         lateinit  : t,
         const     : t,
     public protected private internal abstract
@@ -174,7 +174,7 @@ class F(val foo : bar,
         property  : t,
         receiver  : t,
         param     : t,
-        sparam    : t,
+        setparam    : t,
         lateinit  : t,
         const     : t,
     public protected private internal abstract

compiler/testData/psi/SoftKeywords.txt

@@ -311,7 +311,7 @@ JetFile: SoftKeywords.kt
       PROPERTY
         PsiElement(val)('val')
         PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('sparam')
+        PsiElement(IDENTIFIER)('setparam')
       PsiWhiteSpace('\n    ')
       PROPERTY
         PsiElement(val)('val')
@@ -796,7 +796,7 @@ JetFile: SoftKeywords.kt
       FUN
         PsiElement(fun)('fun')
         PsiWhiteSpace(' ')
-        PsiElement(IDENTIFIER)('sparam')
+        PsiElement(IDENTIFIER)('setparam')
         PsiWhiteSpace('  ')
         VALUE_PARAMETER_LIST
           PsiElement(LPAR)('(')
@@ -807,7 +807,7 @@ JetFile: SoftKeywords.kt
         TYPE_REFERENCE
           USER_TYPE
             REFERENCE_EXPRESSION
-              PsiElement(IDENTIFIER)('sparam')
+              PsiElement(IDENTIFIER)('setparam')
       PsiWhiteSpace('\n    ')
       FUN
         PsiElement(fun)('fun')
@@ -1146,7 +1146,7 @@ JetFile: SoftKeywords.kt
           PsiElement(COMMA)(',')
           PsiWhiteSpace('\n        ')
           VALUE_PARAMETER
-            PsiElement(IDENTIFIER)('sparam')
+            PsiElement(IDENTIFIER)('setparam')
             PsiWhiteSpace('    ')
             PsiElement(COLON)(':')
             PsiWhiteSpace(' ')
@@ -1543,7 +1543,7 @@ JetFile: SoftKeywords.kt
         PsiElement(COMMA)(',')
         PsiWhiteSpace('\n        ')
         VALUE_PARAMETER
-          PsiElement(IDENTIFIER)('sparam')
+          PsiElement(IDENTIFIER)('setparam')
           PsiWhiteSpace('    ')
           PsiElement(COLON)(':')
           PsiWhiteSpace(' ')

compiler/testData/psi/annotation/targeted/onGetSetSparam/inWrongPlace.kt

@@ -1,28 +1,28 @@
 @get:Deprecated
 @set:Deprecated
-@sparam:Deprecated
+@setparam:Deprecated
 
 @get:Deprecated
 @set:Deprecated
-@sparam:Deprecated
+@setparam:Deprecated
 package boo
 
 @get:Deprecated
 @set:Deprecated
-@sparam:Deprecated
+@setparam:Deprecated
 class A
 
 @get:Deprecated
 @set:Deprecated
-@sparam:Deprecated
+@setparam:Deprecated
 interface I
 
 @get:Deprecated
 @set:Deprecated
-@sparam:Deprecated
+@setparam:Deprecated
 fun a()
 
 @get:Deprecated
 @set:Deprecated
-@sparam:Deprecated
+@setparam:Deprecated
 fun b()

compiler/testData/psi/annotation/targeted/onGetSetSparam/inWrongPlace.txt

@@ -25,7 +25,7 @@ JetFile: inWrongPlace.kt
     ANNOTATION_ENTRY
       PsiElement(AT)('@')
       ANNOTATION_TARGET
-        PsiElement(sparam)('sparam')
+        PsiElement(setparam)('setparam')
       PsiElement(COLON)(':')
       CONSTRUCTOR_CALLEE
         TYPE_REFERENCE
@@ -58,7 +58,7 @@ JetFile: inWrongPlace.kt
     ANNOTATION_ENTRY
       PsiElement(AT)('@')
       ANNOTATION_TARGET
-        PsiElement(sparam)('sparam')
+        PsiElement(setparam)('setparam')
       PsiElement(COLON)(':')
       CONSTRUCTOR_CALLEE
         TYPE_REFERENCE
@@ -101,7 +101,7 @@ JetFile: inWrongPlace.kt
       ANNOTATION_ENTRY
         PsiElement(AT)('@')
         ANNOTATION_TARGET
-          PsiElement(sparam)('sparam')
+          PsiElement(setparam)('setparam')
         PsiElement(COLON)(':')
         CONSTRUCTOR_CALLEE
           TYPE_REFERENCE
@@ -140,7 +140,7 @@ JetFile: inWrongPlace.kt
       ANNOTATION_ENTRY
         PsiElement(AT)('@')
         ANNOTATION_TARGET
-          PsiElement(sparam)('sparam')
+          PsiElement(setparam)('setparam')
         PsiElement(COLON)(':')
         CONSTRUCTOR_CALLEE
           TYPE_REFERENCE
@@ -179,7 +179,7 @@ JetFile: inWrongPlace.kt
       ANNOTATION_ENTRY
         PsiElement(AT)('@')
         ANNOTATION_TARGET
-          PsiElement(sparam)('sparam')
+          PsiElement(setparam)('setparam')
         PsiElement(COLON)(':')
         CONSTRUCTOR_CALLEE
           TYPE_REFERENCE
@@ -221,7 +221,7 @@ JetFile: inWrongPlace.kt
       ANNOTATION_ENTRY
         PsiElement(AT)('@')
         ANNOTATION_TARGET
-          PsiElement(sparam)('sparam')
+          PsiElement(setparam)('setparam')
         PsiElement(COLON)(':')
         CONSTRUCTOR_CALLEE
           TYPE_REFERENCE

compiler/testData/psi/annotation/targeted/onGetSetSparam/simple.kt

@@ -2,7 +2,7 @@ class A {
 
     @get:An
     @set:An
-    @sparam:An
+    @setparam:An
     var a: String = "A"
 
 }

compiler/testData/psi/annotation/targeted/onGetSetSparam/simple.txt

@@ -38,7 +38,7 @@ JetFile: simple.kt
           ANNOTATION_ENTRY
             PsiElement(AT)('@')
             ANNOTATION_TARGET
-              PsiElement(sparam)('sparam')
+              PsiElement(setparam)('setparam')
             PsiElement(COLON)(':')
             CONSTRUCTOR_CALLEE
               TYPE_REFERENCE

compiler/testData/psi/annotation/targeted/onGetSetSparam/twoAnnotationLists.kt

@@ -2,7 +2,7 @@ class A {
 
     @get:a
     @set:[b c]
-    @sparam:d
+    @setparam:d
     var a: Int
         @e get() = 5
         @f @g set(@h v) {}

compiler/testData/psi/annotation/targeted/onGetSetSparam/twoAnnotationLists.txt

@@ -48,7 +48,7 @@ JetFile: twoAnnotationLists.kt
           ANNOTATION_ENTRY
             PsiElement(AT)('@')
             ANNOTATION_TARGET
-              PsiElement(sparam)('sparam')
+              PsiElement(setparam)('setparam')
             PsiElement(COLON)(':')
             CONSTRUCTOR_CALLEE
               TYPE_REFERENCE