Explain: fix for object literals

bnorm · Space Team · commit 0c26485d83f5 · 2026-04-14T16:06:04.000Z
#KT-85105 fixed
diff --git a/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/extensions/ScriptingProcessSourcesBeforeCompilingExtension.kt b/plugins/scripting/scripting-compiler/src/org/jetbrains/kotlin/scripting/compiler/plugin/extensions/ScriptingProcessSourcesBeforeCompilingExtension.kt
@@ -169,8 +169,13 @@ class KotlinScriptExpressionExplainTransformer(
             explainWithFallBack(statement, declaration, statementName, builder, explanationsProp)
         }
         is IrBlock -> {
-            statement.statements.transformInPlace { explainStatement(it, builder, explanationsProp, declaration, "") }
-            statement
+            if (statement.origin == IrStatementOrigin.OBJECT_LITERAL) {
+                // Object literals need to be explained as a whole.
+                explainWithFallBack(statement, declaration, statementName, builder, explanationsProp)
+            } else {
+                statement.statements.transformInPlace { explainStatement(it, builder, explanationsProp, declaration, "") }
+                statement
+            }
         }
         is IrExpression -> {
             if (statement is IrTypeOperatorCall && statement.operator == IrTypeOperator.IMPLICIT_COERCION_TO_UNIT) {
@@ -229,4 +234,4 @@ class ScriptingProcessSourcesBeforeCompilingExtension(val project: Project) : Pr
             }
         }
     }
-}
+}
diff --git a/plugins/scripting/scripting-compiler/testData/compiler/explain/objectLiteral.explain b/plugins/scripting/scripting-compiler/testData/compiler/explain/objectLiteral.explain
@@ -0,0 +1,5 @@
+(108, 117) = MyClass()
+(118, 123) = 1
+i(169, 300) = `<no name provided>`()
+$$result(301, 302) = `<no name provided>`()
+$$result(303, 308) = 1
diff --git a/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingWithExplanationCompilerTest.kt b/plugins/scripting/scripting-compiler/tests/org/jetbrains/kotlin/scripting/compiler/plugin/ScriptingWithExplanationCompilerTest.kt
@@ -131,7 +131,7 @@ class ScriptingWithExplanationCompilerTest {
 
     @Test // KT-85105
     fun testScriptExplainWithObjectLiteral() {
-        runScriptAndValidateExplain("$TEST_DATA_DIR/objectLiteral.kts", expectedExitCode = ExitCode.COMPILATION_ERROR)
+        runScriptAndValidateExplain("$TEST_DATA_DIR/objectLiteral.kts", expectedExitCode = ExitCode.OK)
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -169,8 +169,13 @@ class KotlinScriptExpressionExplainTransformer(`
`169`	`169`	`explainWithFallBack(statement, declaration, statementName, builder, explanationsProp)`
`170`	`170`	`}`
`171`	`171`	`is IrBlock -> {`
`172`		`- statement.statements.transformInPlace { explainStatement(it, builder, explanationsProp, declaration, "") }`
`173`		`- statement`
	`172`	`+ if (statement.origin == IrStatementOrigin.OBJECT_LITERAL) {`
	`173`	`+ // Object literals need to be explained as a whole.`
	`174`	`+ explainWithFallBack(statement, declaration, statementName, builder, explanationsProp)`
	`175`	`+ } else {`
	`176`	`+ statement.statements.transformInPlace { explainStatement(it, builder, explanationsProp, declaration, "") }`
	`177`	`+ statement`
	`178`	`+ }`
`174`	`179`	`}`
`175`	`180`	`is IrExpression -> {`
`176`	`181`	`if (statement is IrTypeOperatorCall && statement.operator == IrTypeOperator.IMPLICIT_COERCION_TO_UNIT) {`
`@@ -229,4 +234,4 @@ class ScriptingProcessSourcesBeforeCompilingExtension(val project: Project) : Pr`
`229`	`234`	`}`
`230`	`235`	`}`
`231`	`236`	`}`
`232`		`-}`
	`237`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ class ScriptingWithExplanationCompilerTest {`
`131`	`131`
`132`	`132`	`@Test // KT-85105`
`133`	`133`	`fun testScriptExplainWithObjectLiteral() {`
`134`		`- runScriptAndValidateExplain("$TEST_DATA_DIR/objectLiteral.kts", expectedExitCode = ExitCode.COMPILATION_ERROR)`
	`134`	`+ runScriptAndValidateExplain("$TEST_DATA_DIR/objectLiteral.kts", expectedExitCode = ExitCode.OK)`
`135`	`135`	`}`
`136`	`136`	`}`
`137`	`137`