azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Companion public val annotated with @JvmFIeld or const

Browse Source
This commit is contained in:
Michael Bogdanov
2015-12-25 18:08:06 +03:00
parent e116cc3206
commit e671d05105
28 changed files with 112 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/util/src/org/jetbrains/kotlin/config/Services.kt
+1
View File
@@ -20,6 +20,7 @@ import java.util.HashMap
public class Services private constructor(private val map: Map<Class<*>, Any>) {
companion object {
@JvmField
public val EMPTY: Services = Builder().build()
}
compiler/util/src/org/jetbrains/kotlin/utils/KotlinJavascriptMetadataUtils.kt
+4 -4
View File
@@ -25,9 +25,9 @@ public class KotlinJavascriptMetadata(public val abiVersion: Int, public val mod
}
public object KotlinJavascriptMetadataUtils {
public val JS_EXT: String = ".js"
public val META_JS_SUFFIX: String = ".meta.js"
public val VFS_PROTOCOL: String = "kotlin-js-meta"
public const val JS_EXT: String = ".js"
public const val META_JS_SUFFIX: String = ".meta.js"
public const val VFS_PROTOCOL: String = "kotlin-js-meta"
private val KOTLIN_JAVASCRIPT_METHOD_NAME = "kotlin_module_metadata"
private val KOTLIN_JAVASCRIPT_METHOD_NAME_PATTERN = "\\.kotlin_module_metadata\\(".toPattern()
/**
@@ -35,7 +35,7 @@ public object KotlinJavascriptMetadataUtils {
*/
private val METADATA_PATTERN = "(?m)\\w+\\.$KOTLIN_JAVASCRIPT_METHOD_NAME\\((\\d+),\\s*(['\"])([^'\"]*)\\2,\\s*(['\"])([^'\"]*)\\4\\)".toPattern()
@JvmStatic
@JvmField
public val ABI_VERSION: Int = 3
public fun replaceSuffix(filePath: String): String = filePath.substringBeforeLast(JS_EXT) + META_JS_SUFFIX