Skip to content

Commit 53c8147

Browse files
committed
KTL-1524: release 2.0.20-Beta1
1 parent 32d3d65 commit 53c8147

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

common/src/main/kotlin/component/KotlinEnvironment.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.serialization.js.JsModuleDescriptor
2121
import org.jetbrains.kotlin.serialization.js.KotlinJavascriptSerializationUtil
2222
import org.jetbrains.kotlin.serialization.js.ModuleKind
2323
import org.jetbrains.kotlin.utils.KotlinJavascriptMetadataUtils
24+
import org.jetbrains.kotlin.wasm.config.WasmConfigurationKeys
2425
import java.io.File
2526

2627
class KotlinEnvironment(
@@ -89,15 +90,15 @@ class KotlinEnvironment(
8990
val wasmConfiguration: CompilerConfiguration = configuration.copy().apply {
9091
put(CommonConfigurationKeys.MODULE_NAME, "moduleId")
9192
put(JSConfigurationKeys.LIBRARIES, WASM_LIBRARIES)
92-
put(JSConfigurationKeys.WASM_ENABLE_ARRAY_RANGE_CHECKS, false)
93-
put(JSConfigurationKeys.WASM_ENABLE_ASSERTS, false)
93+
put(WasmConfigurationKeys.WASM_ENABLE_ARRAY_RANGE_CHECKS, false)
94+
put(WasmConfigurationKeys.WASM_ENABLE_ASSERTS, false)
9495
}
9596

9697
val composeWasmConfiguration: CompilerConfiguration = configuration.copy().apply {
9798
put(CommonConfigurationKeys.MODULE_NAME, "moduleId")
9899
put(JSConfigurationKeys.LIBRARIES, COMPOSE_WASM_LIBRARIES)
99-
put(JSConfigurationKeys.WASM_ENABLE_ARRAY_RANGE_CHECKS, false)
100-
put(JSConfigurationKeys.WASM_ENABLE_ASSERTS, false)
100+
put(WasmConfigurationKeys.WASM_ENABLE_ARRAY_RANGE_CHECKS, false)
101+
put(WasmConfigurationKeys.WASM_ENABLE_ASSERTS, false)
101102

102103
PluginCliParser.loadPluginsSafe(
103104
COMPOSE_WASM_COMPILER_PLUGINS,

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
systemProp.kotlinVersion=2.0.0
1+
systemProp.kotlinVersion=2.0.20-Beta1
22
systemProp.kotlinIdeVersion=1.9.20-506
33
systemProp.kotlinIdeVersionSuffix=IJ8109.175
44
systemProp.policy=executor.policy

src/test/kotlin/com/compiler/server/HighlightTest.kt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,21 +84,24 @@ class HighlightTest : BaseExecutorTest() {
8484
@Test
8585
fun `highlight Type inference failed`() {
8686
val highlights = highlight("fun main() {\n \"sdf\".to\n}")
87-
Assertions.assertEquals(highlights.size, 1)
87+
Assertions.assertEquals(highlights.size, 2)
88+
errorContains(highlights, "Cannot infer type for this parameter. Please specify it explicitly.")
8889
errorContains(highlights, "Function invocation 'to(...)' expected")
8990
}
9091

9192
@Test
9293
fun `highlight js Type inference failed`() {
9394
val highlights = highlightJS("fun main() {\n \"sdf\".to\n}")
94-
Assertions.assertEquals(highlights.size, 1)
95+
Assertions.assertEquals(highlights.size, 2)
96+
errorContains(highlights, "Cannot infer type for this parameter. Please specify it explicitly.")
9597
errorContains(highlights, "Function invocation 'to(...)' expected")
9698
}
9799

98100
@Test
99101
fun `highlight wasm Type inference failed`() {
100102
val highlights = highlightWasm("fun main() {\n \"sdf\".to\n}")
101-
Assertions.assertEquals(highlights.size, 1)
103+
Assertions.assertEquals(highlights.size, 2)
104+
errorContains(highlights, "Cannot infer type for this parameter. Please specify it explicitly.")
102105
errorContains(highlights, "Function invocation 'to(...)' expected")
103106
}
104107
}

0 commit comments

Comments
 (0)