From 3b53c97c2cb43fa7e6c05289da631ccec8db61ba Mon Sep 17 00:00:00 2001 From: Roman Artemev Date: Thu, 9 Sep 2021 15:26:41 +0300 Subject: [PATCH] [JS IR] Fix test data 'kt -> ir -> klib -> ir -> js' aka prod mode - fix order in dts tests - unmute fixed test in prod mode - mute filing expect-actual link test in prod mode --- compiler/testData/codegen/box/inlineClasses/result.kt | 2 +- .../defaultArguments/dispatchReceiverValue.kt | 3 +++ .../typescript-export/declarations/declarations.d.ts | 8 ++++---- .../testData/typescript-export/primitives/primitives.d.ts | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/compiler/testData/codegen/box/inlineClasses/result.kt b/compiler/testData/codegen/box/inlineClasses/result.kt index 6c758dc1bae..c936919f5ce 100644 --- a/compiler/testData/codegen/box/inlineClasses/result.kt +++ b/compiler/testData/codegen/box/inlineClasses/result.kt @@ -1,4 +1,4 @@ -// IGNORE_BACKEND: WASM, JS_IR +// IGNORE_BACKEND: WASM // IGNORE_BACKEND: ANDROID // IGNORE_BACKEND: NATIVE // ALLOW_KOTLIN_PACKAGE diff --git a/compiler/testData/codegen/box/multiplatform/defaultArguments/dispatchReceiverValue.kt b/compiler/testData/codegen/box/multiplatform/defaultArguments/dispatchReceiverValue.kt index 36a4750b7a5..0675ad31282 100644 --- a/compiler/testData/codegen/box/multiplatform/defaultArguments/dispatchReceiverValue.kt +++ b/compiler/testData/codegen/box/multiplatform/defaultArguments/dispatchReceiverValue.kt @@ -1,8 +1,11 @@ // DONT_TARGET_EXACT_BACKEND: WASM +// IGNORE_BACKEND: JS_IR // WASM_MUTE_REASON: EXPECT_DEFAULT_PARAMETERS // IGNORE_BACKEND_FIR: JVM_IR // !LANGUAGE: +MultiPlatformProjects +// KT-41901 + // FILE: common.kt expect class C { diff --git a/js/js.translator/testData/typescript-export/declarations/declarations.d.ts b/js/js.translator/testData/typescript-export/declarations/declarations.d.ts index b651642ea2c..4439e2f71f3 100644 --- a/js/js.translator/testData/typescript-export/declarations/declarations.d.ts +++ b/js/js.translator/testData/typescript-export/declarations/declarations.d.ts @@ -1,6 +1,10 @@ declare namespace JS_TESTS { type Nullable = T | null | undefined namespace foo { + const _val: number; + let _var: number; + const _valCustomWithField: number; + let _varCustomWithField: number; function sum(x: number, y: number): number; function varargInt(x: Int32Array): number; function varargNullableInt(x: Array>): number; @@ -13,12 +17,8 @@ declare namespace JS_TESTS { function generic3(a: A, b: B, c: C, d: D): Nullable; function inlineFun(x: number, callback: (p0: number) => void): void; const _const_val: number; - const _val: number; - let _var: number; const _valCustom: number; - const _valCustomWithField: number; let _varCustom: number; - let _varCustomWithField: number; class A { constructor(); } diff --git a/js/js.translator/testData/typescript-export/primitives/primitives.d.ts b/js/js.translator/testData/typescript-export/primitives/primitives.d.ts index dbc2e61a3f7..b55d9e8c4b1 100644 --- a/js/js.translator/testData/typescript-export/primitives/primitives.d.ts +++ b/js/js.translator/testData/typescript-export/primitives/primitives.d.ts @@ -2,7 +2,6 @@ declare namespace JS_TESTS { type Nullable = T | null | undefined namespace foo { const _any: any; - function _nothing(): never; const _throwable: Error; const _string: string; const _boolean: boolean; @@ -45,5 +44,6 @@ declare namespace JS_TESTS { const _fun_n_boolean_n_int_n_string_n_intarray: (p0: Nullable, p1: Nullable, p2: Nullable) => Nullable; const _n_curried_fun: (p0: Nullable) => (p0: Nullable) => (p0: Nullable) => Nullable; const _n_higher_order_fun: (p0: (p0: Nullable) => Nullable, p1: (p0: Nullable) => Nullable) => (p0: Nullable) => Nullable; + function _nothing(): never; } }