diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt b/generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt index c23ace9fcac..39794b4d047 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt @@ -352,10 +352,10 @@ fun testRenamed(reference: String = "$KEYWORD_MARKER") = "testRenamed(\"$KEYWORD fun testNotRenamed(reference: String = "$KEYWORD_MARKER") = "testNotRenamed(\"$KEYWORD_MARKER\", { $reference })" val testRenamedByName = testRenamed() -val testRenamedByRef = testRenamed("::$KEYWORD_MARKER") +val testRenamedByRef = testRenamed("$KEYWORD_MARKER()") val testNotRenamedByName = testNotRenamed() -val testNotRenamedByRef = testNotRenamed("::$KEYWORD_MARKER") +val testNotRenamedByRef = testNotRenamed("$KEYWORD_MARKER()") // KEYWORDS diff --git a/js/js.translator/testData/reservedWords/cases/delegatedFunCatch.kt b/js/js.translator/testData/reservedWords/cases/delegatedFunCatch.kt index c1028dcdf63..824ed8e2543 100644 --- a/js/js.translator/testData/reservedWords/cases/delegatedFunCatch.kt +++ b/js/js.translator/testData/reservedWords/cases/delegatedFunCatch.kt @@ -12,7 +12,7 @@ class TraitImpl : Trait { class TestDelegate : Trait by TraitImpl() { fun test() { - testNotRenamed("catch", { ::catch }) + testNotRenamed("catch", { catch() }) } } diff --git a/js/js.translator/testData/reservedWords/cases/delegatedFunConst.kt b/js/js.translator/testData/reservedWords/cases/delegatedFunConst.kt index dc6f04294ac..eddd4bf67cc 100644 --- a/js/js.translator/testData/reservedWords/cases/delegatedFunConst.kt +++ b/js/js.translator/testData/reservedWords/cases/delegatedFunConst.kt @@ -12,7 +12,7 @@ class TraitImpl : Trait { class TestDelegate : Trait by TraitImpl() { fun test() { - testNotRenamed("const", { ::const }) + testNotRenamed("const", { const() }) } } diff --git a/js/js.translator/testData/reservedWords/cases/delegatedFunNull.kt b/js/js.translator/testData/reservedWords/cases/delegatedFunNull.kt index 04ccb551292..e666fe97747 100644 --- a/js/js.translator/testData/reservedWords/cases/delegatedFunNull.kt +++ b/js/js.translator/testData/reservedWords/cases/delegatedFunNull.kt @@ -12,7 +12,7 @@ class TraitImpl : Trait { class TestDelegate : Trait by TraitImpl() { fun test() { - testNotRenamed("null", { ::`null` }) + testNotRenamed("null", { `null`() }) } } diff --git a/js/js.translator/testData/reservedWords/cases/delegatedFunPackage.kt b/js/js.translator/testData/reservedWords/cases/delegatedFunPackage.kt index 7a6ec2cf2a7..2acca2a76f5 100644 --- a/js/js.translator/testData/reservedWords/cases/delegatedFunPackage.kt +++ b/js/js.translator/testData/reservedWords/cases/delegatedFunPackage.kt @@ -12,7 +12,7 @@ class TraitImpl : Trait { class TestDelegate : Trait by TraitImpl() { fun test() { - testNotRenamed("package", { ::`package` }) + testNotRenamed("package", { `package`() }) } } diff --git a/js/js.translator/testData/reservedWords/cases/enumFunBreak.kt b/js/js.translator/testData/reservedWords/cases/enumFunBreak.kt index 98dcd6ab4da..095145bf7d2 100644 --- a/js/js.translator/testData/reservedWords/cases/enumFunBreak.kt +++ b/js/js.translator/testData/reservedWords/cases/enumFunBreak.kt @@ -7,7 +7,7 @@ enum class Foo { fun `break`() { `break`() } fun test() { - testNotRenamed("break", { ::`break` }) + testNotRenamed("break", { `break`() }) } } diff --git a/js/js.translator/testData/reservedWords/cases/enumFunClass.kt b/js/js.translator/testData/reservedWords/cases/enumFunClass.kt index f3f5d09a323..a8c5bb6f94b 100644 --- a/js/js.translator/testData/reservedWords/cases/enumFunClass.kt +++ b/js/js.translator/testData/reservedWords/cases/enumFunClass.kt @@ -7,7 +7,7 @@ enum class Foo { fun `class`() { `class`() } fun test() { - testNotRenamed("class", { ::`class` }) + testNotRenamed("class", { `class`() }) } } diff --git a/js/js.translator/testData/reservedWords/cases/enumFunFunction.kt b/js/js.translator/testData/reservedWords/cases/enumFunFunction.kt index 437509e6fe1..cf9169977cf 100644 --- a/js/js.translator/testData/reservedWords/cases/enumFunFunction.kt +++ b/js/js.translator/testData/reservedWords/cases/enumFunFunction.kt @@ -7,7 +7,7 @@ enum class Foo { fun function() { function() } fun test() { - testNotRenamed("function", { ::function }) + testNotRenamed("function", { function() }) } } diff --git a/js/js.translator/testData/reservedWords/cases/enumFunImplements.kt b/js/js.translator/testData/reservedWords/cases/enumFunImplements.kt index 170c456012b..9652b6bcf86 100644 --- a/js/js.translator/testData/reservedWords/cases/enumFunImplements.kt +++ b/js/js.translator/testData/reservedWords/cases/enumFunImplements.kt @@ -7,7 +7,7 @@ enum class Foo { fun implements() { implements() } fun test() { - testNotRenamed("implements", { ::implements }) + testNotRenamed("implements", { implements() }) } } diff --git a/js/js.translator/testData/reservedWords/cases/insideClassFunArguments.kt b/js/js.translator/testData/reservedWords/cases/insideClassFunArguments.kt index 07336c3b51e..15837791eaf 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassFunArguments.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassFunArguments.kt @@ -6,7 +6,7 @@ class TestClass { fun arguments() { arguments() } fun test() { - testNotRenamed("arguments", { ::arguments }) + testNotRenamed("arguments", { arguments() }) } } diff --git a/js/js.translator/testData/reservedWords/cases/insideClassFunNaN.kt b/js/js.translator/testData/reservedWords/cases/insideClassFunNaN.kt index d89dacba406..c7fdaf170e6 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassFunNaN.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassFunNaN.kt @@ -6,7 +6,7 @@ class TestClass { fun NaN() { NaN() } fun test() { - testNotRenamed("NaN", { ::NaN }) + testNotRenamed("NaN", { NaN() }) } } diff --git a/js/js.translator/testData/reservedWords/cases/insideClassFunThis.kt b/js/js.translator/testData/reservedWords/cases/insideClassFunThis.kt index d44d600a5c9..50ca6d192db 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassFunThis.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassFunThis.kt @@ -6,7 +6,7 @@ class TestClass { fun `this`() { `this`() } fun test() { - testNotRenamed("this", { ::`this` }) + testNotRenamed("this", { `this`() }) } } diff --git a/js/js.translator/testData/reservedWords/cases/insideClassFunThrow.kt b/js/js.translator/testData/reservedWords/cases/insideClassFunThrow.kt index dd9cdaae062..47ffa232244 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassFunThrow.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassFunThrow.kt @@ -6,7 +6,7 @@ class TestClass { fun `throw`() { `throw`() } fun test() { - testNotRenamed("throw", { ::`throw` }) + testNotRenamed("throw", { `throw`() }) } } diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunElse.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunElse.kt index 81bdbaaf703..c86f07627c3 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunElse.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunElse.kt @@ -7,7 +7,7 @@ class TestClass { fun `else`() { `else`() } fun test() { - testNotRenamed("else", { ::`else` }) + testNotRenamed("else", { `else`() }) } } } diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunEval.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunEval.kt index bf505bb11f8..0a39eca32e2 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunEval.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunEval.kt @@ -7,7 +7,7 @@ class TestClass { fun eval() { eval() } fun test() { - testNotRenamed("eval", { ::eval }) + testNotRenamed("eval", { eval() }) } } } diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunExport.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunExport.kt index 1cfc0153d11..162d1c6cda7 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunExport.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunExport.kt @@ -7,7 +7,7 @@ class TestClass { fun export() { export() } fun test() { - testNotRenamed("export", { ::export }) + testNotRenamed("export", { export() }) } } } diff --git a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunFalse.kt b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunFalse.kt index 3c975ed2170..d7f4947492f 100644 --- a/js/js.translator/testData/reservedWords/cases/insideClassObjectFunFalse.kt +++ b/js/js.translator/testData/reservedWords/cases/insideClassObjectFunFalse.kt @@ -7,7 +7,7 @@ class TestClass { fun `false`() { `false`() } fun test() { - testNotRenamed("false", { ::`false` }) + testNotRenamed("false", { `false`() }) } } } diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectFunPrivate.kt b/js/js.translator/testData/reservedWords/cases/insideObjectFunPrivate.kt index 3dcdeb876d0..31ccf9ca5f9 100644 --- a/js/js.translator/testData/reservedWords/cases/insideObjectFunPrivate.kt +++ b/js/js.translator/testData/reservedWords/cases/insideObjectFunPrivate.kt @@ -6,7 +6,7 @@ object TestObject { fun private() { private() } fun test() { - testNotRenamed("private", { ::private }) + testNotRenamed("private", { private() }) } } diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectFunProtected.kt b/js/js.translator/testData/reservedWords/cases/insideObjectFunProtected.kt index 9ad2b5fe6c9..c791fe7debf 100644 --- a/js/js.translator/testData/reservedWords/cases/insideObjectFunProtected.kt +++ b/js/js.translator/testData/reservedWords/cases/insideObjectFunProtected.kt @@ -6,7 +6,7 @@ object TestObject { fun protected() { protected() } fun test() { - testNotRenamed("protected", { ::protected }) + testNotRenamed("protected", { protected() }) } } diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectFunThis.kt b/js/js.translator/testData/reservedWords/cases/insideObjectFunThis.kt index a6d19915896..7186f802307 100644 --- a/js/js.translator/testData/reservedWords/cases/insideObjectFunThis.kt +++ b/js/js.translator/testData/reservedWords/cases/insideObjectFunThis.kt @@ -6,7 +6,7 @@ object TestObject { fun `this`() { `this`() } fun test() { - testNotRenamed("this", { ::`this` }) + testNotRenamed("this", { `this`() }) } } diff --git a/js/js.translator/testData/reservedWords/cases/insideObjectFunThrow.kt b/js/js.translator/testData/reservedWords/cases/insideObjectFunThrow.kt index 3c342bfa9fe..7c2b40d88ce 100644 --- a/js/js.translator/testData/reservedWords/cases/insideObjectFunThrow.kt +++ b/js/js.translator/testData/reservedWords/cases/insideObjectFunThrow.kt @@ -6,7 +6,7 @@ object TestObject { fun `throw`() { `throw`() } fun test() { - testNotRenamed("throw", { ::`throw` }) + testNotRenamed("throw", { `throw`() }) } } diff --git a/js/js.translator/testData/reservedWords/cases/localFunContinue.kt b/js/js.translator/testData/reservedWords/cases/localFunContinue.kt index 7e0dfd333a0..8e881f8fc89 100644 --- a/js/js.translator/testData/reservedWords/cases/localFunContinue.kt +++ b/js/js.translator/testData/reservedWords/cases/localFunContinue.kt @@ -5,7 +5,7 @@ package foo fun box(): String { fun `continue`() { `continue`() } - testRenamed("continue", { ::`continue` }) + testRenamed("continue", { `continue`() }) return "OK" } \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/localFunDo.kt b/js/js.translator/testData/reservedWords/cases/localFunDo.kt index 555dde561fe..a326990d127 100644 --- a/js/js.translator/testData/reservedWords/cases/localFunDo.kt +++ b/js/js.translator/testData/reservedWords/cases/localFunDo.kt @@ -5,7 +5,7 @@ package foo fun box(): String { fun `do`() { `do`() } - testRenamed("do", { ::`do` }) + testRenamed("do", { `do`() }) return "OK" } \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/localFunPrivate.kt b/js/js.translator/testData/reservedWords/cases/localFunPrivate.kt index e245fecbaf6..6bc18f5c15e 100644 --- a/js/js.translator/testData/reservedWords/cases/localFunPrivate.kt +++ b/js/js.translator/testData/reservedWords/cases/localFunPrivate.kt @@ -5,7 +5,7 @@ package foo fun box(): String { fun private() { private() } - testRenamed("private", { ::private }) + testRenamed("private", { private() }) return "OK" } \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/localFunProtected.kt b/js/js.translator/testData/reservedWords/cases/localFunProtected.kt index da4513b5d35..ff74f85f819 100644 --- a/js/js.translator/testData/reservedWords/cases/localFunProtected.kt +++ b/js/js.translator/testData/reservedWords/cases/localFunProtected.kt @@ -5,7 +5,7 @@ package foo fun box(): String { fun protected() { protected() } - testRenamed("protected", { ::protected }) + testRenamed("protected", { protected() }) return "OK" } \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/toplevelFunAwait.kt b/js/js.translator/testData/reservedWords/cases/toplevelFunAwait.kt index 7df00d46aa1..fe0350e4c25 100644 --- a/js/js.translator/testData/reservedWords/cases/toplevelFunAwait.kt +++ b/js/js.translator/testData/reservedWords/cases/toplevelFunAwait.kt @@ -5,7 +5,7 @@ package foo fun await() { await() } fun box(): String { - testNotRenamed("await", { ::await }) + testNotRenamed("await", { await() }) return "OK" } \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/toplevelFunCase.kt b/js/js.translator/testData/reservedWords/cases/toplevelFunCase.kt index 735e4b1f9fe..a2a702b07cf 100644 --- a/js/js.translator/testData/reservedWords/cases/toplevelFunCase.kt +++ b/js/js.translator/testData/reservedWords/cases/toplevelFunCase.kt @@ -5,7 +5,7 @@ package foo fun case() { case() } fun box(): String { - testNotRenamed("case", { ::case }) + testNotRenamed("case", { case() }) return "OK" } \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/toplevelFunElse.kt b/js/js.translator/testData/reservedWords/cases/toplevelFunElse.kt index 4a2f1bea189..7228369ec24 100644 --- a/js/js.translator/testData/reservedWords/cases/toplevelFunElse.kt +++ b/js/js.translator/testData/reservedWords/cases/toplevelFunElse.kt @@ -5,7 +5,7 @@ package foo fun `else`() { `else`() } fun box(): String { - testNotRenamed("else", { ::`else` }) + testNotRenamed("else", { `else`() }) return "OK" } \ No newline at end of file diff --git a/js/js.translator/testData/reservedWords/cases/toplevelFunFalse.kt b/js/js.translator/testData/reservedWords/cases/toplevelFunFalse.kt index 5bff7066cd5..9b520ff4662 100644 --- a/js/js.translator/testData/reservedWords/cases/toplevelFunFalse.kt +++ b/js/js.translator/testData/reservedWords/cases/toplevelFunFalse.kt @@ -5,7 +5,7 @@ package foo fun `false`() { `false`() } fun box(): String { - testNotRenamed("false", { ::`false` }) + testNotRenamed("false", { `false`() }) return "OK" } \ No newline at end of file