From 9f6e4a5786aa02b862697c7892e29a080d2a8c4d Mon Sep 17 00:00:00 2001 From: Sviatoslav Hryb Date: Wed, 21 Apr 2021 10:24:54 +0300 Subject: [PATCH 1/2] Fix inline map Kotlin code formatting --- src/docs/asciidoc/core/core-expressions.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/docs/asciidoc/core/core-expressions.adoc b/src/docs/asciidoc/core/core-expressions.adoc index d445738f5130..dbe945fc0a7e 100644 --- a/src/docs/asciidoc/core/core-expressions.adoc +++ b/src/docs/asciidoc/core/core-expressions.adoc @@ -962,7 +962,7 @@ following example shows how to do so: .Kotlin ---- // evaluates to a Java map containing the two entries - val inventorInfo = parser.parseExpression("{name:'Nikola',dob:'10-July-1856'}").getValue(context) as Map<*, *> + val inventorInfo = parser.parseExpression("{name:'Nikola',dob:'10-July-1856'}").getValue(context) as Map<\*, *> val mapOfMaps = parser.parseExpression("{name:{first:'Nikola',last:'Tesla'},dob:{day:10,month:'July',year:1856}}").getValue(context) as Map<*, *> ---- From abe386f57a9140c09f41ff98d4c4a84694c3cd90 Mon Sep 17 00:00:00 2001 From: Sviatoslav Hryb Date: Wed, 21 Apr 2021 10:50:10 +0300 Subject: [PATCH 2/2] Improve formatting fix --- src/docs/asciidoc/core/core-expressions.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/docs/asciidoc/core/core-expressions.adoc b/src/docs/asciidoc/core/core-expressions.adoc index dbe945fc0a7e..9ed6847b0b8a 100644 --- a/src/docs/asciidoc/core/core-expressions.adoc +++ b/src/docs/asciidoc/core/core-expressions.adoc @@ -958,11 +958,11 @@ following example shows how to do so: Map mapOfMaps = (Map) parser.parseExpression("{name:{first:'Nikola',last:'Tesla'},dob:{day:10,month:'July',year:1856}}").getValue(context); ---- -[source,kotlin,indent=0,subs="verbatim,quotes",role="secondary"] +[source,kotlin,indent=0,subs="verbatim",role="secondary"] .Kotlin ---- // evaluates to a Java map containing the two entries - val inventorInfo = parser.parseExpression("{name:'Nikola',dob:'10-July-1856'}").getValue(context) as Map<\*, *> + val inventorInfo = parser.parseExpression("{name:'Nikola',dob:'10-July-1856'}").getValue(context) as Map<*, *> val mapOfMaps = parser.parseExpression("{name:{first:'Nikola',last:'Tesla'},dob:{day:10,month:'July',year:1856}}").getValue(context) as Map<*, *> ----