From 8fd6a64be966646f8f9bd0270b0658077c6eaa10 Mon Sep 17 00:00:00 2001
From: Valentin Kipyatkov <valentin@jetbrains.com>
Date: Fri, 29 May 2015 23:14:20 +0300
Subject: [PATCH] Refactored methods for val/var in PSI

---
 .../common/DataClassMethodGenerator.java      |  2 +-
 .../kotlin/codegen/ClassBodyCodegen.java      |  2 +-
 .../codegen/ImplementationBodyCodegen.java    |  2 +-
 .../cfg/JetFlowInformationProvider.java       |  2 +-
 .../diagnostics/PositioningStrategies.kt      |  2 +-
 .../org/jetbrains/kotlin/psi/DebugTextUtil.kt |  2 +-
 .../kotlin/psi/JetMultiDeclaration.java       |  4 +-
 .../kotlin/psi/JetMultiDeclarationEntry.java  |  6 +-
 .../jetbrains/kotlin/psi/JetParameter.java    | 18 ++---
 .../org/jetbrains/kotlin/psi/JetProperty.java | 10 ++-
 .../org/jetbrains/kotlin/psi/JetPsiFactory.kt | 13 +---
 .../org/jetbrains/kotlin/psi/JetPsiUtil.java  |  4 +-
 .../kotlin/psi/JetVariableDeclaration.java    |  4 +-
 .../kotlin/psi/psiUtil/jetPsiUtil.kt          |  2 +-
 .../kotlin/psi/stubs/StubInterfaces.kt        |  2 +-
 .../elements/JetParameterElementType.java     |  4 +-
 .../psi/stubs/impl/KotlinParameterStubImpl.kt |  4 +-
 .../kotlin/resolve/BindingContext.java        |  2 +-
 .../kotlin/resolve/DeclarationsChecker.java   |  2 +-
 .../kotlin/resolve/DescriptorResolver.java    |  7 +-
 .../resolve/FunctionDescriptorResolver.kt     |  2 +-
 .../kotlin/resolve/LazyTopDownAnalyzer.kt     |  2 +-
 .../resolve/lazy/LazyDeclarationResolver.java |  2 +-
 .../PsiBasedClassMemberDeclarationProvider.kt |  2 +-
 .../lazy/descriptors/LazyClassDescriptor.java |  2 +-
 .../lazy/descriptors/LazyClassMemberScope.kt  |  4 +-
 .../asJava/duplicateJvmSignatureUtil.kt       |  2 +-
 .../navigation/JetSourceNavigationHelper.java |  2 +-
 .../stubBuilder/TypeClsStubBuilder.kt         |  4 +-
 .../KotlinSuppressableWarningProblemGroup.kt  |  4 +-
 .../KotlinReferencesSearcher.java             |  2 +-
 .../idea/search/usagesSearch/searchHelpers.kt |  4 +-
 .../kotlin/idea/search/usagesSearch/utils.kt  |  2 +-
 .../JetStructureViewElement.java              |  2 +-
 .../upDownMover/JetDeclarationMover.java      |  4 +-
 .../idea/formatter/kotlinSpacingRules.kt      |  4 +
 .../inspections/UnusedSymbolInspection.kt     |  2 +-
 .../ChangeVisibilityModifierIntention.kt      |  4 +-
 .../ConvertFunctionToPropertyIntention.kt     |  2 +-
 .../ConvertPropertyToFunctionIntention.kt     |  2 +-
 .../quickfix/ChangeVariableMutabilityFix.kt   |  4 +-
 .../RemoveValVarFromParameterFix.java         | 14 ++--
 .../callableBuilder/CallableBuilder.kt        |  2 +-
 .../changeSignature/JetChangeSignatureData.kt |  2 +-
 .../refactoring/changeSignature/JetValVar.kt  | 23 ++++--
 .../usages/JetFunctionDefinitionUsage.java    | 35 ++++-----
 .../KotlinIntroduceParameterHandler.kt        |  2 +-
 .../KotlinInplaceVariableIntroducer.java      | 10 +--
 .../util/psi/patternMatching/JetPsiUnifier.kt |  2 +-
 .../AnnotatedFlexibleTypes.txt                |  2 +-
 .../AnnotationClass/AnnotationClass.txt       |  4 +-
 .../stubBuilder/Annotations/Annotations.txt   | 10 +--
 .../stubBuilder/ClassMembers/ClassMembers.txt | 10 +--
 .../stubBuilder/DataClass/DataClass.txt       |  4 +-
 .../stubBuilder/Delegation/Delegation.txt     |  4 +-
 .../DependencyOnNestedClasses.txt             |  8 +-
 .../InheritingClasses/InheritingClasses.txt   | 10 +--
 .../NestedClasses/NestedClasses.txt           | 16 ++--
 .../SecondaryConstructors.txt                 | 12 +--
 .../TopLevelMembersAnnotatedPackage.txt       |  2 +-
 .../TopLevelMembersPackage.txt                |  8 +-
 .../stubBuilder/TypeParams/TypeParams.txt     | 78 +++++++++----------
 .../decompiler/stubBuilder/Types/Types.txt    | 24 +++---
 idea/testData/formatter/ForSpacing.after.kt   |  2 +
 idea/testData/formatter/ForSpacing.kt         |  4 +-
 .../stubs/FunctionParameters.expected         |  4 +-
 .../stubs/ParametersWithFqName.expected       |  6 +-
 .../stubs/SecondaryConstructors.expected      | 12 +--
 idea/testData/stubs/TypeAnnotation.expected   |  4 +-
 .../kotlin/j2k/JavaToKotlinConverter.kt       |  2 +-
 .../declaration/JsDataClassGenerator.java     |  2 +-
 71 files changed, 241 insertions(+), 229 deletions(-)

diff --git a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/DataClassMethodGenerator.java b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/DataClassMethodGenerator.java
index 0d76103f577..f1e1bf770b0 100644
--- a/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/DataClassMethodGenerator.java
+++ b/compiler/backend-common/src/org/jetbrains/kotlin/backend/common/DataClassMethodGenerator.java
@@ -125,7 +125,7 @@ public abstract class DataClassMethodGenerator {
     private List<PropertyDescriptor> getDataProperties() {
         List<PropertyDescriptor> result = Lists.newArrayList();
         for (JetParameter parameter : getPrimaryConstructorParameters()) {
-            if (parameter.hasValOrVarNode()) {
+            if (parameter.hasValOrVar()) {
                 result.add(bindingContext.get(BindingContext.PRIMARY_CONSTRUCTOR_PARAMETER, parameter));
             }
         }
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBodyCodegen.java
index 1fd5dec89b7..10526eae4df 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBodyCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ClassBodyCodegen.java
@@ -104,7 +104,7 @@ public abstract class ClassBodyCodegen extends MemberCodegen<JetClassOrObject> {
     private void generatePrimaryConstructorProperties(PropertyCodegen propertyCodegen, JetClassOrObject origin) {
         boolean isAnnotation = origin instanceof JetClass && ((JetClass) origin).isAnnotation();
         for (JetParameter p : getPrimaryConstructorParameters()) {
-            if (p.hasValOrVarNode()) {
+            if (p.hasValOrVar()) {
                 PropertyDescriptor propertyDescriptor = bindingContext.get(BindingContext.PRIMARY_CONSTRUCTOR_PARAMETER, p);
                 if (propertyDescriptor != null) {
                     if (!isAnnotation) {
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
index beb0983310a..a6527d77cdb 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/ImplementationBodyCodegen.java
@@ -1109,7 +1109,7 @@ public class ImplementationBodyCodegen extends ClassBodyCodegen {
         int curParam = 0;
         List<ValueParameterDescriptor> parameters = constructorDescriptor.getValueParameters();
         for (JetParameter parameter : getPrimaryConstructorParameters()) {
-            if (parameter.hasValOrVarNode()) {
+            if (parameter.hasValOrVar()) {
                 VariableDescriptor descriptor = parameters.get(curParam);
                 Type type = typeMapper.mapType(descriptor);
                 iv.load(0, classAsmType);
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java
index ad8e8747717..2df6b12d706 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java
@@ -673,7 +673,7 @@ public class JetFlowInformationProvider {
                                         report(Errors.UNUSED_PARAMETER.on((JetParameter) element, variableDescriptor), ctxt);
                                     }
                                     else if (owner instanceof JetPrimaryConstructor) {
-                                        if (!((JetParameter) element).hasValOrVarNode() &&
+                                        if (!((JetParameter) element).hasValOrVar() &&
                                             !((JetPrimaryConstructor) owner).getContainingClass().isAnnotation()) {
                                             report(Errors.UNUSED_PARAMETER.on((JetParameter) element, variableDescriptor), ctxt);
                                         }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/PositioningStrategies.kt b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/PositioningStrategies.kt
index 399cbb8236b..ce2fcc10b25 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/PositioningStrategies.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/PositioningStrategies.kt
@@ -317,7 +317,7 @@ public object PositioningStrategies {
 
     public val VAL_OR_VAR_NODE: PositioningStrategy<JetProperty> = object : PositioningStrategy<JetProperty>() {
         override fun mark(element: JetProperty): List<TextRange> {
-            return markNode(element.getValOrVarNode())
+            return markElement(element.getValOrVarKeyword())
         }
     }
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/DebugTextUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/DebugTextUtil.kt
index 19e9cd0ce13..0f1fc88ce6a 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/DebugTextUtil.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/DebugTextUtil.kt
@@ -245,7 +245,7 @@ private object DebugTextBuildingVisitor : JetVisitor<String, Unit>() {
 
     override fun visitParameter(parameter: JetParameter, data: Unit?): String? {
         return buildText {
-            if (parameter.hasValOrVarNode()) {
+            if (parameter.hasValOrVar()) {
                 if (parameter.isMutable()) append("var ") else append("val ")
             }
             val name = parameter.getNameAsName()
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetMultiDeclaration.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetMultiDeclaration.java
index b718b8dcd53..1fa8d49a870 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetMultiDeclaration.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetMultiDeclaration.java
@@ -54,8 +54,8 @@ public class JetMultiDeclaration extends JetDeclarationImpl {
     }
 
     @Nullable
-    public ASTNode getValOrVarNode() {
-        return getNode().findChildByType(TokenSet.create(VAL_KEYWORD, VAR_KEYWORD));
+    public PsiElement getValOrVarKeyword() {
+        return findChildByType(TokenSet.create(VAL_KEYWORD, VAR_KEYWORD));
     }
 
     @Nullable
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetMultiDeclarationEntry.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetMultiDeclarationEntry.java
index c3daddf09a0..6306cbe924b 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetMultiDeclarationEntry.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetMultiDeclarationEntry.java
@@ -127,8 +127,10 @@ public class JetMultiDeclarationEntry extends JetNamedDeclarationNotStubbed impl
     }
 
     @Override
-    public ASTNode getValOrVarNode() {
-        return getParentNode().findChildByType(TokenSet.create(VAL_KEYWORD, VAR_KEYWORD));
+    public PsiElement getValOrVarKeyword() {
+        ASTNode node = getParentNode().findChildByType(TokenSet.create(VAL_KEYWORD, VAR_KEYWORD));
+        if (node == null) return null;
+        return node.getPsi();
     }
 
     @Nullable
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetParameter.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetParameter.java
index 90a53502e19..adf8d9a5390 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetParameter.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetParameter.java
@@ -21,6 +21,7 @@ import com.intellij.navigation.ItemPresentation;
 import com.intellij.navigation.ItemPresentationProviders;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.search.SearchScope;
+import com.intellij.psi.tree.TokenSet;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.lexer.JetTokens;
@@ -105,26 +106,25 @@ public class JetParameter extends JetNamedDeclarationStub<KotlinParameterStub> i
         return modifierList != null && modifierList.hasModifier(JetTokens.VARARG_KEYWORD);
     }
 
-    public boolean hasValOrVarNode() {
+    public boolean hasValOrVar() {
         KotlinParameterStub stub = getStub();
         if (stub != null) {
-            return stub.hasValOrVarNode();
+            return stub.hasValOrVar();
         }
-        return getValOrVarNode() != null;
+        return getValOrVarKeyword() != null;
     }
 
     @Nullable
-    public ASTNode getValOrVarNode() {
+    public PsiElement getValOrVarKeyword() {
         KotlinParameterStub stub = getStub();
-        if (stub != null && !stub.hasValOrVarNode()) {
+        if (stub != null && !stub.hasValOrVar()) {
             return null;
         }
-        ASTNode val = getNode().findChildByType(JetTokens.VAL_KEYWORD);
-        if (val != null) return val;
-
-        return getNode().findChildByType(JetTokens.VAR_KEYWORD);
+        return findChildByType(VAL_VAR_TOKEN_SET);
     }
 
+    private static final TokenSet VAL_VAR_TOKEN_SET = TokenSet.create(JetTokens.VAL_KEYWORD, JetTokens.VAR_KEYWORD);
+
     @Override
     public ItemPresentation getPresentation() {
         return ItemPresentationProviders.getItemPresentation(this);
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetProperty.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetProperty.java
index d8370711fdc..8c7c4c84e97 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetProperty.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetProperty.java
@@ -268,12 +268,14 @@ public class JetProperty extends JetTypeParameterListOwnerStub<KotlinPropertyStu
 
     @Override
     @NotNull
-    public ASTNode getValOrVarNode() {
-        ASTNode node = getNode().findChildByType(TokenSet.create(VAL_KEYWORD, VAR_KEYWORD));
-        assert node != null : "Val or var should always exist for property";
-        return node;
+    public PsiElement getValOrVarKeyword() {
+        PsiElement element = findChildByType(VAL_VAR_TOKEN_SET);
+        assert element != null : "Val or var should always exist for property";
+        return element;
     }
 
+    private static final TokenSet VAL_VAR_TOKEN_SET = TokenSet.create(JetTokens.VAL_KEYWORD, JetTokens.VAR_KEYWORD);
+
     @Override
     public ItemPresentation getPresentation() {
         return ItemPresentationProviders.getItemPresentation(this);
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiFactory.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiFactory.kt
index 05ef752f4cd..ab3ad4a7ded 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiFactory.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiFactory.kt
@@ -31,7 +31,6 @@ import org.jetbrains.kotlin.lexer.JetKeywordToken
 import org.jetbrains.kotlin.lexer.JetModifierKeywordToken
 import org.jetbrains.kotlin.name.FqName
 import org.jetbrains.kotlin.name.Name
-import org.jetbrains.kotlin.name.renderName
 import org.jetbrains.kotlin.psi.JetPsiFactory.CallableBuilder.Target
 import org.jetbrains.kotlin.resolve.ImportPath
 import java.io.PrintWriter
@@ -46,18 +45,14 @@ public var JetFile.moduleInfo: ModuleInfo? by UserDataProperty(Key.create("MODUL
 
 public class JetPsiFactory(private val project: Project) {
 
-    public fun createValNode(): ASTNode {
+    public fun createValKeyword(): PsiElement {
         val property = createProperty("val x = 1")
-        return property.getValOrVarNode()
+        return property.getValOrVarKeyword()
     }
 
-    public fun createVarNode(): ASTNode {
+    public fun createVarKeyword(): PsiElement {
         val property = createProperty("var x = 1")
-        return property.getValOrVarNode()
-    }
-
-    public fun createValOrVarNode(text: String): ASTNode {
-        return createParameterList("($text int x)").getParameters().first().getValOrVarNode()!!
+        return property.getValOrVarKeyword()
     }
 
     public fun createSafeCallNode(): ASTNode {
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiUtil.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiUtil.java
index 8fb0f016be3..33b40b799d9 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiUtil.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetPsiUtil.java
@@ -448,7 +448,7 @@ public class JetPsiUtil {
 
     @Nullable
     public static JetClass getClassIfParameterIsProperty(@NotNull JetParameter jetParameter) {
-        if (jetParameter.hasValOrVarNode()) {
+        if (jetParameter.hasValOrVar()) {
             PsiElement grandParent = jetParameter.getParent().getParent();
             if (grandParent instanceof JetPrimaryConstructor) {
                 return ((JetPrimaryConstructor) grandParent).getContainingClassOrNull();
@@ -767,7 +767,7 @@ public class JetPsiUtil {
             PsiElement parent = declaration.getParent();
 
             // val/var parameter of primary constructor should not be considered as local
-            if (((JetParameter) declaration).getValOrVarNode() != null && parent != null && parent.getParent() instanceof JetPrimaryConstructor) {
+            if (((JetParameter) declaration).hasValOrVar() && parent != null && parent.getParent() instanceof JetPrimaryConstructor) {
                 return null;
             }
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetVariableDeclaration.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetVariableDeclaration.java
index 9653629a2be..1822e551e62 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/JetVariableDeclaration.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/JetVariableDeclaration.java
@@ -16,12 +16,12 @@
 
 package org.jetbrains.kotlin.psi;
 
-import com.intellij.lang.ASTNode;
+import com.intellij.psi.PsiElement;
 import org.jetbrains.annotations.Nullable;
 
 public interface JetVariableDeclaration extends JetCallableDeclaration, JetWithExpressionInitializer {
     boolean isVar();
 
     @Nullable
-    ASTNode getValOrVarNode();
+    PsiElement getValOrVarKeyword();
 }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/jetPsiUtil.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/jetPsiUtil.kt
index eee79757c7e..95600b7b442 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/jetPsiUtil.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/psiUtil/jetPsiUtil.kt
@@ -299,7 +299,7 @@ public inline fun <reified T : JetElement, R> flatMapDescendantsOfTypeVisitor(ac
 
 public fun JetClassOrObject.effectiveDeclarations(): List<JetDeclaration> {
     return when(this) {
-        is JetClass -> getDeclarations() + getPrimaryConstructorParameters().filter { p -> p.hasValOrVarNode() }
+        is JetClass -> getDeclarations() + getPrimaryConstructorParameters().filter { p -> p.hasValOrVar() }
         else -> getDeclarations()
     }
 }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/StubInterfaces.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/StubInterfaces.kt
index a0ad0c4eac1..f650ace44b4 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/StubInterfaces.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/StubInterfaces.kt
@@ -83,7 +83,7 @@ public trait KotlinEnumEntrySuperclassReferenceExpressionStub : StubElement<JetE
 
 public trait KotlinParameterStub : KotlinStubWithFqName<JetParameter> {
     public fun isMutable(): Boolean
-    public fun hasValOrVarNode(): Boolean
+    public fun hasValOrVar(): Boolean
     public fun hasDefaultValue(): Boolean
 }
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetParameterElementType.java b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetParameterElementType.java
index 186e0542d99..59080fc50d1 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetParameterElementType.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/elements/JetParameterElementType.java
@@ -39,14 +39,14 @@ public class JetParameterElementType extends JetStubElementType<KotlinParameterS
         FqName fqName = psi.getFqName();
         StringRef fqNameRef = StringRef.fromString(fqName != null ? fqName.asString() : null);
         return new KotlinParameterStubImpl(parentStub, fqNameRef, StringRef.fromString(psi.getName()),
-                                           psi.isMutable(), psi.hasValOrVarNode(), psi.hasDefaultValue());
+                                           psi.isMutable(), psi.hasValOrVar(), psi.hasDefaultValue());
     }
 
     @Override
     public void serialize(@NotNull KotlinParameterStub stub, @NotNull StubOutputStream dataStream) throws IOException {
         dataStream.writeName(stub.getName());
         dataStream.writeBoolean(stub.isMutable());
-        dataStream.writeBoolean(stub.hasValOrVarNode());
+        dataStream.writeBoolean(stub.hasValOrVar());
         dataStream.writeBoolean(stub.hasDefaultValue());
         FqName name = stub.getFqName();
         dataStream.writeName(name != null ? name.asString() : null);
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinParameterStubImpl.kt b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinParameterStubImpl.kt
index 22783b155cc..b5fec854540 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinParameterStubImpl.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/psi/stubs/impl/KotlinParameterStubImpl.kt
@@ -29,7 +29,7 @@ public class KotlinParameterStubImpl(
         private val fqName: StringRef?,
         private val name: StringRef?,
         private val isMutable: Boolean,
-        private val hasValOrVarNode: Boolean,
+        private val hasValOrVar: Boolean,
         private val hasDefaultValue: Boolean
 ) : KotlinStubBaseImpl<JetParameter>(parent, JetStubElementTypes.VALUE_PARAMETER), KotlinParameterStub {
     override fun getName(): String? {
@@ -41,6 +41,6 @@ public class KotlinParameterStubImpl(
     }
 
     override fun isMutable() = isMutable
-    override fun hasValOrVarNode() = hasValOrVarNode
+    override fun hasValOrVar() = hasValOrVar
     override fun hasDefaultValue() = hasDefaultValue
 }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContext.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContext.java
index a71c81a0015..71004ed71a1 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContext.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BindingContext.java
@@ -174,7 +174,7 @@ public interface BindingContext {
             PsiElement declarationPsiElement = DescriptorToSourceUtils.descriptorToDeclaration(propertyDescriptor);
             if (declarationPsiElement instanceof JetParameter) {
                 JetParameter jetParameter = (JetParameter) declarationPsiElement;
-                return jetParameter.hasValOrVarNode() ||
+                return jetParameter.hasValOrVar() ||
                        backingFieldRequired; // this part is unused because we do not allow access to constructor parameters in member bodies
             }
             if (propertyDescriptor.getModality() == Modality.ABSTRACT) return false;
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.java
index 1f50355290d..832d2f67870 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.java
@@ -332,7 +332,7 @@ public class DeclarationsChecker {
 
     private void checkValOnAnnotationParameter(JetClass aClass) {
         for (JetParameter parameter : aClass.getPrimaryConstructorParameters()) {
-            if (!parameter.hasValOrVarNode()) {
+            if (!parameter.hasValOrVar()) {
                 trace.report(MISSING_VAL_ON_ANNOTATION_PARAMETER.on(parameter));
             }
         }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java
index 54d976c5f91..45b0e8e4a8a 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DescriptorResolver.java
@@ -19,7 +19,6 @@ package org.jetbrains.kotlin.resolve;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
-import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiElement;
 import kotlin.jvm.functions.Function0;
 import org.jetbrains.annotations.NotNull;
@@ -1193,9 +1192,9 @@ public class DescriptorResolver {
             @NotNull JetParameter parameter,
             @NotNull DiagnosticFactory1<PsiElement, JetKeywordToken> diagnosticFactory
     ) {
-        ASTNode valOrVarNode = parameter.getValOrVarNode();
-        if (valOrVarNode != null) {
-            trace.report(diagnosticFactory.on(valOrVarNode.getPsi(), ((JetKeywordToken) valOrVarNode.getElementType())));
+        PsiElement valOrVar = parameter.getValOrVarKeyword();
+        if (valOrVar != null) {
+            trace.report(diagnosticFactory.on(valOrVar, ((JetKeywordToken) valOrVar.getNode().getElementType())));
         }
     }
 
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorResolver.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorResolver.kt
index 8803f82e696..261336854f8 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorResolver.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/FunctionDescriptorResolver.kt
@@ -348,7 +348,7 @@ class FunctionDescriptorResolver(
 
     private fun checkConstructorParameterHasNoModifier(trace: BindingTrace, parameter: JetParameter) {
         // If is not a property, then it must have no modifier
-        if (!parameter.hasValOrVarNode()) {
+        if (!parameter.hasValOrVar()) {
             DescriptorResolver.checkParameterHasNoModifier(trace, parameter)
         }
     }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzer.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzer.kt
index fee2f7f130f..08a963f20c0 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzer.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/LazyTopDownAnalyzer.kt
@@ -192,7 +192,7 @@ public class LazyTopDownAnalyzer {
 
                 private fun registerPrimaryConstructorParameters(klass: JetClass) {
                     for (jetParameter in klass.getPrimaryConstructorParameters()) {
-                        if (jetParameter.hasValOrVarNode()) {
+                        if (jetParameter.hasValOrVar()) {
                             c.getPrimaryConstructorParameterProperties().put(jetParameter, lazyDeclarationResolver!!.resolveToDescriptor(jetParameter) as PropertyDescriptor)
                         }
                     }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyDeclarationResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyDeclarationResolver.java
index e0d59521f60..c70176375b0 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyDeclarationResolver.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/LazyDeclarationResolver.java
@@ -146,7 +146,7 @@ public class LazyDeclarationResolver {
                     JetClass jetClass = ((JetPrimaryConstructor) grandFather).getContainingClass();
                     // This is a primary constructor parameter
                     ClassDescriptor classDescriptor = getClassDescriptor(jetClass);
-                    if (parameter.hasValOrVarNode()) {
+                    if (parameter.hasValOrVar()) {
                         classDescriptor.getDefaultType().getMemberScope().getProperties(parameter.getNameAsSafeName());
                         return getBindingContext().get(BindingContext.PRIMARY_CONSTRUCTOR_PARAMETER, parameter);
                     }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/PsiBasedClassMemberDeclarationProvider.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/PsiBasedClassMemberDeclarationProvider.kt
index ad22909fc45..ae1f6b426a0 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/PsiBasedClassMemberDeclarationProvider.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/declarations/PsiBasedClassMemberDeclarationProvider.kt
@@ -33,7 +33,7 @@ public class PsiBasedClassMemberDeclarationProvider(
         }
 
         for (parameter in classInfo.getPrimaryConstructorParameters()) {
-            if (parameter.hasValOrVarNode()) {
+            if (parameter.hasValOrVar()) {
                 index.putToIndex(parameter)
             }
         }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java
index 04482c50bc0..347ee72d4de 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassDescriptor.java
@@ -316,7 +316,7 @@ public class LazyClassDescriptor extends ClassDescriptorBase implements ClassDes
         WritableScopeImpl scope = new WritableScopeImpl(JetScope.Empty.INSTANCE$, primaryConstructor, RedeclarationHandler.DO_NOTHING, "Scope with constructor parameters in " + getName());
         for (int i = 0; i < originalClassInfo.getPrimaryConstructorParameters().size(); i++) {
             JetParameter jetParameter = originalClassInfo.getPrimaryConstructorParameters().get(i);
-            if (!jetParameter.hasValOrVarNode()) {
+            if (!jetParameter.hasValOrVar()) {
                 scope.addVariableDescriptor(primaryConstructor.getValueParameters().get(i));
             }
         }
diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt
index 1bd622a6ee5..08e3c354257 100644
--- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt
+++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/lazy/descriptors/LazyClassMemberScope.kt
@@ -145,7 +145,7 @@ public open class LazyClassMemberScope(
 
             for (parameter in constructor.getValueParameters()) {
                 if (parameter.getType().isError()) continue
-                if (!primaryConstructorParameters.get(parameter.getIndex()).hasValOrVarNode()) continue
+                if (!primaryConstructorParameters.get(parameter.getIndex()).hasValOrVar()) continue
 
                 val properties = getProperties(parameter.getName())
                 if (properties.isEmpty()) continue
@@ -220,7 +220,7 @@ public open class LazyClassMemberScope(
             if (name != valueParameterDescriptor.getName()) continue
 
             val parameter = primaryConstructorParameters.get(valueParameterDescriptor.getIndex())
-            if (parameter.hasValOrVarNode()) {
+            if (parameter.hasValOrVar()) {
                 val propertyDescriptor = c.descriptorResolver.resolvePrimaryConstructorParameterToAProperty(
                         thisDescriptor, valueParameterDescriptor, thisDescriptor.getScopeForClassHeaderResolution(), parameter, trace)
                 result.add(propertyDescriptor)
diff --git a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/duplicateJvmSignatureUtil.kt b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/duplicateJvmSignatureUtil.kt
index 1daf8ae5602..1b0dc3e0c8a 100644
--- a/compiler/light-classes/src/org/jetbrains/kotlin/asJava/duplicateJvmSignatureUtil.kt
+++ b/compiler/light-classes/src/org/jetbrains/kotlin/asJava/duplicateJvmSignatureUtil.kt
@@ -44,7 +44,7 @@ public fun getJvmSignatureDiagnostics(element: PsiElement, otherDiagnostics: Dia
         if (element is JetPropertyAccessor) {
             parent = parent?.getParent()
         }
-        if (element is JetParameter && element.getValOrVarNode() != null) {
+        if (element is JetParameter && element.hasValOrVar()) {
             // property declared in constructor
             val parentClass = (parent?.getParent()?.getParent() as? JetClass)
             if (parentClass != null) {
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/JetSourceNavigationHelper.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/JetSourceNavigationHelper.java
index 0ca0a4fa9c5..6907f479c13 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/JetSourceNavigationHelper.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/navigation/JetSourceNavigationHelper.java
@@ -134,7 +134,7 @@ public class JetSourceNavigationHelper {
         // property constructor parameters
         List<JetParameter> constructorParameters = containingClass.getPrimaryConstructorParameters();
         for (JetParameter constructorParameter : constructorParameters) {
-            if (memberName.equals(constructorParameter.getNameAsName()) && constructorParameter.hasValOrVarNode()) {
+            if (memberName.equals(constructorParameter.getNameAsName()) && constructorParameter.hasValOrVar()) {
                 return constructorParameter;
             }
         }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/TypeClsStubBuilder.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/TypeClsStubBuilder.kt
index 52ef91dbce8..eefb572a9ef 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/TypeClsStubBuilder.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/decompiler/stubBuilder/TypeClsStubBuilder.kt
@@ -129,7 +129,7 @@ class TypeClsStubBuilder(private val c: ClsStubBuilderContext) {
         val typeArgumentsWithoutReceiverAndReturnType
                 = typeArgumentList.subList(if (isExtensionFunctionType) 1 else 0, typeArgumentList.size() - 1)
         typeArgumentsWithoutReceiverAndReturnType.forEach { argument ->
-            val parameter = KotlinParameterStubImpl(parameterList, fqName = null, name = null, isMutable = false, hasValOrVarNode = false, hasDefaultValue = false)
+            val parameter = KotlinParameterStubImpl(parameterList, fqName = null, name = null, isMutable = false, hasValOrVar = false, hasDefaultValue = false)
             createTypeReferenceStub(parameter, argument.getType())
         }
 
@@ -150,7 +150,7 @@ class TypeClsStubBuilder(private val c: ClsStubBuilderContext) {
                     name = name.ref(),
                     fqName = null,
                     hasDefaultValue = false,
-                    hasValOrVarNode = false,
+                    hasValOrVar = false,
                     isMutable = false
             )
             val isVararg = valueParameterProto.hasVarargElementType()
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuppressableWarningProblemGroup.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuppressableWarningProblemGroup.kt
index 3037d924bb8..e2b0b0b8ad2 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuppressableWarningProblemGroup.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/KotlinSuppressableWarningProblemGroup.kt
@@ -87,9 +87,9 @@ private object DeclarationKindDetector : JetVisitor<AnnotationHostKind?, Unit?>(
 
     override fun visitNamedFunction(d: JetNamedFunction, _: Unit?) = detect(d, "fun")
 
-    override fun visitProperty(d: JetProperty, _: Unit?) = detect(d, d.getValOrVarNode().getText()!!)
+    override fun visitProperty(d: JetProperty, _: Unit?) = detect(d, d.getValOrVarKeyword().getText()!!)
 
-    override fun visitMultiDeclaration(d: JetMultiDeclaration, _: Unit?) = detect(d, d.getValOrVarNode()?.getText() ?: "val",
+    override fun visitMultiDeclaration(d: JetMultiDeclaration, _: Unit?) = detect(d, d.getValOrVarKeyword()?.getText() ?: "val",
                                                                                   name = d.getEntries().map { it.getName() }.join(", ", "(", ")"))
 
     override fun visitTypeParameter(d: JetTypeParameter, _: Unit?) = detect(d, "type parameter", newLineNeeded = false)
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.java
index 034ca7ea324..66fcfd0dbcf 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/ideaExtensions/KotlinReferencesSearcher.java
@@ -128,7 +128,7 @@ public class KotlinReferencesSearcher extends QueryExecutorBase<PsiReference, Re
         else if (element instanceof KotlinLightMethod) {
             JetDeclaration declaration = ((KotlinLightMethod) element).getOrigin();
             if (declaration instanceof JetProperty
-                || (declaration instanceof JetParameter && ((JetParameter) declaration).hasValOrVarNode())) {
+                || (declaration instanceof JetParameter && ((JetParameter) declaration).hasValOrVar())) {
                 searchNamedElement(queryParameters, (PsiNamedElement) declaration);
             }
             else if (declaration instanceof JetPropertyAccessor) {
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/searchHelpers.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/searchHelpers.kt
index 29de60f8b6b..909c2a5ea63 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/searchHelpers.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/searchHelpers.kt
@@ -59,7 +59,7 @@ fun PsiNamedElement.getAccessorNames(readable: Boolean = true, writable: Boolean
         is JetProperty ->
             return LightClassUtil.getLightClassPropertyMethods(this).toNameList()
         is JetParameter ->
-            if (hasValOrVarNode()) {
+            if (hasValOrVar()) {
                 return LightClassUtil.getLightClassPropertyMethods(this).toNameList()
             }
     }
@@ -90,7 +90,7 @@ public fun PsiNamedElement.getSpecialNamesToSearch(): List<String> {
 }
 
 fun JetParameter.dataClassComponentFunctionName(): Name? {
-    if (!hasValOrVarNode()) return null
+    if (!hasValOrVar()) return null
 
     // Forcing full resolve of owner class: otherwise DATA_CLASS_COMPONENT_FUNCTION won't be calculated.
     // This is a hack, but better solution would need refactoring of data class component function resolution: they need to be resolved
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/utils.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/utils.kt
index c7924bf6327..8440b875903 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/utils.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/search/usagesSearch/utils.kt
@@ -194,7 +194,7 @@ fun PsiReference.isUsageInContainingDeclaration(declaration: JetNamedDeclaration
 
 fun PsiReference.isCallableOverrideUsage(declaration: JetNamedDeclaration): Boolean {
     val decl2Desc = { declaration: JetDeclaration ->
-        if (declaration is JetParameter && declaration.hasValOrVarNode()) declaration.propertyDescriptor else declaration.descriptor
+        if (declaration is JetParameter && declaration.hasValOrVar()) declaration.propertyDescriptor else declaration.descriptor
     }
 
     return checkUsageVsOriginalDescriptor(declaration, decl2Desc) { usageDescriptor, targetDescriptor ->
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/JetStructureViewElement.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/JetStructureViewElement.java
index 7e9b74b066e..df56a4c4136 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/JetStructureViewElement.java
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/structureView/JetStructureViewElement.java
@@ -156,7 +156,7 @@ public class JetStructureViewElement implements StructureViewTreeElement, Querya
             JetClass jetClass = (JetClass) element;
             List<JetDeclaration> declarations = new ArrayList<JetDeclaration>();
             for (JetParameter parameter : jetClass.getPrimaryConstructorParameters()) {
-                if (parameter.hasValOrVarNode()) {
+                if (parameter.hasValOrVar()) {
                     declarations.add(parameter);
                 }
             }
diff --git a/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/JetDeclarationMover.java b/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/JetDeclarationMover.java
index 3820d1bfa58..a4ea736a420 100644
--- a/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/JetDeclarationMover.java
+++ b/idea/src/org/jetbrains/kotlin/idea/codeInsight/upDownMover/JetDeclarationMover.java
@@ -76,8 +76,8 @@ public class JetDeclarationMover extends AbstractJetUpDownMover {
 
                     @Override
                     public void visitProperty(@NotNull JetProperty property) {
-                        PsiElement valOrVarNode = property.getValOrVarNode().getPsi();
-                        if (valOrVarNode != null) memberSuspects.add(valOrVarNode);
+                        PsiElement valOrVarKeyword = property.getValOrVarKeyword();
+                        if (valOrVarKeyword != null) memberSuspects.add(valOrVarKeyword);
 
                         JetTypeParameterList typeParameterList = property.getTypeParameterList();
                         if (typeParameterList != null) memberSuspects.add(typeParameterList);
diff --git a/idea/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt b/idea/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
index 8de7c8ae8ef..803366d1725 100644
--- a/idea/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/formatter/kotlinSpacingRules.kt
@@ -181,6 +181,10 @@ fun createSpacingBuilder(settings: CodeStyleSettings): KotlinSpacingBuilder {
             betweenInside(WHILE_KEYWORD, LPAR, DO_WHILE).spacing(1, 1, 0, false, 0)
             betweenInside(WHEN_KEYWORD, LPAR, WHEN).spacing(1, 1, 0, false, 0)
 
+            betweenInside(LPAR, VALUE_PARAMETER, FOR).spaces(0)
+            betweenInside(LPAR, MULTI_VARIABLE_DECLARATION, FOR).spaces(0)
+            betweenInside(LOOP_RANGE, RPAR, FOR).spaces(0)
+
             val TYPE_COLON_ELEMENTS = TokenSet.create(PROPERTY, FUN, VALUE_PARAMETER, MULTI_VARIABLE_DECLARATION_ENTRY, FUNCTION_LITERAL)
             beforeInside(COLON, TYPE_COLON_ELEMENTS) { spaceIf(jetSettings.SPACE_BEFORE_TYPE_COLON) }
             afterInside(COLON, TYPE_COLON_ELEMENTS) { spaceIf(jetSettings.SPACE_AFTER_TYPE_COLON) }
diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt
index f784da55457..512c9705233 100644
--- a/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/inspections/UnusedSymbolInspection.kt
@@ -106,7 +106,7 @@ public class UnusedSymbolInspection : AbstractKotlinInspection() {
                 if (declaration is JetEnumEntry) return
                 if (declaration.hasModifier(JetTokens.OVERRIDE_KEYWORD)) return
                 if (declaration is JetProperty && declaration.isLocal()) return
-                if (declaration is JetParameter && (declaration.getParent()?.getParent() !is JetPrimaryConstructor || !declaration.hasValOrVarNode())) return
+                if (declaration is JetParameter && (declaration.getParent()?.getParent() !is JetPrimaryConstructor || !declaration.hasValOrVar())) return
                 if (declaration is JetNamedFunction && isConventionalName(declaration)) return
 
                 // More expensive, resolve-based checks
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ChangeVisibilityModifierIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ChangeVisibilityModifierIntention.kt
index 2da74884242..bf66ad635de 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ChangeVisibilityModifierIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ChangeVisibilityModifierIntention.kt
@@ -108,12 +108,12 @@ public open class ChangeVisibilityModifierIntention protected constructor(
         if (JetPsiUtil.isLocal(declaration)) return null
         return when (declaration) {
             is JetNamedFunction -> declaration.getFunKeyword()?.getTextRange()
-            is JetProperty -> declaration.getValOrVarNode().getTextRange()
+            is JetProperty -> declaration.getValOrVarKeyword().getTextRange()
             is JetClass -> declaration.getClassOrInterfaceKeyword()?.getTextRange()
             is JetObjectDeclaration -> declaration.getObjectKeyword().getTextRange()
             is JetPrimaryConstructor -> declaration.getValueParameterList()?.let { TextRange.from(it.startOffset, 0) } //TODO: use constructor keyword if exist
             is JetSecondaryConstructor -> declaration.getConstructorKeyword().getTextRange()
-            is JetParameter -> declaration.getValOrVarNode()?.getTextRange()
+            is JetParameter -> declaration.getValOrVarKeyword()?.getTextRange()
             else -> null
         }
     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertFunctionToPropertyIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertFunctionToPropertyIntention.kt
index 744406e5f2f..02dcce57df6 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertFunctionToPropertyIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertFunctionToPropertyIntention.kt
@@ -71,7 +71,7 @@ public class ConvertFunctionToPropertyIntention : JetSelfTargetingIntention<JetN
                 originalFunction.typeFqNameToAdd?.let { function.setTypeReference(psiFactory.createType(it)) }
             }
 
-            function.getFunKeyword()!!.replace(propertySample.getValOrVarNode().getPsi())
+            function.getFunKeyword()!!.replace(propertySample.getValOrVarKeyword())
             function.getValueParameterList()?.delete()
             val insertAfter = (function.getEqualsToken() ?: function.getBodyExpression())
                     ?.siblings(forward = false, withItself = false)
diff --git a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPropertyToFunctionIntention.kt b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPropertyToFunctionIntention.kt
index a6c91090c24..2a3063beb8a 100644
--- a/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPropertyToFunctionIntention.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/intentions/ConvertPropertyToFunctionIntention.kt
@@ -58,7 +58,7 @@ public class ConvertPropertyToFunctionIntention : JetSelfTargetingIntention<JetP
 
             val sampleFunction = psiFactory.createFunction("fun foo() {\n\n}");
 
-            property.getValOrVarNode().getPsi().replace(sampleFunction.getFunKeyword()!!);
+            property.getValOrVarKeyword().replace(sampleFunction.getFunKeyword()!!);
             property.addAfter(psiFactory.createParameterList("()"), property.getNameIdentifier());
             if (property.getInitializer() == null) {
                 if (getter != null) {
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableMutabilityFix.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableMutabilityFix.kt
index 1b2168c6161..2401fd80277 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableMutabilityFix.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVariableMutabilityFix.kt
@@ -39,7 +39,9 @@ public class ChangeVariableMutabilityFix(element: JetProperty, private val makeV
     }
 
     override fun invoke(project: Project, editor: Editor?, file: JetFile) {
-        element.getValOrVarNode().getPsi().replace(JetPsiFactory(project).createValOrVarNode(if (makeVar) "var" else "val").getPsi())
+        val factory = JetPsiFactory(project)
+        val newKeyword = if (makeVar) factory.createVarKeyword() else factory.createValKeyword()
+        element.getValOrVarKeyword().replace(newKeyword)
     }
 
     companion object {
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveValVarFromParameterFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveValVarFromParameterFix.java
index 3eb15c8e8e2..00a39d12eca 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveValVarFromParameterFix.java
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/RemoveValVarFromParameterFix.java
@@ -17,10 +17,9 @@
 package org.jetbrains.kotlin.idea.quickfix;
 
 import com.intellij.codeInsight.intention.IntentionAction;
-import com.intellij.lang.ASTNode;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
-import com.intellij.psi.TokenType;
+import com.intellij.psi.PsiElement;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -35,7 +34,7 @@ public class RemoveValVarFromParameterFix extends JetIntentionAction<JetParamete
 
     public RemoveValVarFromParameterFix(@NotNull JetParameter element) {
         super(element);
-        ASTNode valOrVarNode = element.getValOrVarNode();
+        PsiElement valOrVarNode = element.getValOrVarKeyword();
         assert valOrVarNode != null : "Val or var node not found for " + PsiUtilPackage.getElementTextWithContext(element);
         varOrVal = valOrVarNode.getText();
     }
@@ -54,12 +53,9 @@ public class RemoveValVarFromParameterFix extends JetIntentionAction<JetParamete
 
     @Override
     protected void invoke(@NotNull Project project, Editor editor, JetFile file) throws IncorrectOperationException {
-        ASTNode valOrVarNode = element.getValOrVarNode();
-        if (valOrVarNode == null) return;
-
-        ASTNode next = valOrVarNode.getTreeNext();
-        ASTNode firstNodeToKeep = next.getElementType() == TokenType.WHITE_SPACE ? next.getTreeNext() : next;
-        element.getNode().removeRange(valOrVarNode, firstNodeToKeep);
+        PsiElement keyword = element.getValOrVarKeyword();
+        if (keyword == null) return;
+        keyword.delete();
     }
 
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
index 106248d2cb0..682e5af6979 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/createFromUsage/callableBuilder/CallableBuilder.kt
@@ -756,7 +756,7 @@ class CallableBuilder(val config: CallableBuilderConfiguration) {
 
         private fun setupValVarTemplate(builder: TemplateBuilder, property: JetProperty) {
             if (!(callableInfo as PropertyInfo).writable) {
-                builder.replaceElement(property.getValOrVarNode().getPsi()!!, ValVarExpression)
+                builder.replaceElement(property.getValOrVarKeyword(), ValVarExpression)
             }
         }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureData.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureData.kt
index 6bfcec29640..c7f9258f219 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureData.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureData.kt
@@ -65,7 +65,7 @@ public class JetChangeSignatureData(
                             name = parameterDescriptor.getName().asString(),
                             type = parameterDescriptor.getType(),
                             defaultValueForParameter = jetParameter?.getDefaultValue(),
-                            valOrVar = jetParameter?.getValOrVarNode().toValVar(),
+                            valOrVar = jetParameter?.getValOrVarKeyword().toValVar(),
                             modifierList = jetParameter?.getModifierList()
                     )
                 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetValVar.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetValVar.kt
index f0ed7bf6472..7c28868191d 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetValVar.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetValVar.kt
@@ -16,22 +16,31 @@
 
 package org.jetbrains.kotlin.idea.refactoring.changeSignature
 
-import com.intellij.lang.ASTNode
+import com.intellij.psi.PsiElement
 import org.jetbrains.kotlin.lexer.JetTokens
+import org.jetbrains.kotlin.psi.JetPsiFactory
 
 public enum class JetValVar(val name: String) {
-    None("none"),
-    Val("val"),
-    Var("var");
+    None("none") {
+        override fun createKeyword(factory: JetPsiFactory) = null
+    },
+    Val("val") {
+        override fun createKeyword(factory: JetPsiFactory) = factory.createValKeyword()
+    },
+    Var("var"){
+        override fun createKeyword(factory: JetPsiFactory) = factory.createVarKeyword()
+    };
 
     override fun toString(): String = name
+
+    abstract fun createKeyword(factory: JetPsiFactory): PsiElement?
 }
 
-fun ASTNode?.toValVar(): JetValVar {
+fun PsiElement?.toValVar(): JetValVar {
     return when {
         this == null -> JetValVar.None
-        getElementType() == JetTokens.VAL_KEYWORD -> JetValVar.Val
-        getElementType() == JetTokens.VAR_KEYWORD -> JetValVar.Var
+        getNode().getElementType() == JetTokens.VAL_KEYWORD -> JetValVar.Val
+        getNode().getElementType() == JetTokens.VAR_KEYWORD -> JetValVar.Var
         else -> throw IllegalArgumentException("Unknown val/var token: " + getText())
     }
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetFunctionDefinitionUsage.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetFunctionDefinitionUsage.java
index 337a55abc41..f65bd07b7c0 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetFunctionDefinitionUsage.java
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/usages/JetFunctionDefinitionUsage.java
@@ -16,7 +16,6 @@
 
 package org.jetbrains.kotlin.idea.refactoring.changeSignature.usages;
 
-import com.intellij.lang.ASTNode;
 import com.intellij.psi.PsiComment;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiMethod;
@@ -26,11 +25,21 @@ import kotlin.KotlinPackage;
 import kotlin.Pair;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
 import org.jetbrains.kotlin.descriptors.ClassDescriptor;
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor;
 import org.jetbrains.kotlin.descriptors.FunctionDescriptor;
 import org.jetbrains.kotlin.descriptors.impl.AnonymousFunctionDescriptor;
+import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage;
+import org.jetbrains.kotlin.idea.codeInsight.shorten.ShortenPackage;
+import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil;
+import org.jetbrains.kotlin.idea.refactoring.changeSignature.ChangeSignaturePackage;
+import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetChangeInfo;
+import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetParameterInfo;
+import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetValVar;
 import org.jetbrains.kotlin.idea.util.ShortenReferences;
+import org.jetbrains.kotlin.idea.util.ShortenReferences.Options;
+import org.jetbrains.kotlin.lexer.JetModifierKeywordToken;
 import org.jetbrains.kotlin.psi.*;
 import org.jetbrains.kotlin.psi.typeRefHelpers.TypeRefHelpersPackage;
 import org.jetbrains.kotlin.resolve.BindingContext;
@@ -38,16 +47,6 @@ import org.jetbrains.kotlin.resolve.DescriptorToSourceUtils;
 import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode;
 import org.jetbrains.kotlin.types.JetType;
 import org.jetbrains.kotlin.types.TypeSubstitutor;
-import org.jetbrains.kotlin.builtins.KotlinBuiltIns;
-import org.jetbrains.kotlin.lexer.JetModifierKeywordToken;
-import org.jetbrains.kotlin.idea.caches.resolve.ResolvePackage;
-import org.jetbrains.kotlin.idea.util.ShortenReferences.Options;
-import org.jetbrains.kotlin.idea.codeInsight.shorten.ShortenPackage;
-import org.jetbrains.kotlin.idea.refactoring.JetRefactoringUtil;
-import org.jetbrains.kotlin.idea.refactoring.changeSignature.ChangeSignaturePackage;
-import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetChangeInfo;
-import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetParameterInfo;
-import org.jetbrains.kotlin.idea.refactoring.changeSignature.JetValVar;
 
 import java.util.List;
 
@@ -351,22 +350,22 @@ public class JetFunctionDefinitionUsage<T extends PsiElement> extends JetUsageIn
     }
 
     private void changeParameter(int parameterIndex, JetParameter parameter, JetParameterInfo parameterInfo) {
-        ASTNode valOrVarAstNode = parameter.getValOrVarNode();
-        PsiElement valOrVarNode = valOrVarAstNode != null ? valOrVarAstNode.getPsi() : null;
+        PsiElement valOrVarKeyword = parameter.getValOrVarKeyword();
         JetValVar valOrVar = parameterInfo.getValOrVar();
 
         JetPsiFactory psiFactory = JetPsiFactory(getProject());
-        if (valOrVarNode != null) {
-            if (valOrVar == JetValVar.None) {
-                valOrVarNode.delete();
+        if (valOrVarKeyword != null) {
+            PsiElement newKeyword = valOrVar.createKeyword(psiFactory);
+            if (newKeyword != null) {
+                valOrVarKeyword.replace(newKeyword);
             }
             else {
-                valOrVarNode.replace(psiFactory.createValOrVarNode(valOrVar.toString()).getPsi());
+                valOrVarKeyword.delete();
             }
         }
         else if (valOrVar != JetValVar.None) {
             PsiElement firstChild = parameter.getFirstChild();
-            parameter.addBefore(psiFactory.createValOrVarNode(valOrVar.toString()).getPsi(), firstChild);
+            parameter.addBefore(valOrVar.createKeyword(psiFactory), firstChild);
             parameter.addBefore(psiFactory.createWhiteSpace(), firstChild);
         }
 
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt
index 5aa12e2f160..4cea56fa39c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinIntroduceParameterHandler.kt
@@ -324,7 +324,7 @@ public open class KotlinIntroduceParameterHandler(
 
 private fun findInternalParameterUsages(targetParent: JetNamedDeclaration): Map<JetParameter, List<PsiReference>> {
     return targetParent.getValueParameters()
-            .filter { !it.hasValOrVarNode() }
+            .filter { !it.hasValOrVar() }
             .map {
                 it to DefaultSearchHelper<JetParameter>()
                         .newRequest(UsagesSearchTarget(element = it))
diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinInplaceVariableIntroducer.java b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinInplaceVariableIntroducer.java
index 1b628a4fe22..c1e142904d2 100644
--- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinInplaceVariableIntroducer.java
+++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceVariable/KotlinInplaceVariableIntroducer.java
@@ -259,12 +259,12 @@ public class KotlinInplaceVariableIntroducer<D extends JetCallableDeclaration> e
                                 PsiDocumentManager.getInstance(myProject).commitDocument(myEditor.getDocument());
 
                                 JetPsiFactory psiFactory = new JetPsiFactory(myProject);
-                                ASTNode node = varCheckbox.isSelected() ? psiFactory.createVarNode() : psiFactory.createValNode();
+                                PsiElement keyword = varCheckbox.isSelected() ? psiFactory.createVarKeyword() : psiFactory.createValKeyword();
 
-                                ASTNode valOrVarNode = myDeclaration instanceof JetProperty
-                                                       ? ((JetProperty) myDeclaration).getValOrVarNode()
-                                                       : ((JetParameter) myDeclaration).getValOrVarNode();
-                                valOrVarNode.getPsi().replace(node.getPsi());
+                                PsiElement valOrVar = myDeclaration instanceof JetProperty
+                                                       ? ((JetProperty) myDeclaration).getValOrVarKeyword()
+                                                       : ((JetParameter) myDeclaration).getValOrVarKeyword();
+                                valOrVar.replace(keyword);
                             }
                         }.execute();
                     }
diff --git a/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/JetPsiUnifier.kt b/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/JetPsiUnifier.kt
index 9d64bf10a87..91855d9ff1c 100644
--- a/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/JetPsiUnifier.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/util/psi/patternMatching/JetPsiUnifier.kt
@@ -538,7 +538,7 @@ public class JetPsiUnifier(
         }
 
         private fun JetDeclaration.isNameRelevant(): Boolean {
-            if (this is JetParameter && hasValOrVarNode()) return true
+            if (this is JetParameter && hasValOrVar()) return true
 
             val parent = getParent()
             return parent is JetClassBody || parent is JetFile
diff --git a/idea/testData/decompiler/stubBuilder/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.txt b/idea/testData/decompiler/stubBuilder/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.txt
index 9a9bb2d3a61..96bbf18f645 100644
--- a/idea/testData/decompiler/stubBuilder/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.txt
+++ b/idea/testData/decompiler/stubBuilder/AnnotatedFlexibleTypes/AnnotatedFlexibleTypes.txt
@@ -6,7 +6,7 @@ PsiJetFileStubImpl[package=test]
     PRIMARY_CONSTRUCTOR:
       MODIFIER_LIST:[public]
       VALUE_PARAMETER_LIST:
-        VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=javaClass]
+        VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=javaClass]
           TYPE_REFERENCE:
             USER_TYPE:[isAbsoluteInRootPackage=false]
               USER_TYPE:[isAbsoluteInRootPackage=false]
diff --git a/idea/testData/decompiler/stubBuilder/AnnotationClass/AnnotationClass.txt b/idea/testData/decompiler/stubBuilder/AnnotationClass/AnnotationClass.txt
index caca5105718..a4bc94681f4 100644
--- a/idea/testData/decompiler/stubBuilder/AnnotationClass/AnnotationClass.txt
+++ b/idea/testData/decompiler/stubBuilder/AnnotationClass/AnnotationClass.txt
@@ -8,13 +8,13 @@ PsiJetFileStubImpl[package=test.a]
     PRIMARY_CONSTRUCTOR:
       MODIFIER_LIST:[public]
       VALUE_PARAMETER_LIST:
-        VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=i]
+        VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=i]
           TYPE_REFERENCE:
             USER_TYPE:[isAbsoluteInRootPackage=false]
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 REFERENCE_EXPRESSION:[referencedName=kotlin]
               REFERENCE_EXPRESSION:[referencedName=Int]
-        VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=j]
+        VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=j]
           TYPE_REFERENCE:
             USER_TYPE:[isAbsoluteInRootPackage=false]
               USER_TYPE:[isAbsoluteInRootPackage=false]
diff --git a/idea/testData/decompiler/stubBuilder/Annotations/Annotations.txt b/idea/testData/decompiler/stubBuilder/Annotations/Annotations.txt
index eda1d1ea94c..7668be75fe8 100644
--- a/idea/testData/decompiler/stubBuilder/Annotations/Annotations.txt
+++ b/idea/testData/decompiler/stubBuilder/Annotations/Annotations.txt
@@ -16,7 +16,7 @@ PsiJetFileStubImpl[package=]
                 USER_TYPE:[isAbsoluteInRootPackage=false]
                   REFERENCE_EXPRESSION:[referencedName=a]
       VALUE_PARAMETER_LIST:
-        VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=c1]
+        VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=c1]
           MODIFIER_LIST:[]
             ANNOTATION_ENTRY:[hasValueArguments=false, shortName=a]
               CONSTRUCTOR_CALLEE:
@@ -28,7 +28,7 @@ PsiJetFileStubImpl[package=]
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 REFERENCE_EXPRESSION:[referencedName=kotlin]
               REFERENCE_EXPRESSION:[referencedName=Int]
-        VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=c2]
+        VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=c2]
           MODIFIER_LIST:[]
             ANNOTATION_ENTRY:[hasValueArguments=false, shortName=a]
               CONSTRUCTOR_CALLEE:
@@ -95,7 +95,7 @@ PsiJetFileStubImpl[package=]
       FUN:[fqName=Annotations.annotationWithVararg, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=annotationWithVararg]
         MODIFIER_LIST:[private final]
         VALUE_PARAMETER_LIST:
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=i]
+          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=i]
             MODIFIER_LIST:[vararg]
               ANNOTATION_ENTRY:[hasValueArguments=false, shortName=a]
                 CONSTRUCTOR_CALLEE:
@@ -138,7 +138,7 @@ PsiJetFileStubImpl[package=]
                 USER_TYPE:[isAbsoluteInRootPackage=false]
                   REFERENCE_EXPRESSION:[referencedName=b]
         VALUE_PARAMETER_LIST:
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=p1]
+          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p1]
             MODIFIER_LIST:[]
               ANNOTATION_ENTRY:[hasValueArguments=false, shortName=a]
                 CONSTRUCTOR_CALLEE:
@@ -156,7 +156,7 @@ PsiJetFileStubImpl[package=]
       FUN:[fqName=Annotations.types, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=types]
         MODIFIER_LIST:[internal final]
         VALUE_PARAMETER_LIST:
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=param]
+          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=param]
             TYPE_REFERENCE:
               ANNOTATION:
                 ANNOTATION_ENTRY:[hasValueArguments=false, shortName=a]
diff --git a/idea/testData/decompiler/stubBuilder/ClassMembers/ClassMembers.txt b/idea/testData/decompiler/stubBuilder/ClassMembers/ClassMembers.txt
index 60c254ef540..f3fa1910934 100644
--- a/idea/testData/decompiler/stubBuilder/ClassMembers/ClassMembers.txt
+++ b/idea/testData/decompiler/stubBuilder/ClassMembers/ClassMembers.txt
@@ -6,31 +6,31 @@ PsiJetFileStubImpl[package=test]
     PRIMARY_CONSTRUCTOR:
       MODIFIER_LIST:[public]
       VALUE_PARAMETER_LIST:
-        VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=p]
+        VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p]
           TYPE_REFERENCE:
             USER_TYPE:[isAbsoluteInRootPackage=false]
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 REFERENCE_EXPRESSION:[referencedName=kotlin]
               REFERENCE_EXPRESSION:[referencedName=Int]
-        VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=p2]
+        VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p2]
           TYPE_REFERENCE:
             USER_TYPE:[isAbsoluteInRootPackage=false]
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 REFERENCE_EXPRESSION:[referencedName=kotlin]
               REFERENCE_EXPRESSION:[referencedName=String]
-        VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=p3]
+        VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p3]
           TYPE_REFERENCE:
             USER_TYPE:[isAbsoluteInRootPackage=false]
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 REFERENCE_EXPRESSION:[referencedName=kotlin]
               REFERENCE_EXPRESSION:[referencedName=Int]
-        VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=p4]
+        VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p4]
           TYPE_REFERENCE:
             USER_TYPE:[isAbsoluteInRootPackage=false]
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 REFERENCE_EXPRESSION:[referencedName=kotlin]
               REFERENCE_EXPRESSION:[referencedName=Int]
-        VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=p5]
+        VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p5]
           TYPE_REFERENCE:
             USER_TYPE:[isAbsoluteInRootPackage=false]
               USER_TYPE:[isAbsoluteInRootPackage=false]
diff --git a/idea/testData/decompiler/stubBuilder/DataClass/DataClass.txt b/idea/testData/decompiler/stubBuilder/DataClass/DataClass.txt
index 0d63bdd909d..1e50acba900 100644
--- a/idea/testData/decompiler/stubBuilder/DataClass/DataClass.txt
+++ b/idea/testData/decompiler/stubBuilder/DataClass/DataClass.txt
@@ -17,13 +17,13 @@ PsiJetFileStubImpl[package=a.b.c]
     PRIMARY_CONSTRUCTOR:
       MODIFIER_LIST:[public]
       VALUE_PARAMETER_LIST:
-        VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=i]
+        VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=i]
           TYPE_REFERENCE:
             USER_TYPE:[isAbsoluteInRootPackage=false]
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 REFERENCE_EXPRESSION:[referencedName=kotlin]
               REFERENCE_EXPRESSION:[referencedName=Int]
-        VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=j]
+        VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=j]
           TYPE_REFERENCE:
             USER_TYPE:[isAbsoluteInRootPackage=false]
               USER_TYPE:[isAbsoluteInRootPackage=false]
diff --git a/idea/testData/decompiler/stubBuilder/Delegation/Delegation.txt b/idea/testData/decompiler/stubBuilder/Delegation/Delegation.txt
index e8bd287ef65..c5d6f159e20 100644
--- a/idea/testData/decompiler/stubBuilder/Delegation/Delegation.txt
+++ b/idea/testData/decompiler/stubBuilder/Delegation/Delegation.txt
@@ -5,13 +5,13 @@ PsiJetFileStubImpl[package=]
     PRIMARY_CONSTRUCTOR:
       MODIFIER_LIST:[public]
       VALUE_PARAMETER_LIST:
-        VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=c]
+        VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=c]
           TYPE_REFERENCE:
             USER_TYPE:[isAbsoluteInRootPackage=false]
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 REFERENCE_EXPRESSION:[referencedName=kotlin]
               REFERENCE_EXPRESSION:[referencedName=Int]
-        VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=a]
+        VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=a]
           TYPE_REFERENCE:
             USER_TYPE:[isAbsoluteInRootPackage=false]
               REFERENCE_EXPRESSION:[referencedName=A]
diff --git a/idea/testData/decompiler/stubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.txt b/idea/testData/decompiler/stubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.txt
index 61418f7633f..c4a01022205 100644
--- a/idea/testData/decompiler/stubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.txt
+++ b/idea/testData/decompiler/stubBuilder/DependencyOnNestedClasses/DependencyOnNestedClasses.txt
@@ -19,7 +19,7 @@ PsiJetFileStubImpl[package=test]
       FUN:[fqName=test.DependencyOnNestedClasses.f, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=f]
         MODIFIER_LIST:[internal final]
         VALUE_PARAMETER_LIST:
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=nc]
+          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=nc]
             TYPE_REFERENCE:
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 USER_TYPE:[isAbsoluteInRootPackage=false]
@@ -29,7 +29,7 @@ PsiJetFileStubImpl[package=test]
                     REFERENCE_EXPRESSION:[referencedName=D]
                   REFERENCE_EXPRESSION:[referencedName=Companion]
                 REFERENCE_EXPRESSION:[referencedName=NestedInClassObject]
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=i]
+          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=i]
             TYPE_REFERENCE:
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 USER_TYPE:[isAbsoluteInRootPackage=false]
@@ -37,7 +37,7 @@ PsiJetFileStubImpl[package=test]
                     REFERENCE_EXPRESSION:[referencedName=dependency]
                   REFERENCE_EXPRESSION:[referencedName=D]
                 REFERENCE_EXPRESSION:[referencedName=Inner]
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=ii]
+          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=ii]
             TYPE_REFERENCE:
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 USER_TYPE:[isAbsoluteInRootPackage=false]
@@ -47,7 +47,7 @@ PsiJetFileStubImpl[package=test]
                     REFERENCE_EXPRESSION:[referencedName=D]
                   REFERENCE_EXPRESSION:[referencedName=Inner]
                 REFERENCE_EXPRESSION:[referencedName=Inner]
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=nn]
+          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=nn]
             TYPE_REFERENCE:
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 USER_TYPE:[isAbsoluteInRootPackage=false]
diff --git a/idea/testData/decompiler/stubBuilder/InheritingClasses/InheritingClasses.txt b/idea/testData/decompiler/stubBuilder/InheritingClasses/InheritingClasses.txt
index 8658af5c5a9..480517802b5 100644
--- a/idea/testData/decompiler/stubBuilder/InheritingClasses/InheritingClasses.txt
+++ b/idea/testData/decompiler/stubBuilder/InheritingClasses/InheritingClasses.txt
@@ -12,7 +12,7 @@ PsiJetFileStubImpl[package=a]
         PRIMARY_CONSTRUCTOR:
           MODIFIER_LIST:[public]
           VALUE_PARAMETER_LIST:
-            VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=c]
+            VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=c]
               TYPE_REFERENCE:
                 USER_TYPE:[isAbsoluteInRootPackage=false]
                   USER_TYPE:[isAbsoluteInRootPackage=false]
@@ -332,13 +332,13 @@ PsiJetFileStubImpl[package=a]
                         REFERENCE_EXPRESSION:[referencedName=InheritingClasses]
                       REFERENCE_EXPRESSION:[referencedName=E]
                 VALUE_PARAMETER_LIST:
-                  VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=null]
+                  VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null]
                     TYPE_REFERENCE:
                       USER_TYPE:[isAbsoluteInRootPackage=false]
                         USER_TYPE:[isAbsoluteInRootPackage=false]
                           REFERENCE_EXPRESSION:[referencedName=kotlin]
                         REFERENCE_EXPRESSION:[referencedName=Int]
-                  VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=null]
+                  VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null]
                     TYPE_REFERENCE:
                       USER_TYPE:[isAbsoluteInRootPackage=false]
                         USER_TYPE:[isAbsoluteInRootPackage=false]
@@ -360,13 +360,13 @@ PsiJetFileStubImpl[package=a]
             TYPE_REFERENCE:
               FUNCTION_TYPE:
                 VALUE_PARAMETER_LIST:
-                  VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=null]
+                  VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null]
                     TYPE_REFERENCE:
                       USER_TYPE:[isAbsoluteInRootPackage=false]
                         USER_TYPE:[isAbsoluteInRootPackage=false]
                           REFERENCE_EXPRESSION:[referencedName=kotlin]
                         REFERENCE_EXPRESSION:[referencedName=Int]
-                  VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=null]
+                  VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null]
                     TYPE_REFERENCE:
                       USER_TYPE:[isAbsoluteInRootPackage=false]
                         USER_TYPE:[isAbsoluteInRootPackage=false]
diff --git a/idea/testData/decompiler/stubBuilder/NestedClasses/NestedClasses.txt b/idea/testData/decompiler/stubBuilder/NestedClasses/NestedClasses.txt
index 54288ee0dce..3e8285ad53a 100644
--- a/idea/testData/decompiler/stubBuilder/NestedClasses/NestedClasses.txt
+++ b/idea/testData/decompiler/stubBuilder/NestedClasses/NestedClasses.txt
@@ -38,7 +38,7 @@ PsiJetFileStubImpl[package=test]
           FUN:[fqName=test.NestedClasses.Inner.f, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=f]
             MODIFIER_LIST:[internal final]
             VALUE_PARAMETER_LIST:
-              VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=p1]
+              VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p1]
                 TYPE_REFERENCE:
                   USER_TYPE:[isAbsoluteInRootPackage=false]
                     REFERENCE_EXPRESSION:[referencedName=TI]
@@ -58,11 +58,11 @@ PsiJetFileStubImpl[package=test]
               FUN:[fqName=test.NestedClasses.Inner.II.f, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=f]
                 MODIFIER_LIST:[internal final]
                 VALUE_PARAMETER_LIST:
-                  VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=p1]
+                  VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p1]
                     TYPE_REFERENCE:
                       USER_TYPE:[isAbsoluteInRootPackage=false]
                         REFERENCE_EXPRESSION:[referencedName=TII]
-                  VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=p2]
+                  VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p2]
                     TYPE_REFERENCE:
                       USER_TYPE:[isAbsoluteInRootPackage=false]
                         USER_TYPE:[isAbsoluteInRootPackage=false]
@@ -84,7 +84,7 @@ PsiJetFileStubImpl[package=test]
                                     TYPE_REFERENCE:
                                       USER_TYPE:[isAbsoluteInRootPackage=false]
                                         REFERENCE_EXPRESSION:[referencedName=TOuter]
-                  VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=p3]
+                  VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p3]
                     TYPE_REFERENCE:
                       USER_TYPE:[isAbsoluteInRootPackage=false]
                         REFERENCE_EXPRESSION:[referencedName=TOuter]
@@ -111,7 +111,7 @@ PsiJetFileStubImpl[package=test]
           FUN:[fqName=test.NestedClasses.Nested.f, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=f]
             MODIFIER_LIST:[internal final]
             VALUE_PARAMETER_LIST:
-              VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=p1]
+              VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p1]
                 TYPE_REFERENCE:
                   USER_TYPE:[isAbsoluteInRootPackage=false]
                     REFERENCE_EXPRESSION:[referencedName=TN]
@@ -134,11 +134,11 @@ PsiJetFileStubImpl[package=test]
               FUN:[fqName=test.NestedClasses.Nested.NI.f, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=f]
                 MODIFIER_LIST:[internal final]
                 VALUE_PARAMETER_LIST:
-                  VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=p1]
+                  VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p1]
                     TYPE_REFERENCE:
                       USER_TYPE:[isAbsoluteInRootPackage=false]
                         REFERENCE_EXPRESSION:[referencedName=TN]
-                  VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=p2]
+                  VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p2]
                     TYPE_REFERENCE:
                       USER_TYPE:[isAbsoluteInRootPackage=false]
                         REFERENCE_EXPRESSION:[referencedName=TNI]
@@ -165,7 +165,7 @@ PsiJetFileStubImpl[package=test]
               FUN:[fqName=test.NestedClasses.Nested.NN.f, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=f]
                 MODIFIER_LIST:[internal final]
                 VALUE_PARAMETER_LIST:
-                  VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=p1]
+                  VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p1]
                     TYPE_REFERENCE:
                       USER_TYPE:[isAbsoluteInRootPackage=false]
                         REFERENCE_EXPRESSION:[referencedName=TNN]
diff --git a/idea/testData/decompiler/stubBuilder/SecondaryConstructors/SecondaryConstructors.txt b/idea/testData/decompiler/stubBuilder/SecondaryConstructors/SecondaryConstructors.txt
index d4bb6e4f70c..e9302d6fd92 100644
--- a/idea/testData/decompiler/stubBuilder/SecondaryConstructors/SecondaryConstructors.txt
+++ b/idea/testData/decompiler/stubBuilder/SecondaryConstructors/SecondaryConstructors.txt
@@ -6,7 +6,7 @@ PsiJetFileStubImpl[package=test]
     PRIMARY_CONSTRUCTOR:
       MODIFIER_LIST:[public]
       VALUE_PARAMETER_LIST:
-        VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=x]
+        VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=x]
           TYPE_REFERENCE:
             USER_TYPE:[isAbsoluteInRootPackage=false]
               USER_TYPE:[isAbsoluteInRootPackage=false]
@@ -23,7 +23,7 @@ PsiJetFileStubImpl[package=test]
                     REFERENCE_EXPRESSION:[referencedName=test]
                   REFERENCE_EXPRESSION:[referencedName=anno]
         VALUE_PARAMETER_LIST:
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=x]
+          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=x]
             TYPE_REFERENCE:
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 USER_TYPE:[isAbsoluteInRootPackage=false]
@@ -32,7 +32,7 @@ PsiJetFileStubImpl[package=test]
       SECONDARY_CONSTRUCTOR:
         MODIFIER_LIST:[private]
         VALUE_PARAMETER_LIST:
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=x]
+          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=x]
             TYPE_REFERENCE:
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 USER_TYPE:[isAbsoluteInRootPackage=false]
@@ -65,11 +65,11 @@ PsiJetFileStubImpl[package=test]
           SECONDARY_CONSTRUCTOR:
             MODIFIER_LIST:[public]
             VALUE_PARAMETER_LIST:
-              VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=x]
+              VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=x]
                 TYPE_REFERENCE:
                   USER_TYPE:[isAbsoluteInRootPackage=false]
                     REFERENCE_EXPRESSION:[referencedName=T]
-              VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=g]
+              VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=g]
                 TYPE_REFERENCE:
                   USER_TYPE:[isAbsoluteInRootPackage=false]
                     REFERENCE_EXPRESSION:[referencedName=G]
@@ -86,7 +86,7 @@ PsiJetFileStubImpl[package=test]
                         REFERENCE_EXPRESSION:[referencedName=test]
                       REFERENCE_EXPRESSION:[referencedName=anno]
             VALUE_PARAMETER_LIST:
-              VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=z]
+              VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=z]
                 TYPE_REFERENCE:
                   USER_TYPE:[isAbsoluteInRootPackage=false]
                     USER_TYPE:[isAbsoluteInRootPackage=false]
diff --git a/idea/testData/decompiler/stubBuilder/TopLevelMembersAnnotatedPackage/TopLevelMembersAnnotatedPackage.txt b/idea/testData/decompiler/stubBuilder/TopLevelMembersAnnotatedPackage/TopLevelMembersAnnotatedPackage.txt
index 8336bf383e0..6e0a4404491 100644
--- a/idea/testData/decompiler/stubBuilder/TopLevelMembersAnnotatedPackage/TopLevelMembersAnnotatedPackage.txt
+++ b/idea/testData/decompiler/stubBuilder/TopLevelMembersAnnotatedPackage/TopLevelMembersAnnotatedPackage.txt
@@ -61,7 +61,7 @@ PsiJetFileStubImpl[package=a.b.c.topLevelMembersAnnotated]
                 REFERENCE_EXPRESSION:[referencedName=f]
               REFERENCE_EXPRESSION:[referencedName=b]
     VALUE_PARAMETER_LIST:
-      VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=p1]
+      VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p1]
         MODIFIER_LIST:[]
           ANNOTATION_ENTRY:[hasValueArguments=false, shortName=a]
             CONSTRUCTOR_CALLEE:
diff --git a/idea/testData/decompiler/stubBuilder/TopLevelMembersPackage/TopLevelMembersPackage.txt b/idea/testData/decompiler/stubBuilder/TopLevelMembersPackage/TopLevelMembersPackage.txt
index 041c6631e6a..b46f10d85e6 100644
--- a/idea/testData/decompiler/stubBuilder/TopLevelMembersPackage/TopLevelMembersPackage.txt
+++ b/idea/testData/decompiler/stubBuilder/TopLevelMembersPackage/TopLevelMembersPackage.txt
@@ -55,7 +55,7 @@ PsiJetFileStubImpl[package=foo.TopLevelMembers]
   FUN:[fqName=foo.TopLevelMembers.funWithParams, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=true, name=funWithParams]
     MODIFIER_LIST:[private]
     VALUE_PARAMETER_LIST:
-      VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=c]
+      VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=c]
         TYPE_REFERENCE:
           USER_TYPE:[isAbsoluteInRootPackage=false]
             USER_TYPE:[isAbsoluteInRootPackage=false]
@@ -69,13 +69,13 @@ PsiJetFileStubImpl[package=foo.TopLevelMembers]
   FUN:[fqName=foo.TopLevelMembers.funWithVarargParam, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=true, name=funWithVarargParam]
     MODIFIER_LIST:[private]
     VALUE_PARAMETER_LIST:
-      VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=c]
+      VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=c]
         TYPE_REFERENCE:
           USER_TYPE:[isAbsoluteInRootPackage=false]
             USER_TYPE:[isAbsoluteInRootPackage=false]
               REFERENCE_EXPRESSION:[referencedName=kotlin]
             REFERENCE_EXPRESSION:[referencedName=Int]
-      VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=v]
+      VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=v]
         MODIFIER_LIST:[vararg]
         TYPE_REFERENCE:
           USER_TYPE:[isAbsoluteInRootPackage=false]
@@ -105,7 +105,7 @@ PsiJetFileStubImpl[package=foo.TopLevelMembers]
           REFERENCE_EXPRESSION:[referencedName=kotlin]
         REFERENCE_EXPRESSION:[referencedName=Int]
     VALUE_PARAMETER_LIST:
-      VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=i]
+      VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=i]
         TYPE_REFERENCE:
           USER_TYPE:[isAbsoluteInRootPackage=false]
             USER_TYPE:[isAbsoluteInRootPackage=false]
diff --git a/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt b/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt
index 39694ae54a2..fdfd75d9c0b 100644
--- a/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt
+++ b/idea/testData/decompiler/stubBuilder/TypeParams/TypeParams.txt
@@ -22,7 +22,7 @@ PsiJetFileStubImpl[package=test]
         TYPE_REFERENCE:
           FUNCTION_TYPE:
             VALUE_PARAMETER_LIST:
-              VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=null]
+              VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null]
                 TYPE_REFERENCE:
                   USER_TYPE:[isAbsoluteInRootPackage=false]
                     USER_TYPE:[isAbsoluteInRootPackage=false]
@@ -128,15 +128,15 @@ PsiJetFileStubImpl[package=test]
           TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=T]
             MODIFIER_LIST:[reified]
         VALUE_PARAMETER_LIST:
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=g]
+          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=g]
             TYPE_REFERENCE:
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 REFERENCE_EXPRESSION:[referencedName=G]
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=body]
+          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=body]
             TYPE_REFERENCE:
               FUNCTION_TYPE:
                 VALUE_PARAMETER_LIST:
-                  VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=null]
+                  VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null]
                     TYPE_REFERENCE:
                       USER_TYPE:[isAbsoluteInRootPackage=false]
                         REFERENCE_EXPRESSION:[referencedName=G]
@@ -149,15 +149,15 @@ PsiJetFileStubImpl[package=test]
       FUN:[fqName=test.TypeParams.useParams, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=useParams]
         MODIFIER_LIST:[internal final]
         VALUE_PARAMETER_LIST:
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=p1]
+          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p1]
             TYPE_REFERENCE:
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 REFERENCE_EXPRESSION:[referencedName=T1]
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=p2]
+          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p2]
             TYPE_REFERENCE:
               FUNCTION_TYPE:
                 VALUE_PARAMETER_LIST:
-                  VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=null]
+                  VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null]
                     TYPE_REFERENCE:
                       USER_TYPE:[isAbsoluteInRootPackage=false]
                         REFERENCE_EXPRESSION:[referencedName=T2]
@@ -166,15 +166,15 @@ PsiJetFileStubImpl[package=test]
                     USER_TYPE:[isAbsoluteInRootPackage=false]
                       REFERENCE_EXPRESSION:[referencedName=kotlin]
                     REFERENCE_EXPRESSION:[referencedName=Unit]
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=p3]
+          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p3]
             TYPE_REFERENCE:
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 REFERENCE_EXPRESSION:[referencedName=T3]
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=p4]
+          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p4]
             TYPE_REFERENCE:
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 REFERENCE_EXPRESSION:[referencedName=T4]
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=P5]
+          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=P5]
             TYPE_REFERENCE:
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 REFERENCE_EXPRESSION:[referencedName=T5]
@@ -186,23 +186,23 @@ PsiJetFileStubImpl[package=test]
       FUN:[fqName=test.TypeParams.useParamsInOtherOrder, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=useParamsInOtherOrder]
         MODIFIER_LIST:[internal final]
         VALUE_PARAMETER_LIST:
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=p1]
+          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p1]
             TYPE_REFERENCE:
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 REFERENCE_EXPRESSION:[referencedName=T3]
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=p2]
+          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p2]
             TYPE_REFERENCE:
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 REFERENCE_EXPRESSION:[referencedName=T3]
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=p3]
+          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p3]
             TYPE_REFERENCE:
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 REFERENCE_EXPRESSION:[referencedName=T1]
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=p4]
+          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p4]
             TYPE_REFERENCE:
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 REFERENCE_EXPRESSION:[referencedName=T5]
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=P5]
+          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=P5]
             TYPE_REFERENCE:
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 REFERENCE_EXPRESSION:[referencedName=T1]
@@ -214,7 +214,7 @@ PsiJetFileStubImpl[package=test]
       FUN:[fqName=test.TypeParams.useParamsInTypeArg, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=false, name=useParamsInTypeArg]
         MODIFIER_LIST:[internal final]
         VALUE_PARAMETER_LIST:
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=p1]
+          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p1]
             TYPE_REFERENCE:
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 USER_TYPE:[isAbsoluteInRootPackage=false]
@@ -225,7 +225,7 @@ PsiJetFileStubImpl[package=test]
                     TYPE_REFERENCE:
                       USER_TYPE:[isAbsoluteInRootPackage=false]
                         REFERENCE_EXPRESSION:[referencedName=T1]
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=p2]
+          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p2]
             TYPE_REFERENCE:
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 USER_TYPE:[isAbsoluteInRootPackage=false]
@@ -242,7 +242,7 @@ PsiJetFileStubImpl[package=test]
                       NULLABLE_TYPE:
                         USER_TYPE:[isAbsoluteInRootPackage=false]
                           REFERENCE_EXPRESSION:[referencedName=T5]
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=p3]
+          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p3]
             TYPE_REFERENCE:
               FUNCTION_TYPE:
                 FUNCTION_TYPE_RECEIVER:
@@ -250,11 +250,11 @@ PsiJetFileStubImpl[package=test]
                     USER_TYPE:[isAbsoluteInRootPackage=false]
                       REFERENCE_EXPRESSION:[referencedName=T4]
                 VALUE_PARAMETER_LIST:
-                  VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=null]
+                  VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null]
                     TYPE_REFERENCE:
                       USER_TYPE:[isAbsoluteInRootPackage=false]
                         REFERENCE_EXPRESSION:[referencedName=T2]
-                  VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=null]
+                  VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null]
                     TYPE_REFERENCE:
                       USER_TYPE:[isAbsoluteInRootPackage=false]
                         REFERENCE_EXPRESSION:[referencedName=T3]
@@ -273,27 +273,27 @@ PsiJetFileStubImpl[package=test]
           TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=G2]
           TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=G3]
         VALUE_PARAMETER_LIST:
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=p1]
+          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p1]
             TYPE_REFERENCE:
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 REFERENCE_EXPRESSION:[referencedName=G1]
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=p2]
+          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p2]
             TYPE_REFERENCE:
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 REFERENCE_EXPRESSION:[referencedName=G2]
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=p3]
+          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p3]
             TYPE_REFERENCE:
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 REFERENCE_EXPRESSION:[referencedName=G3]
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=p4]
+          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p4]
             TYPE_REFERENCE:
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 REFERENCE_EXPRESSION:[referencedName=T1]
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=p5]
+          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p5]
             TYPE_REFERENCE:
               FUNCTION_TYPE:
                 VALUE_PARAMETER_LIST:
-                  VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=null]
+                  VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null]
                     TYPE_REFERENCE:
                       USER_TYPE:[isAbsoluteInRootPackage=false]
                         REFERENCE_EXPRESSION:[referencedName=T2]
@@ -320,27 +320,27 @@ PsiJetFileStubImpl[package=test]
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 REFERENCE_EXPRESSION:[referencedName=G1]
         VALUE_PARAMETER_LIST:
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=p1]
+          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p1]
             TYPE_REFERENCE:
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 REFERENCE_EXPRESSION:[referencedName=G1]
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=p2]
+          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p2]
             TYPE_REFERENCE:
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 REFERENCE_EXPRESSION:[referencedName=G2]
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=p3]
+          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p3]
             TYPE_REFERENCE:
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 REFERENCE_EXPRESSION:[referencedName=G3]
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=p4]
+          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p4]
             TYPE_REFERENCE:
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 REFERENCE_EXPRESSION:[referencedName=T1]
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=p5]
+          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p5]
             TYPE_REFERENCE:
               FUNCTION_TYPE:
                 VALUE_PARAMETER_LIST:
-                  VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=null]
+                  VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null]
                     TYPE_REFERENCE:
                       USER_TYPE:[isAbsoluteInRootPackage=false]
                         REFERENCE_EXPRESSION:[referencedName=T2]
@@ -377,23 +377,23 @@ PsiJetFileStubImpl[package=test]
           TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=T2]
           TYPE_PARAMETER:[fqName=null, isInVariance=false, isOutVariance=false, name=T3]
         VALUE_PARAMETER_LIST:
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=p1]
+          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p1]
             TYPE_REFERENCE:
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 REFERENCE_EXPRESSION:[referencedName=T1]
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=p2]
+          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p2]
             TYPE_REFERENCE:
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 REFERENCE_EXPRESSION:[referencedName=T2]
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=p3]
+          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p3]
             TYPE_REFERENCE:
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 REFERENCE_EXPRESSION:[referencedName=T3]
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=p4]
+          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p4]
             TYPE_REFERENCE:
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 REFERENCE_EXPRESSION:[referencedName=T4]
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=p5]
+          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p5]
             TYPE_REFERENCE:
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 REFERENCE_EXPRESSION:[referencedName=T5]
@@ -410,7 +410,7 @@ PsiJetFileStubImpl[package=test]
           USER_TYPE:[isAbsoluteInRootPackage=false]
             REFERENCE_EXPRESSION:[referencedName=T1]
         VALUE_PARAMETER_LIST:
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=p]
+          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p]
             TYPE_REFERENCE:
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 REFERENCE_EXPRESSION:[referencedName=T1]
@@ -427,7 +427,7 @@ PsiJetFileStubImpl[package=test]
           USER_TYPE:[isAbsoluteInRootPackage=false]
             REFERENCE_EXPRESSION:[referencedName=T1]
         VALUE_PARAMETER_LIST:
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=p]
+          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=p]
             TYPE_REFERENCE:
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 REFERENCE_EXPRESSION:[referencedName=T1]
diff --git a/idea/testData/decompiler/stubBuilder/Types/Types.txt b/idea/testData/decompiler/stubBuilder/Types/Types.txt
index b1e26fa0df4..9080548485a 100644
--- a/idea/testData/decompiler/stubBuilder/Types/Types.txt
+++ b/idea/testData/decompiler/stubBuilder/Types/Types.txt
@@ -18,11 +18,11 @@ PsiJetFileStubImpl[package=test]
                     REFERENCE_EXPRESSION:[referencedName=kotlin]
                   REFERENCE_EXPRESSION:[referencedName=String]
             VALUE_PARAMETER_LIST:
-              VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=null]
+              VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null]
                 TYPE_REFERENCE:
                   FUNCTION_TYPE:
                     VALUE_PARAMETER_LIST:
-                      VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=null]
+                      VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null]
                         TYPE_REFERENCE:
                           USER_TYPE:[isAbsoluteInRootPackage=false]
                             USER_TYPE:[isAbsoluteInRootPackage=false]
@@ -33,7 +33,7 @@ PsiJetFileStubImpl[package=test]
                         USER_TYPE:[isAbsoluteInRootPackage=false]
                           REFERENCE_EXPRESSION:[referencedName=kotlin]
                         REFERENCE_EXPRESSION:[referencedName=Int]
-              VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=null]
+              VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null]
                 TYPE_REFERENCE:
                   NULLABLE_TYPE:
                     USER_TYPE:[isAbsoluteInRootPackage=false]
@@ -88,14 +88,14 @@ PsiJetFileStubImpl[package=test]
                     REFERENCE_EXPRESSION:[referencedName=kotlin]
                   REFERENCE_EXPRESSION:[referencedName=String]
             VALUE_PARAMETER_LIST:
-              VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=null]
+              VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null]
                 TYPE_REFERENCE:
                   NULLABLE_TYPE:
                     USER_TYPE:[isAbsoluteInRootPackage=false]
                       USER_TYPE:[isAbsoluteInRootPackage=false]
                         REFERENCE_EXPRESSION:[referencedName=kotlin]
                       REFERENCE_EXPRESSION:[referencedName=Int]
-              VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=null]
+              VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null]
                 TYPE_REFERENCE:
                   NULLABLE_TYPE:
                     USER_TYPE:[isAbsoluteInRootPackage=false]
@@ -127,13 +127,13 @@ PsiJetFileStubImpl[package=test]
                     REFERENCE_EXPRESSION:[referencedName=kotlin]
                   REFERENCE_EXPRESSION:[referencedName=String]
             VALUE_PARAMETER_LIST:
-              VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=null]
+              VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null]
                 TYPE_REFERENCE:
                   USER_TYPE:[isAbsoluteInRootPackage=false]
                     USER_TYPE:[isAbsoluteInRootPackage=false]
                       REFERENCE_EXPRESSION:[referencedName=kotlin]
                     REFERENCE_EXPRESSION:[referencedName=Int]
-              VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=null]
+              VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null]
                 TYPE_REFERENCE:
                   USER_TYPE:[isAbsoluteInRootPackage=false]
                     USER_TYPE:[isAbsoluteInRootPackage=false]
@@ -166,13 +166,13 @@ PsiJetFileStubImpl[package=test]
         TYPE_REFERENCE:
           FUNCTION_TYPE:
             VALUE_PARAMETER_LIST:
-              VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=null]
+              VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null]
                 TYPE_REFERENCE:
                   USER_TYPE:[isAbsoluteInRootPackage=false]
                     USER_TYPE:[isAbsoluteInRootPackage=false]
                       REFERENCE_EXPRESSION:[referencedName=kotlin]
                     REFERENCE_EXPRESSION:[referencedName=String]
-              VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=null]
+              VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null]
                 TYPE_REFERENCE:
                   USER_TYPE:[isAbsoluteInRootPackage=false]
                     USER_TYPE:[isAbsoluteInRootPackage=false]
@@ -287,15 +287,15 @@ PsiJetFileStubImpl[package=test]
         TYPE_REFERENCE:
           FUNCTION_TYPE:
             VALUE_PARAMETER_LIST:
-              VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=null]
+              VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null]
                 TYPE_REFERENCE:
                   USER_TYPE:[isAbsoluteInRootPackage=false]
                     REFERENCE_EXPRESSION:[referencedName=P1]
-              VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=null]
+              VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null]
                 TYPE_REFERENCE:
                   USER_TYPE:[isAbsoluteInRootPackage=false]
                     REFERENCE_EXPRESSION:[referencedName=P2]
-              VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=null]
+              VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=null]
                 TYPE_REFERENCE:
                   USER_TYPE:[isAbsoluteInRootPackage=false]
                     REFERENCE_EXPRESSION:[referencedName=P3]
diff --git a/idea/testData/formatter/ForSpacing.after.kt b/idea/testData/formatter/ForSpacing.after.kt
index 640765c3744..a0f25a0fd01 100644
--- a/idea/testData/formatter/ForSpacing.after.kt
+++ b/idea/testData/formatter/ForSpacing.after.kt
@@ -13,4 +13,6 @@ fun f() {
 
     for (i in array(1, 2)) {
     }
+
+    for ((i, j) in x) continue
 }
\ No newline at end of file
diff --git a/idea/testData/formatter/ForSpacing.kt b/idea/testData/formatter/ForSpacing.kt
index 223830e03b6..d58ee217c56 100644
--- a/idea/testData/formatter/ForSpacing.kt
+++ b/idea/testData/formatter/ForSpacing.kt
@@ -10,10 +10,12 @@ fun f() {
     for
     (i in array(1, 2)){}
 
-    for(i in array(1, 2))continue
+    for( i in array(1, 2) )continue
 
     for (i in array(1, 2))
 
     {
     }
+
+    for( (i,j) in x) continue
 }
\ No newline at end of file
diff --git a/idea/testData/stubs/FunctionParameters.expected b/idea/testData/stubs/FunctionParameters.expected
index 6bfe4c7bf3a..6c93ed89c3b 100644
--- a/idea/testData/stubs/FunctionParameters.expected
+++ b/idea/testData/stubs/FunctionParameters.expected
@@ -2,11 +2,11 @@ PsiJetFileStubImpl[package=]
   PACKAGE_DIRECTIVE:
   FUN:[fqName=some, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=true, name=some]
     VALUE_PARAMETER_LIST:
-      VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=t]
+      VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=t]
         TYPE_REFERENCE:
           USER_TYPE:[isAbsoluteInRootPackage=false]
             REFERENCE_EXPRESSION:[referencedName=Int]
-      VALUE_PARAMETER:[fqName=null, hasDefaultValue=true, hasValOrVarNode=false, isMutable=false, name=other]
+      VALUE_PARAMETER:[fqName=null, hasDefaultValue=true, hasValOrVar=false, isMutable=false, name=other]
         TYPE_REFERENCE:
           USER_TYPE:[isAbsoluteInRootPackage=false]
             REFERENCE_EXPRESSION:[referencedName=String]
diff --git a/idea/testData/stubs/ParametersWithFqName.expected b/idea/testData/stubs/ParametersWithFqName.expected
index 17e288dc004..65ec13f9db0 100644
--- a/idea/testData/stubs/ParametersWithFqName.expected
+++ b/idea/testData/stubs/ParametersWithFqName.expected
@@ -4,15 +4,15 @@ PsiJetFileStubImpl[package=test]
   CLASS:[fqName=test.A, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=A, superNames=[]]
     PRIMARY_CONSTRUCTOR:
       VALUE_PARAMETER_LIST:
-        VALUE_PARAMETER:[fqName=test.A.b, hasDefaultValue=false, hasValOrVarNode=true, isMutable=false, name=b]
+        VALUE_PARAMETER:[fqName=test.A.b, hasDefaultValue=false, hasValOrVar=true, isMutable=false, name=b]
           TYPE_REFERENCE:
             USER_TYPE:[isAbsoluteInRootPackage=false]
               REFERENCE_EXPRESSION:[referencedName=Int]
-        VALUE_PARAMETER:[fqName=test.A.c, hasDefaultValue=false, hasValOrVarNode=true, isMutable=true, name=c]
+        VALUE_PARAMETER:[fqName=test.A.c, hasDefaultValue=false, hasValOrVar=true, isMutable=true, name=c]
           TYPE_REFERENCE:
             USER_TYPE:[isAbsoluteInRootPackage=false]
               REFERENCE_EXPRESSION:[referencedName=String]
-        VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=justParam]
+        VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=justParam]
           TYPE_REFERENCE:
             USER_TYPE:[isAbsoluteInRootPackage=false]
               REFERENCE_EXPRESSION:[referencedName=Int]
diff --git a/idea/testData/stubs/SecondaryConstructors.expected b/idea/testData/stubs/SecondaryConstructors.expected
index 90842a5c13e..d47f36f9c59 100644
--- a/idea/testData/stubs/SecondaryConstructors.expected
+++ b/idea/testData/stubs/SecondaryConstructors.expected
@@ -4,7 +4,7 @@ PsiJetFileStubImpl[package=test]
   CLASS:[fqName=test.SecondaryConstructors, isEnumEntry=false, isInterface=false, isLocal=false, isTopLevel=true, name=SecondaryConstructors, superNames=[]]
     PRIMARY_CONSTRUCTOR:
       VALUE_PARAMETER_LIST:
-        VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=x]
+        VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=x]
           TYPE_REFERENCE:
             USER_TYPE:[isAbsoluteInRootPackage=false]
               REFERENCE_EXPRESSION:[referencedName=Boolean]
@@ -18,7 +18,7 @@ PsiJetFileStubImpl[package=test]
                 USER_TYPE:[isAbsoluteInRootPackage=false]
                   REFERENCE_EXPRESSION:[referencedName=anno]
         VALUE_PARAMETER_LIST:
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=x]
+          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=x]
             TYPE_REFERENCE:
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 REFERENCE_EXPRESSION:[referencedName=String]
@@ -26,7 +26,7 @@ PsiJetFileStubImpl[package=test]
       SECONDARY_CONSTRUCTOR:
         MODIFIER_LIST:[private]
         VALUE_PARAMETER_LIST:
-          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=x]
+          VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=x]
             TYPE_REFERENCE:
               USER_TYPE:[isAbsoluteInRootPackage=false]
                 REFERENCE_EXPRESSION:[referencedName=Int]
@@ -50,11 +50,11 @@ PsiJetFileStubImpl[package=test]
         CLASS_BODY:
           SECONDARY_CONSTRUCTOR:
             VALUE_PARAMETER_LIST:
-              VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=x]
+              VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=x]
                 TYPE_REFERENCE:
                   USER_TYPE:[isAbsoluteInRootPackage=false]
                     REFERENCE_EXPRESSION:[referencedName=T]
-              VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=g]
+              VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=g]
                 TYPE_REFERENCE:
                   USER_TYPE:[isAbsoluteInRootPackage=false]
                     REFERENCE_EXPRESSION:[referencedName=G]
@@ -68,7 +68,7 @@ PsiJetFileStubImpl[package=test]
                     USER_TYPE:[isAbsoluteInRootPackage=false]
                       REFERENCE_EXPRESSION:[referencedName=anno]
             VALUE_PARAMETER_LIST:
-              VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=z]
+              VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=z]
                 TYPE_REFERENCE:
                   USER_TYPE:[isAbsoluteInRootPackage=false]
                     REFERENCE_EXPRESSION:[referencedName=Int]
diff --git a/idea/testData/stubs/TypeAnnotation.expected b/idea/testData/stubs/TypeAnnotation.expected
index 4af2f37b5d6..75be256ad60 100644
--- a/idea/testData/stubs/TypeAnnotation.expected
+++ b/idea/testData/stubs/TypeAnnotation.expected
@@ -6,7 +6,7 @@ PsiJetFileStubImpl[package=]
     MODIFIER_LIST:[annotation]
     PRIMARY_CONSTRUCTOR:
       VALUE_PARAMETER_LIST:
-        VALUE_PARAMETER:[fqName=b.e, hasDefaultValue=false, hasValOrVarNode=true, isMutable=false, name=e]
+        VALUE_PARAMETER:[fqName=b.e, hasDefaultValue=false, hasValOrVar=true, isMutable=false, name=e]
           TYPE_REFERENCE:
             USER_TYPE:[isAbsoluteInRootPackage=false]
               REFERENCE_EXPRESSION:[referencedName=E]
@@ -17,7 +17,7 @@ PsiJetFileStubImpl[package=]
       ENUM_ENTRY:[fqName=E.E2, isEnumEntry=true, isInterface=false, isLocal=false, isTopLevel=false, name=E2, superNames=[]]
   FUN:[fqName=types, hasBlockBody=true, hasBody=true, hasTypeParameterListBeforeFunctionName=false, isExtension=false, isTopLevel=true, name=types]
     VALUE_PARAMETER_LIST:
-      VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVarNode=false, isMutable=false, name=param]
+      VALUE_PARAMETER:[fqName=null, hasDefaultValue=false, hasValOrVar=false, isMutable=false, name=param]
         TYPE_REFERENCE:
           ANNOTATION:
             ANNOTATION_ENTRY:[hasValueArguments=false, shortName=a]
diff --git a/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt b/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt
index 7c94473e34d..534584ffe3f 100644
--- a/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt
+++ b/j2k/src/org/jetbrains/kotlin/j2k/JavaToKotlinConverter.kt
@@ -62,7 +62,7 @@ public interface PostProcessor {
                 val property = (psiElement as? JetSimpleNameExpression)?.getReference()?.resolve() as? JetProperty
                 if (property != null && !property.isVar()) {
                     val factory = JetPsiFactory(psiElement.getProject())
-                    property.getValOrVarNode().getPsi()!!.replace(factory.createVarNode().getPsi()!!)
+                    property.getValOrVarKeyword().replace(factory.createVarKeyword())
                 }
             }
 
diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/JsDataClassGenerator.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/JsDataClassGenerator.java
index 8cee01b3594..5b072b07a49 100644
--- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/JsDataClassGenerator.java
+++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/declaration/JsDataClassGenerator.java
@@ -66,7 +66,7 @@ class JsDataClassGenerator extends DataClassMethodGenerator {
 
             JsExpression argumentValue;
             JsExpression parameterValue = new JsNameRef(paramName);
-            if (!constructorParam.hasValOrVarNode()) {
+            if (!constructorParam.hasValOrVar()) {
                 assert !function.getValueParameters().get(i).hasDefaultValue();
                 // Caller cannot rely on default value and pass undefined here.
                 argumentValue = parameterValue;