Uninherit LanguageVersion from LanguageFeatureSettings

Introduce LanguageVersionSettingsImpl to store everything related to the selected language version
2016-09-13 11:32:05 +03:00
parent 7dbada0d06
commit aec31bd88f
17 changed files with 46 additions and 42 deletions
@@ -36,14 +36,10 @@ enum class LanguageFeature(val sinceVersion: LanguageVersion) {
    }
 }

-enum class LanguageVersion(val versionString: String): LanguageFeatureSettings {
+enum class LanguageVersion(val versionString: String) {
    KOTLIN_1_0("1.0"),
    KOTLIN_1_1("1.1");

-    override fun supportsFeature(feature: LanguageFeature): Boolean {
-        return this.ordinal >= feature.sinceVersion.ordinal
-    }
-
    companion object {
        @JvmStatic
        fun fromVersionString(str: String) = values().find { it.versionString == str }
@@ -56,3 +52,14 @@ enum class LanguageVersion(val versionString: String): LanguageFeatureSettings {
 interface LanguageFeatureSettings {
    fun supportsFeature(feature: LanguageFeature): Boolean
 }
+
+class LanguageVersionSettingsImpl(private val languageVersion: LanguageVersion) : LanguageFeatureSettings {
+    override fun supportsFeature(feature: LanguageFeature): Boolean {
+        return languageVersion.ordinal >= feature.sinceVersion.ordinal
+    }
+
+    companion object {
+        @JvmField
+        val DEFAULT = LanguageVersionSettingsImpl(LanguageVersion.LATEST)
+    }
+}