Support custom accessors for top-level properties in scripts.

compiler/frontend/src/org/jetbrains/kotlin/parsing/AbstractKotlinParsing.java

@@ -239,8 +239,12 @@ import static org.jetbrains.kotlin.lexer.KtTokens.*;
         return myBuilder.lookAhead(k);
     }
 
-    protected void consumeIf(KtToken token) {
+    protected boolean consumeIf(KtToken token) {
-        if (at(token)) advance(); // token
+        if (at(token)) {
+            advance(); // token
+            return true;
+        }
+        return false;
     }
 
     // TODO: Migrate to predicates

compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinExpressionParsing.java

@@ -335,7 +335,7 @@ public class KotlinExpressionParsing extends AbstractKotlinParsing {
      */
     private void parsePrefixExpression() {
         if (at(AT)) {
-            if (!parseLocalDeclaration(/* rollbackIfDefinitelyNotExpression = */ false)) {
+            if (!parseLocalDeclaration(/* rollbackIfDefinitelyNotExpression = */ false, false)) {
                 PsiBuilder.Marker expression = mark();
                 myKotlinParsing.parseAnnotations(DEFAULT);
                 parsePrefixExpression();
@@ -661,7 +661,7 @@ public class KotlinExpressionParsing extends AbstractKotlinParsing {
             parseDoWhile();
         }
         else if (atSet(LOCAL_DECLARATION_FIRST) &&
-                    parseLocalDeclaration(/* rollbackIfDefinitelyNotExpression = */ myBuilder.newlineBeforeCurrentToken())) {
+                    parseLocalDeclaration(/* rollbackIfDefinitelyNotExpression = */ myBuilder.newlineBeforeCurrentToken(), false)) {
             // declaration was parsed, do nothing
         }
         else if (at(IDENTIFIER)) {
@@ -830,7 +830,7 @@ public class KotlinExpressionParsing extends AbstractKotlinParsing {
             PsiBuilder.Marker property = mark();
             myKotlinParsing.parseModifierList(DEFAULT, TokenSet.create(EQ, RPAR));
             if (at(VAL_KEYWORD) || at(VAR_KEYWORD)) {
-                myKotlinParsing.parseProperty(true);
+                myKotlinParsing.parseLocalProperty(false);
                 property.done(PROPERTY);
             }
             else {
@@ -1008,12 +1008,12 @@ public class KotlinExpressionParsing extends AbstractKotlinParsing {
     /*
      * modifiers declarationRest
      */
-    private boolean parseLocalDeclaration(boolean rollbackIfDefinitelyNotExpression) {
+    private boolean parseLocalDeclaration(boolean rollbackIfDefinitelyNotExpression, boolean isScriptTopLevel) {
         PsiBuilder.Marker decl = mark();
         KotlinParsing.ModifierDetector detector = new KotlinParsing.ModifierDetector();
         myKotlinParsing.parseModifierList(detector, DEFAULT, TokenSet.EMPTY);
 
-        IElementType declType = parseLocalDeclarationRest(detector.isEnumDetected(), rollbackIfDefinitelyNotExpression);
+        IElementType declType = parseLocalDeclarationRest(detector.isEnumDetected(), rollbackIfDefinitelyNotExpression, isScriptTopLevel);
 
         if (declType != null) {
             // we do not attach preceding comments (non-doc) to local variables because they are likely commenting a few statements below
@@ -1243,7 +1243,7 @@ public class KotlinExpressionParsing extends AbstractKotlinParsing {
      *  ;
      */
     private void parseStatement(boolean isScriptTopLevel) {
-        if (!parseLocalDeclaration(/* rollbackIfDefinitelyNotExpression = */false)) {
+        if (!parseLocalDeclaration(/* rollbackIfDefinitelyNotExpression = */false, /* isScriptTopLevel = */ isScriptTopLevel)) {
             if (!atSet(EXPRESSION_FIRST)) {
                 errorAndAdvance("Expecting a statement");
             }
@@ -1293,7 +1293,7 @@ public class KotlinExpressionParsing extends AbstractKotlinParsing {
      *   ;
      */
     @Nullable
-    private IElementType parseLocalDeclarationRest(boolean isEnum, boolean failIfDefinitelyNotExpression) {
+    private IElementType parseLocalDeclarationRest(boolean isEnum, boolean failIfDefinitelyNotExpression, boolean isScriptTopLevel) {
         IElementType keywordToken = tt();
         IElementType declType = null;
 
@@ -1310,7 +1310,7 @@ public class KotlinExpressionParsing extends AbstractKotlinParsing {
             declType = myKotlinParsing.parseFunction();
         }
         else if (keywordToken == VAL_KEYWORD || keywordToken == VAR_KEYWORD) {
-            declType = myKotlinParsing.parseProperty(true);
+            declType = myKotlinParsing.parseLocalProperty(isScriptTopLevel);
         }
         else if (keywordToken == TYPE_ALIAS_KEYWORD) {
             declType = myKotlinParsing.parseTypeAlias();

compiler/frontend/src/org/jetbrains/kotlin/parsing/KotlinParsing.java

@@ -1242,10 +1242,28 @@ public class KotlinParsing extends AbstractKotlinParsing {
      *   ;
      */
     private IElementType parseProperty() {
-        return parseProperty(false);
+        return parseProperty(PropertyParsingMode.MEMBER_OR_TOPLEVEL);
     }
 
-    public IElementType parseProperty(boolean local) {
+    public IElementType parseLocalProperty(boolean isScriptTopLevel) {
+        return parseProperty(isScriptTopLevel ? PropertyParsingMode.SCRIPT_TOPLEVEL : PropertyParsingMode.LOCAL);
+    }
+
+    enum PropertyParsingMode {
+        MEMBER_OR_TOPLEVEL(false, true),
+        LOCAL(true, false),
+        SCRIPT_TOPLEVEL(true, true);
+
+        public final boolean desctructuringAllowed;
+        public final boolean accessorsAllowed;
+
+        PropertyParsingMode(boolean desctructuringAllowed, boolean accessorsAllowed) {
+            this.desctructuringAllowed = desctructuringAllowed;
+            this.accessorsAllowed = accessorsAllowed;
+        }
+    }
+
+    public IElementType parseProperty(PropertyParsingMode mode) {
         assert (at(VAL_KEYWORD) || at(VAR_KEYWORD));
         advance();
 
@@ -1268,7 +1286,7 @@ public class KotlinParsing extends AbstractKotlinParsing {
         if (multiDeclaration) {
             PsiBuilder.Marker multiDecl = mark();
             parseMultiDeclarationName(propertyNameFollow);
-            errorIf(multiDecl, !local, "Destructuring declarations are only allowed for local variables/values");
+            errorIf(multiDecl, !mode.desctructuringAllowed, "Destructuring declarations are only allowed for local variables/values");
         }
         else {
             parseFunctionOrPropertyName(receiverTypeDeclared, "property", propertyNameFollow, /*nameRequired = */ true);
@@ -1297,25 +1315,30 @@ public class KotlinParsing extends AbstractKotlinParsing {
 
         beforeName.drop();
 
-        if (!local) {
+        if (mode.accessorsAllowed) {
             // It's only needed for non-local properties, because in local ones:
             // "val a = 1; b" must not be an infix call of b on "val ...;"
-            consumeIf(SEMICOLON);
 
-            AccessorKind accessorKind = parsePropertyGetterOrSetter(null);
+            myBuilder.enableNewlines();
-            if (accessorKind != null) {
+            boolean hasNewLineWithSemicolon = consumeIf(SEMICOLON) && myBuilder.newlineBeforeCurrentToken();
-                parsePropertyGetterOrSetter(accessorKind);
+            myBuilder.restoreNewlinesState();
-            }
 
-            if (!atSet(EOL_OR_SEMICOLON, RBRACE)) {
+            if (!hasNewLineWithSemicolon) {
-                if (getLastToken() != SEMICOLON) {
+                AccessorKind accessorKind = parsePropertyGetterOrSetter(null);
-                    errorUntil(
+                if (accessorKind != null) {
-                            "Property getter or setter expected",
+                    parsePropertyGetterOrSetter(accessorKind);
-                            TokenSet.orSet(DECLARATION_FIRST, TokenSet.create(EOL_OR_SEMICOLON, LBRACE, RBRACE)));
+                }
+
+                if (!atSet(EOL_OR_SEMICOLON, RBRACE)) {
+                    if (getLastToken() != SEMICOLON) {
+                        errorUntil(
+                                "Property getter or setter expected",
+                                TokenSet.orSet(DECLARATION_FIRST, TokenSet.create(EOL_OR_SEMICOLON, LBRACE, RBRACE)));
+                    }
+                }
+                else {
+                    consumeIf(SEMICOLON);
                 }
-            }
-            else {
-                consumeIf(SEMICOLON);
             }
         }
 

compiler/testData/codegen/box/intrinsics/prefixIncDec.kt

@@ -1,4 +1,4 @@
-public var inc: Int = 0;
+public var inc: Int = 0
 
 public var propInc: Int = 0
     get() {++inc; return field}
@@ -7,9 +7,9 @@ public var propInc: Int = 0
         field = a
     }
 
-public var dec: Int = 0;
+public var dec: Int = 0
 
-public var propDec: Int = 0;
+public var propDec: Int = 0
     get() { --dec; return field}
     set(a: Int) {
         --dec

compiler/testData/codegen/box/operatorConventions/kt4152.kt

@@ -9,7 +9,7 @@ public var propInc: Int = 0
 
 public var dec: Int = 0;
 
-public var propDec: Int = 0;
+public var propDec: Int = 0
     get() { dec--; return field}
     set(a: Int) {
         dec--

compiler/testData/codegen/box/statics/incInClassObject.kt

@@ -10,7 +10,7 @@ class A {
 
         var holder: String = ""
 
-        var r2: Int = 1;
+        var r2: Int = 1
             get() {
                 holder += "getR2"
                 return field
@@ -22,7 +22,7 @@ class A {
             return r2
         }
 
-        var r3: Int = 1;
+        var r3: Int = 1
             set(p: Int) {
                 holder += "setR3"
                 field = p
@@ -34,7 +34,7 @@ class A {
             return r3
         }
 
-        var r4: Int = 1;
+        var r4: Int = 1
             get() {
                 holder += "getR4"
                 return field

compiler/testData/codegen/box/statics/incInObject.kt

@@ -9,7 +9,7 @@ object A {
 
     var holder: String = ""
 
-    var r2: Int = 1;
+    var r2: Int = 1
         get() {
             holder += "getR2"
             return field
@@ -21,7 +21,7 @@ object A {
         return r2
     }
 
-    var r3: Int = 1;
+    var r3: Int = 1
         set(p: Int) {
             holder += "setR3"
             field = p
@@ -33,7 +33,7 @@ object A {
         return r3
     }
 
-    var r4: Int = 1;
+    var r4: Int = 1
         get() {
             holder += "getR4"
             return field

compiler/testData/codegen/java8/box/jvm8/defaults/reflection/propertyAnnotations.kt

@@ -7,7 +7,7 @@ annotation class Accessor(val value: String)
 
 interface Z {
     @Property("OK")
-    val z: String;
+    val z: String
         @Accessor("OK")
         get() = "OK"
 }

compiler/testData/codegen/java8/box/jvm8/defaults/reflection/propertyAnnotationsCompatibility.kt

@@ -7,7 +7,7 @@ annotation class Accessor(val value: String)
 
 interface Z {
     @Property("OK")
-    val z: String;
+    val z: String
         @Accessor("OK")
         get() = "OK"
 }

compiler/testData/codegen/java8/box/jvm8/defaults/simpleProperty.kt

@@ -2,7 +2,7 @@
 // KOTLIN_CONFIGURATION_FLAGS: +JVM.JVM8_TARGET_WITH_DEFAULTS
 
 interface Z {
-    val z: String;
+    val z: String
         get() = "OK"
 }
 

compiler/testData/codegen/java8/box/jvm8/simpleProperty.kt

@@ -1,7 +1,7 @@
 // JVM_TARGET: 1.8
 
 interface Z {
-    val z: String;
+    val z: String
         get() = "OK"
 }
 

compiler/testData/codegen/script/topLevelPropertiesWithGetSet.kts

@@ -0,0 +1,25 @@
+var log = "begin"
+fun append(msg: String) {
+    log = "$log;$msg"
+}
+
+val test1 get() = run {
+    append("test1.get")
+    "1"
+}
+
+val test2 get() = run {
+    append("test2.get")
+    test1
+}
+
+var test3: String = "Z"
+    set(value) {
+        append("test3.set")
+        field = value
+    }
+
+test3 = "3"
+
+val r = "$test1;$test2;$test3|$log"
+// expected: r: 1;1;3|begin;test3.set;test1.get;test2.get;test1.get

compiler/testData/diagnostics/tests/script/topLevelPropertiesWithGetSet.kts

@@ -0,0 +1,39 @@
+val testVal: Int get() = 42
+
+val testValNoType get() = 42
+
+val String.testExtVal: Int get() = 42
+
+val String.testExtValNoType get() = 42
+
+var testVar: Int get() = 42; set(value) {}
+
+var String.testExtVar: Int get() = 42; set(value) {}
+
+val testValLineBreak: Int
+get() = 42
+
+val testValLineBreakNoType
+get() = 42
+
+<!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>val testValLineBreakSemi: Int<!>;
+<!UNRESOLVED_REFERENCE!>get<!>() = 42
+
+<!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>val testValLineBreakSemiNoType<!>;
+<!UNRESOLVED_REFERENCE!>get<!>() = 42
+
+var testVarLineBreak: Int
+get() = 42
+set(value) {}
+
+var String.testExtVarLineBreak: Int
+get() = 42
+set(value) {}
+
+<!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>var testVarLineBreakSemi: Int<!>;
+<!UNRESOLVED_REFERENCE!>get<!>() = 42
+<!UNRESOLVED_REFERENCE!>set<!>(<!UNRESOLVED_REFERENCE!>value<!>) {}
+
+<!MUST_BE_INITIALIZED_OR_BE_ABSTRACT!>var String.testExtVarLineBreakSemi: Int<!>;
+<!UNRESOLVED_REFERENCE!>get<!>() = 42
+<!UNRESOLVED_REFERENCE!>set<!>(<!UNRESOLVED_REFERENCE!>value<!>) {}

compiler/testData/diagnostics/tests/script/topLevelPropertiesWithGetSet.txt

@@ -0,0 +1,23 @@
+package
+
+public final class TopLevelPropertiesWithGetSet : kotlin.script.templates.standard.ScriptTemplateWithArgs {
+    public constructor TopLevelPropertiesWithGetSet(/*0*/ args: kotlin.Array<kotlin.String>)
+    public final override /*1*/ /*fake_override*/ val args: kotlin.Array<kotlin.String>
+    public final val testVal: kotlin.Int
+    public final val testValLineBreak: kotlin.Int
+    public final val testValLineBreakNoType: kotlin.Int
+    public final val testValLineBreakSemi: kotlin.Int
+    public final val testValLineBreakSemiNoType: [ERROR : No type, no body]
+    public final val testValNoType: kotlin.Int
+    public final var testVar: kotlin.Int
+    public final var testVarLineBreak: kotlin.Int
+    public final var testVarLineBreakSemi: kotlin.Int
+    public final val kotlin.String.testExtVal: kotlin.Int
+    public final val kotlin.String.testExtValNoType: kotlin.Int
+    public final var kotlin.String.testExtVar: kotlin.Int
+    public final var kotlin.String.testExtVarLineBreak: kotlin.Int
+    public final var kotlin.String.testExtVarLineBreakSemi: kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+}

compiler/testData/psi/script/topLevelPropertiesWithGetSet.kts

@@ -0,0 +1,54 @@
+val testVal: Int get() = 42
+
+val testValSemiSameLine: Int; get() = 42
+
+val testValNoType get() = 42
+
+val String.testExtVal: Int get() = 42
+
+val String.testExtValNoType get() = 42
+
+var testVar: Int get() = 42; set(value) {}
+
+var String.testExtVar: Int get() = 42; set(value) {}
+
+val testValLineBreak: Int
+    get() = 42
+
+val testValLineBreakNoType
+    get() = 42
+
+val testValLineBreakSemi: Int;
+    get() = 42
+
+val testValLineBreakSemiComment1: Int; // this IS NOT an accessor:
+    get() = 42
+
+val testValLineBreakSemiComment2: Int; /*
+this IS NOT an accessor either:
+*/
+    get() = 42
+
+val testValLineBreakSemiComment3: Int; /*
+this IS an accessor!
+*/ get() = 42
+
+val testValLineBreakSemiNoType;
+    get() = 42
+
+var testVarLineBreak: Int
+    get() = 42
+    set(value) {}
+
+var String.testExtVarLineBreak: Int
+    get() = 42
+    set(value) {}
+
+var testVarLineBreakSemi: Int;
+    get() = 42
+    set(value) {}
+
+var String.testExtVarLineBreakSemi: Int;
+    get() = 42
+    set(value) {}
+

compiler/testData/psi/script/topLevelPropertiesWithGetSet.txt

@@ -0,0 +1,517 @@
+JetFile: topLevelPropertiesWithGetSet.kts
+  PACKAGE_DIRECTIVE
+    <empty list>
+  IMPORT_LIST
+    <empty list>
+  SCRIPT
+    BLOCK
+      PROPERTY
+        PsiElement(val)('val')
+        PsiWhiteSpace(' ')
+        PsiElement(IDENTIFIER)('testVal')
+        PsiElement(COLON)(':')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('Int')
+        PsiWhiteSpace(' ')
+        PROPERTY_ACCESSOR
+          PsiElement(get)('get')
+          PsiElement(LPAR)('(')
+          PsiElement(RPAR)(')')
+          PsiWhiteSpace(' ')
+          PsiElement(EQ)('=')
+          PsiWhiteSpace(' ')
+          INTEGER_CONSTANT
+            PsiElement(INTEGER_LITERAL)('42')
+      PsiWhiteSpace('\n\n')
+      PROPERTY
+        PsiElement(val)('val')
+        PsiWhiteSpace(' ')
+        PsiElement(IDENTIFIER)('testValSemiSameLine')
+        PsiElement(COLON)(':')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('Int')
+        PsiElement(SEMICOLON)(';')
+        PsiWhiteSpace(' ')
+        PROPERTY_ACCESSOR
+          PsiElement(get)('get')
+          PsiElement(LPAR)('(')
+          PsiElement(RPAR)(')')
+          PsiWhiteSpace(' ')
+          PsiElement(EQ)('=')
+          PsiWhiteSpace(' ')
+          INTEGER_CONSTANT
+            PsiElement(INTEGER_LITERAL)('42')
+      PsiWhiteSpace('\n\n')
+      PROPERTY
+        PsiElement(val)('val')
+        PsiWhiteSpace(' ')
+        PsiElement(IDENTIFIER)('testValNoType')
+        PsiWhiteSpace(' ')
+        PROPERTY_ACCESSOR
+          PsiElement(get)('get')
+          PsiElement(LPAR)('(')
+          PsiElement(RPAR)(')')
+          PsiWhiteSpace(' ')
+          PsiElement(EQ)('=')
+          PsiWhiteSpace(' ')
+          INTEGER_CONSTANT
+            PsiElement(INTEGER_LITERAL)('42')
+      PsiWhiteSpace('\n\n')
+      PROPERTY
+        PsiElement(val)('val')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('String')
+        PsiElement(DOT)('.')
+        PsiElement(IDENTIFIER)('testExtVal')
+        PsiElement(COLON)(':')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('Int')
+        PsiWhiteSpace(' ')
+        PROPERTY_ACCESSOR
+          PsiElement(get)('get')
+          PsiElement(LPAR)('(')
+          PsiElement(RPAR)(')')
+          PsiWhiteSpace(' ')
+          PsiElement(EQ)('=')
+          PsiWhiteSpace(' ')
+          INTEGER_CONSTANT
+            PsiElement(INTEGER_LITERAL)('42')
+      PsiWhiteSpace('\n\n')
+      PROPERTY
+        PsiElement(val)('val')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('String')
+        PsiElement(DOT)('.')
+        PsiElement(IDENTIFIER)('testExtValNoType')
+        PsiWhiteSpace(' ')
+        PROPERTY_ACCESSOR
+          PsiElement(get)('get')
+          PsiElement(LPAR)('(')
+          PsiElement(RPAR)(')')
+          PsiWhiteSpace(' ')
+          PsiElement(EQ)('=')
+          PsiWhiteSpace(' ')
+          INTEGER_CONSTANT
+            PsiElement(INTEGER_LITERAL)('42')
+      PsiWhiteSpace('\n\n')
+      PROPERTY
+        PsiElement(var)('var')
+        PsiWhiteSpace(' ')
+        PsiElement(IDENTIFIER)('testVar')
+        PsiElement(COLON)(':')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('Int')
+        PsiWhiteSpace(' ')
+        PROPERTY_ACCESSOR
+          PsiElement(get)('get')
+          PsiElement(LPAR)('(')
+          PsiElement(RPAR)(')')
+          PsiWhiteSpace(' ')
+          PsiElement(EQ)('=')
+          PsiWhiteSpace(' ')
+          INTEGER_CONSTANT
+            PsiElement(INTEGER_LITERAL)('42')
+          PsiElement(SEMICOLON)(';')
+        PsiWhiteSpace(' ')
+        PROPERTY_ACCESSOR
+          PsiElement(set)('set')
+          PsiElement(LPAR)('(')
+          VALUE_PARAMETER_LIST
+            VALUE_PARAMETER
+              PsiElement(IDENTIFIER)('value')
+          PsiElement(RPAR)(')')
+          PsiWhiteSpace(' ')
+          BLOCK
+            PsiElement(LBRACE)('{')
+            PsiElement(RBRACE)('}')
+      PsiWhiteSpace('\n\n')
+      PROPERTY
+        PsiElement(var)('var')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('String')
+        PsiElement(DOT)('.')
+        PsiElement(IDENTIFIER)('testExtVar')
+        PsiElement(COLON)(':')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('Int')
+        PsiWhiteSpace(' ')
+        PROPERTY_ACCESSOR
+          PsiElement(get)('get')
+          PsiElement(LPAR)('(')
+          PsiElement(RPAR)(')')
+          PsiWhiteSpace(' ')
+          PsiElement(EQ)('=')
+          PsiWhiteSpace(' ')
+          INTEGER_CONSTANT
+            PsiElement(INTEGER_LITERAL)('42')
+          PsiElement(SEMICOLON)(';')
+        PsiWhiteSpace(' ')
+        PROPERTY_ACCESSOR
+          PsiElement(set)('set')
+          PsiElement(LPAR)('(')
+          VALUE_PARAMETER_LIST
+            VALUE_PARAMETER
+              PsiElement(IDENTIFIER)('value')
+          PsiElement(RPAR)(')')
+          PsiWhiteSpace(' ')
+          BLOCK
+            PsiElement(LBRACE)('{')
+            PsiElement(RBRACE)('}')
+      PsiWhiteSpace('\n\n')
+      PROPERTY
+        PsiElement(val)('val')
+        PsiWhiteSpace(' ')
+        PsiElement(IDENTIFIER)('testValLineBreak')
+        PsiElement(COLON)(':')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('Int')
+        PsiWhiteSpace('\n    ')
+        PROPERTY_ACCESSOR
+          PsiElement(get)('get')
+          PsiElement(LPAR)('(')
+          PsiElement(RPAR)(')')
+          PsiWhiteSpace(' ')
+          PsiElement(EQ)('=')
+          PsiWhiteSpace(' ')
+          INTEGER_CONSTANT
+            PsiElement(INTEGER_LITERAL)('42')
+      PsiWhiteSpace('\n\n')
+      PROPERTY
+        PsiElement(val)('val')
+        PsiWhiteSpace(' ')
+        PsiElement(IDENTIFIER)('testValLineBreakNoType')
+        PsiWhiteSpace('\n    ')
+        PROPERTY_ACCESSOR
+          PsiElement(get)('get')
+          PsiElement(LPAR)('(')
+          PsiElement(RPAR)(')')
+          PsiWhiteSpace(' ')
+          PsiElement(EQ)('=')
+          PsiWhiteSpace(' ')
+          INTEGER_CONSTANT
+            PsiElement(INTEGER_LITERAL)('42')
+      PsiWhiteSpace('\n\n')
+      PROPERTY
+        PsiElement(val)('val')
+        PsiWhiteSpace(' ')
+        PsiElement(IDENTIFIER)('testValLineBreakSemi')
+        PsiElement(COLON)(':')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('Int')
+        PsiElement(SEMICOLON)(';')
+      PsiWhiteSpace('\n    ')
+      SCRIPT_INITIALIZER
+        BINARY_EXPRESSION
+          CALL_EXPRESSION
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('get')
+            VALUE_ARGUMENT_LIST
+              PsiElement(LPAR)('(')
+              PsiElement(RPAR)(')')
+          PsiWhiteSpace(' ')
+          OPERATION_REFERENCE
+            PsiElement(EQ)('=')
+          PsiWhiteSpace(' ')
+          INTEGER_CONSTANT
+            PsiElement(INTEGER_LITERAL)('42')
+      PsiWhiteSpace('\n\n')
+      PROPERTY
+        PsiElement(val)('val')
+        PsiWhiteSpace(' ')
+        PsiElement(IDENTIFIER)('testValLineBreakSemiComment1')
+        PsiElement(COLON)(':')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('Int')
+        PsiElement(SEMICOLON)(';')
+        PsiWhiteSpace(' ')
+        PsiComment(EOL_COMMENT)('// this IS NOT an accessor:')
+      PsiWhiteSpace('\n    ')
+      SCRIPT_INITIALIZER
+        BINARY_EXPRESSION
+          CALL_EXPRESSION
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('get')
+            VALUE_ARGUMENT_LIST
+              PsiElement(LPAR)('(')
+              PsiElement(RPAR)(')')
+          PsiWhiteSpace(' ')
+          OPERATION_REFERENCE
+            PsiElement(EQ)('=')
+          PsiWhiteSpace(' ')
+          INTEGER_CONSTANT
+            PsiElement(INTEGER_LITERAL)('42')
+      PsiWhiteSpace('\n\n')
+      PROPERTY
+        PsiElement(val)('val')
+        PsiWhiteSpace(' ')
+        PsiElement(IDENTIFIER)('testValLineBreakSemiComment2')
+        PsiElement(COLON)(':')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('Int')
+        PsiElement(SEMICOLON)(';')
+        PsiWhiteSpace(' ')
+        PsiComment(BLOCK_COMMENT)('/*\nthis IS NOT an accessor either:\n*/')
+      PsiWhiteSpace('\n    ')
+      SCRIPT_INITIALIZER
+        BINARY_EXPRESSION
+          CALL_EXPRESSION
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('get')
+            VALUE_ARGUMENT_LIST
+              PsiElement(LPAR)('(')
+              PsiElement(RPAR)(')')
+          PsiWhiteSpace(' ')
+          OPERATION_REFERENCE
+            PsiElement(EQ)('=')
+          PsiWhiteSpace(' ')
+          INTEGER_CONSTANT
+            PsiElement(INTEGER_LITERAL)('42')
+      PsiWhiteSpace('\n\n')
+      PROPERTY
+        PsiElement(val)('val')
+        PsiWhiteSpace(' ')
+        PsiElement(IDENTIFIER)('testValLineBreakSemiComment3')
+        PsiElement(COLON)(':')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('Int')
+        PsiElement(SEMICOLON)(';')
+        PsiWhiteSpace(' ')
+        PsiComment(BLOCK_COMMENT)('/*\nthis IS an accessor!\n*/')
+        PsiWhiteSpace(' ')
+        PROPERTY_ACCESSOR
+          PsiElement(get)('get')
+          PsiElement(LPAR)('(')
+          PsiElement(RPAR)(')')
+          PsiWhiteSpace(' ')
+          PsiElement(EQ)('=')
+          PsiWhiteSpace(' ')
+          INTEGER_CONSTANT
+            PsiElement(INTEGER_LITERAL)('42')
+      PsiWhiteSpace('\n\n')
+      PROPERTY
+        PsiElement(val)('val')
+        PsiWhiteSpace(' ')
+        PsiElement(IDENTIFIER)('testValLineBreakSemiNoType')
+        PsiElement(SEMICOLON)(';')
+      PsiWhiteSpace('\n    ')
+      SCRIPT_INITIALIZER
+        BINARY_EXPRESSION
+          CALL_EXPRESSION
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('get')
+            VALUE_ARGUMENT_LIST
+              PsiElement(LPAR)('(')
+              PsiElement(RPAR)(')')
+          PsiWhiteSpace(' ')
+          OPERATION_REFERENCE
+            PsiElement(EQ)('=')
+          PsiWhiteSpace(' ')
+          INTEGER_CONSTANT
+            PsiElement(INTEGER_LITERAL)('42')
+      PsiWhiteSpace('\n\n')
+      PROPERTY
+        PsiElement(var)('var')
+        PsiWhiteSpace(' ')
+        PsiElement(IDENTIFIER)('testVarLineBreak')
+        PsiElement(COLON)(':')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('Int')
+        PsiWhiteSpace('\n    ')
+        PROPERTY_ACCESSOR
+          PsiElement(get)('get')
+          PsiElement(LPAR)('(')
+          PsiElement(RPAR)(')')
+          PsiWhiteSpace(' ')
+          PsiElement(EQ)('=')
+          PsiWhiteSpace(' ')
+          INTEGER_CONSTANT
+            PsiElement(INTEGER_LITERAL)('42')
+        PsiWhiteSpace('\n    ')
+        PROPERTY_ACCESSOR
+          PsiElement(set)('set')
+          PsiElement(LPAR)('(')
+          VALUE_PARAMETER_LIST
+            VALUE_PARAMETER
+              PsiElement(IDENTIFIER)('value')
+          PsiElement(RPAR)(')')
+          PsiWhiteSpace(' ')
+          BLOCK
+            PsiElement(LBRACE)('{')
+            PsiElement(RBRACE)('}')
+      PsiWhiteSpace('\n\n')
+      PROPERTY
+        PsiElement(var)('var')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('String')
+        PsiElement(DOT)('.')
+        PsiElement(IDENTIFIER)('testExtVarLineBreak')
+        PsiElement(COLON)(':')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('Int')
+        PsiWhiteSpace('\n    ')
+        PROPERTY_ACCESSOR
+          PsiElement(get)('get')
+          PsiElement(LPAR)('(')
+          PsiElement(RPAR)(')')
+          PsiWhiteSpace(' ')
+          PsiElement(EQ)('=')
+          PsiWhiteSpace(' ')
+          INTEGER_CONSTANT
+            PsiElement(INTEGER_LITERAL)('42')
+        PsiWhiteSpace('\n    ')
+        PROPERTY_ACCESSOR
+          PsiElement(set)('set')
+          PsiElement(LPAR)('(')
+          VALUE_PARAMETER_LIST
+            VALUE_PARAMETER
+              PsiElement(IDENTIFIER)('value')
+          PsiElement(RPAR)(')')
+          PsiWhiteSpace(' ')
+          BLOCK
+            PsiElement(LBRACE)('{')
+            PsiElement(RBRACE)('}')
+      PsiWhiteSpace('\n\n')
+      PROPERTY
+        PsiElement(var)('var')
+        PsiWhiteSpace(' ')
+        PsiElement(IDENTIFIER)('testVarLineBreakSemi')
+        PsiElement(COLON)(':')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('Int')
+        PsiElement(SEMICOLON)(';')
+      PsiWhiteSpace('\n    ')
+      SCRIPT_INITIALIZER
+        BINARY_EXPRESSION
+          CALL_EXPRESSION
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('get')
+            VALUE_ARGUMENT_LIST
+              PsiElement(LPAR)('(')
+              PsiElement(RPAR)(')')
+          PsiWhiteSpace(' ')
+          OPERATION_REFERENCE
+            PsiElement(EQ)('=')
+          PsiWhiteSpace(' ')
+          INTEGER_CONSTANT
+            PsiElement(INTEGER_LITERAL)('42')
+      PsiWhiteSpace('\n    ')
+      SCRIPT_INITIALIZER
+        CALL_EXPRESSION
+          REFERENCE_EXPRESSION
+            PsiElement(IDENTIFIER)('set')
+          VALUE_ARGUMENT_LIST
+            PsiElement(LPAR)('(')
+            VALUE_ARGUMENT
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('value')
+            PsiElement(RPAR)(')')
+          PsiWhiteSpace(' ')
+          LAMBDA_ARGUMENT
+            LAMBDA_EXPRESSION
+              FUNCTION_LITERAL
+                PsiElement(LBRACE)('{')
+                BLOCK
+                  <empty list>
+                PsiElement(RBRACE)('}')
+      PsiWhiteSpace('\n\n')
+      PROPERTY
+        PsiElement(var)('var')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('String')
+        PsiElement(DOT)('.')
+        PsiElement(IDENTIFIER)('testExtVarLineBreakSemi')
+        PsiElement(COLON)(':')
+        PsiWhiteSpace(' ')
+        TYPE_REFERENCE
+          USER_TYPE
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('Int')
+        PsiElement(SEMICOLON)(';')
+      PsiWhiteSpace('\n    ')
+      SCRIPT_INITIALIZER
+        BINARY_EXPRESSION
+          CALL_EXPRESSION
+            REFERENCE_EXPRESSION
+              PsiElement(IDENTIFIER)('get')
+            VALUE_ARGUMENT_LIST
+              PsiElement(LPAR)('(')
+              PsiElement(RPAR)(')')
+          PsiWhiteSpace(' ')
+          OPERATION_REFERENCE
+            PsiElement(EQ)('=')
+          PsiWhiteSpace(' ')
+          INTEGER_CONSTANT
+            PsiElement(INTEGER_LITERAL)('42')
+      PsiWhiteSpace('\n    ')
+      SCRIPT_INITIALIZER
+        CALL_EXPRESSION
+          REFERENCE_EXPRESSION
+            PsiElement(IDENTIFIER)('set')
+          VALUE_ARGUMENT_LIST
+            PsiElement(LPAR)('(')
+            VALUE_ARGUMENT
+              REFERENCE_EXPRESSION
+                PsiElement(IDENTIFIER)('value')
+            PsiElement(RPAR)(')')
+          PsiWhiteSpace(' ')
+          LAMBDA_ARGUMENT
+            LAMBDA_EXPRESSION
+              FUNCTION_LITERAL
+                PsiElement(LBRACE)('{')
+                BLOCK
+                  <empty list>
+                PsiElement(RBRACE)('}')

compiler/tests/org/jetbrains/kotlin/checkers/DiagnosticsTestGenerated.java

@@ -23306,6 +23306,12 @@ public class DiagnosticsTestGenerated extends AbstractDiagnosticsTest {
             doTest(fileName);
         }
 
+        @TestMetadata("topLevelPropertiesWithGetSet.kts")
+        public void testTopLevelPropertiesWithGetSet() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/script/topLevelPropertiesWithGetSet.kts");
+            doTest(fileName);
+        }
+
         @TestMetadata("topLevelVariable.kts")
         public void testTopLevelVariable() throws Exception {
             String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/script/topLevelVariable.kts");

compiler/tests/org/jetbrains/kotlin/codegen/ScriptCodegenTestGenerated.java

@@ -162,6 +162,12 @@ public class ScriptCodegenTestGenerated extends AbstractScriptCodegenTest {
         doTest(fileName);
     }
 
+    @TestMetadata("topLevelPropertiesWithGetSet.kts")
+    public void testTopLevelPropertiesWithGetSet() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/script/topLevelPropertiesWithGetSet.kts");
+        doTest(fileName);
+    }
+
     @TestMetadata("topLevelProperty.kts")
     public void testTopLevelProperty() throws Exception {
         String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/script/topLevelProperty.kts");

compiler/tests/org/jetbrains/kotlin/parsing/ParsingTestGenerated.java

@@ -2695,6 +2695,12 @@ public class ParsingTestGenerated extends AbstractParsingTest {
                 doParsingTest(fileName);
             }
 
+            @TestMetadata("topLevelPropertiesWithGetSet.kts")
+            public void testTopLevelPropertiesWithGetSet() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/script/topLevelPropertiesWithGetSet.kts");
+                doParsingTest(fileName);
+            }
+
             @TestMetadata("unexpectedSymbol.kts")
             public void testUnexpectedSymbol() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/psi/script/unexpectedSymbol.kts");

idea/testData/quickfix/autoImports/importKotlinCompanionStaticPropertyOverloadedGetterFromJava.test

@@ -18,7 +18,7 @@ package foo
 
 object Bar {
     companion object {
-        val value = "foobar";
+        val value = "foobar"
             @JvmStatic get() {
             }
     }

idea/testData/quickfix/autoImports/importKotlinCompanionStaticPropertyOverloadedSetterFromJava.test

@@ -18,7 +18,7 @@ package foo
 
 object Bar {
     companion object {
-        var variable: String;
+        var variable: String
             @JvmStatic set(value) {
                 field = value
             }

idea/testData/quickfix/autoImports/importKotlinStaticPropertyOverloadedGetterFromJava.test

@@ -17,7 +17,7 @@ public class Foo {
 package foo
 
 object Bar {
-    val value = "foobar";
+    val value = "foobar"
         @JvmStatic get() {
         }
 }

idea/testData/quickfix/autoImports/importKotlinStaticPropertyOverloadedSetterFromJava.test

@@ -17,7 +17,7 @@ public class Foo {
 package foo
 
 object Bar {
-    var variable: String;
+    var variable: String
         @JvmStatic set(value) {
             field = value
         }

idea/testData/refactoring/rename/simpleNameReference/renameFieldIdentifier.kt

@@ -1,5 +1,5 @@
 class aClass(){
-    var myField: Int = 0;
+    var myField: Int = 0
         set(value){
             fi<caret>eld=value
         }

idea/testData/refactoring/rename/simpleNameReference/renameFieldIdentifier.kt.after

@@ -1,5 +1,5 @@
 class aClass(){
-    var anotherRenamed: Int = 0;
+    var anotherRenamed: Int = 0
         set(value){
             field=value
         }