Skip to content

Commit f34043a

Browse files
demiurg906Space Team
demiurg906
authored and
Space Team
committed
[Test] Rename JS directive MODULE_KIND to JS_MODULE_KIND
Otherwise, it clashes with `AnalysisApiTestDirectives.MODULE_KIND`
1 parent 10b99f4 commit f34043a

File tree

66 files changed

+121
-121
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+121
-121
lines changed

‎compiler/testData/diagnostics/testsWithJsStdLib/module/dualModuleFromUmd.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ external open class B {
1818
}
1919

2020
// MODULE: m2(m1)
21-
// MODULE_KIND: UMD
21+
// JS_MODULE_KIND: UMD
2222
// FILE: c.kt
2323
package bar
2424

@@ -27,4 +27,4 @@ import foo.*
2727
fun box() {
2828
A.<!CALL_FROM_UMD_MUST_BE_JS_MODULE_AND_JS_NON_MODULE!>f<!>()+A.<!CALL_FROM_UMD_MUST_BE_JS_MODULE_AND_JS_NON_MODULE!>g<!>
2929
<!CALL_FROM_UMD_MUST_BE_JS_MODULE_AND_JS_NON_MODULE!>B<!>()
30-
}
30+
}

‎compiler/testData/diagnostics/testsWithJsStdLib/module/wrongCallToNonModule.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ external open class B {
2323
external fun bar(): Unit
2424

2525
// MODULE: m2(m1)
26-
// MODULE_KIND: AMD
26+
// JS_MODULE_KIND: AMD
2727
// TODO: it's hard to test @JsNonModule on file from an external module
2828
// FILE: c.kt
2929
package bar

‎compiler/tests-common-new/testFixtures/org/jetbrains/kotlin/test/directives/JsEnvironmentConfigurationDirectives.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import org.jetbrains.kotlin.test.directives.model.SimpleDirectivesContainer
1414

1515
// TODO fill up all descriptions
1616
object JsEnvironmentConfigurationDirectives : SimpleDirectivesContainer() {
17-
val MODULE_KIND by enumDirective<ModuleKind>(
17+
val JS_MODULE_KIND by enumDirective<ModuleKind>(
1818
description = "Specifies kind of js module",
1919
applicability = DirectiveApplicability.Module
2020
)

‎compiler/tests-common-new/testFixtures/org/jetbrains/kotlin/test/services/configuration/JsEnvironmentConfigurator.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import org.jetbrains.kotlin.test.TargetBackend
1919
import org.jetbrains.kotlin.test.directives.ConfigurationDirectives
2020
import org.jetbrains.kotlin.test.directives.JsEnvironmentConfigurationDirectives
2121
import org.jetbrains.kotlin.test.directives.JsEnvironmentConfigurationDirectives.GENERATE_INLINE_ANONYMOUS_FUNCTIONS
22-
import org.jetbrains.kotlin.test.directives.JsEnvironmentConfigurationDirectives.MODULE_KIND
22+
import org.jetbrains.kotlin.test.directives.JsEnvironmentConfigurationDirectives.JS_MODULE_KIND
2323
import org.jetbrains.kotlin.test.directives.JsEnvironmentConfigurationDirectives.NO_INLINE
2424
import org.jetbrains.kotlin.test.directives.JsEnvironmentConfigurationDirectives.PROPERTY_LAZY_INITIALIZATION
2525
import org.jetbrains.kotlin.test.directives.JsEnvironmentConfigurationDirectives.SOURCE_MAP_EMBED_SOURCES
@@ -147,9 +147,9 @@ class JsEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfigu
147147
configuration.outputDir = getKlibArtifactFile(testServices, module.name)
148148

149149
val registeredDirectives = module.directives
150-
val moduleKinds = registeredDirectives[MODULE_KIND]
150+
val moduleKinds = registeredDirectives[JS_MODULE_KIND]
151151
val moduleKind = when (moduleKinds.size) {
152-
0 -> testServices.moduleStructure.allDirectives[MODULE_KIND].singleOrNull()
152+
0 -> testServices.moduleStructure.allDirectives[JS_MODULE_KIND].singleOrNull()
153153
?: if (JsEnvironmentConfigurationDirectives.ES_MODULES in registeredDirectives) ModuleKind.ES else ModuleKind.PLAIN
154154
1 -> moduleKinds.single()
155155
else -> error("Too many module kinds passed ${moduleKinds.joinToArrayString()}")

‎js/js.tests/testFixtures/org/jetbrains/kotlin/js/test/converters/JsIrLoweringFacade.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ class JsIrLoweringFacade(
147147
val perModuleOnly = JsEnvironmentConfigurationDirectives.SPLIT_PER_MODULE in module.directives
148148
val perFileOnly = JsEnvironmentConfigurationDirectives.SPLIT_PER_FILE in module.directives
149149
val isEsModules = JsEnvironmentConfigurationDirectives.ES_MODULES in module.directives ||
150-
module.directives[JsEnvironmentConfigurationDirectives.MODULE_KIND].contains(ModuleKind.ES)
150+
module.directives[JsEnvironmentConfigurationDirectives.JS_MODULE_KIND].contains(ModuleKind.ES)
151151

152152
val outputFile =
153153
File(
@@ -266,7 +266,7 @@ class JsIrLoweringFacade(
266266
}
267267

268268
val RegisteredDirectives.moduleKind: ModuleKind
269-
get() = get(JsEnvironmentConfigurationDirectives.MODULE_KIND).singleOrNull()
269+
get() = get(JsEnvironmentConfigurationDirectives.JS_MODULE_KIND).singleOrNull()
270270
?: if (contains(JsEnvironmentConfigurationDirectives.ES_MODULES)) ModuleKind.ES else ModuleKind.PLAIN
271271

272272
val TestModule.kind: ModuleKind

‎js/js.translator/testData/box/crossModuleRef/inlineJsModule.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ define("lib1", [], function() {
77
})
88

99
// MODULE: lib2(lib1)
10-
// MODULE_KIND: AMD
10+
// JS_MODULE_KIND: AMD
1111
// FILE: lib2.kt
1212
@JsModule("lib1")
1313
external fun foo(): String
1414

1515
// MODULE: lib3(lib2)
16-
// MODULE_KIND: AMD
16+
// JS_MODULE_KIND: AMD
1717
// FILE: lib3.kt
1818
inline fun bar() = foo()
1919

2020
// MODULE: main(lib3)
21-
// MODULE_KIND: AMD
21+
// JS_MODULE_KIND: AMD
2222
// FILE: main.kt
2323

2424
fun box() = bar()

‎js/js.translator/testData/box/crossModuleRef/inlineJsModuleNonIdentifier.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ define("lib_1", [], function() {
77
})
88

99
// MODULE: lib2(lib_1)
10-
// MODULE_KIND: AMD
10+
// JS_MODULE_KIND: AMD
1111
// FILE: lib2.kt
1212
@JsModule("lib_1")
1313
external fun foo(): String
1414

1515
// MODULE: lib3(lib2)
16-
// MODULE_KIND: AMD
16+
// JS_MODULE_KIND: AMD
1717
// FILE: lib3.kt
1818
inline fun bar() = foo()
1919

2020
// MODULE: main(lib3)
21-
// MODULE_KIND: AMD
21+
// JS_MODULE_KIND: AMD
2222
// FILE: main.kt
2323

2424
fun box() = bar()

‎js/js.translator/testData/box/crossModuleRef/inlineJsModulePackage.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,19 @@ define("lib1", [], function() {
99
})
1010

1111
// MODULE: lib2(lib1)
12-
// MODULE_KIND: AMD
12+
// JS_MODULE_KIND: AMD
1313
// FILE: lib2.kt
1414
@file:JsModule("lib1")
1515

1616
external fun foo(): String
1717

1818
// MODULE: lib3(lib2)
19-
// MODULE_KIND: AMD
19+
// JS_MODULE_KIND: AMD
2020
// FILE: lib3.kt
2121
inline fun bar() = foo()
2222

2323
// MODULE: main(lib3)
24-
// MODULE_KIND: AMD
24+
// JS_MODULE_KIND: AMD
2525
// FILE: main.kt
2626

2727
fun box() = bar()

‎js/js.translator/testData/box/crossModuleRefIR/inlineJsModule.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@ define("lib1", [], function() {
88
})
99

1010
// MODULE: lib2(lib1)
11-
// MODULE_KIND: AMD
11+
// JS_MODULE_KIND: AMD
1212
// FILE: lib2.kt
1313
@JsModule("lib1")
1414
external fun foo(): String
1515

1616
// MODULE: lib3(lib2)
17-
// MODULE_KIND: AMD
17+
// JS_MODULE_KIND: AMD
1818
// FILE: lib3.kt
1919
inline fun bar() = foo()
2020

2121
// MODULE: main(lib3)
22-
// MODULE_KIND: AMD
22+
// JS_MODULE_KIND: AMD
2323
// FILE: main.kt
2424

2525
fun box() = bar()

‎js/js.translator/testData/box/crossModuleRefIR/inlineJsModuleNonIdentifier.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@ define("lib_1", [], function() {
88
})
99

1010
// MODULE: lib2(lib_1)
11-
// MODULE_KIND: AMD
11+
// JS_MODULE_KIND: AMD
1212
// FILE: lib2.kt
1313
@JsModule("lib_1")
1414
external fun foo(): String
1515

1616
// MODULE: lib3(lib2)
17-
// MODULE_KIND: AMD
17+
// JS_MODULE_KIND: AMD
1818
// FILE: lib3.kt
1919
inline fun bar() = foo()
2020

2121
// MODULE: main(lib3)
22-
// MODULE_KIND: AMD
22+
// JS_MODULE_KIND: AMD
2323
// FILE: main.kt
2424

2525
fun box() = bar()

0 commit comments

Comments
 (0)