Kotlin Facet: Reuse JvmTarget and LanguageVersion in facet configuration

compiler/util/src/org/jetbrains/kotlin/config/JvmTarget.kt

@@ -16,7 +16,9 @@
 
 package org.jetbrains.kotlin.config
 
-enum class JvmTarget(val string: String) {
+import org.jetbrains.kotlin.utils.DescriptionAware
+
+enum class JvmTarget(override val description: String) : DescriptionAware {
     JVM_1_6("1.6"),
     JVM_1_8("1.8"),
     ;
@@ -26,6 +28,6 @@ enum class JvmTarget(val string: String) {
         val DEFAULT = JVM_1_6
 
         @JvmStatic
-        fun fromString(string: String) = values().find { it.string == string }
+        fun fromString(string: String) = values().find { it.description == string }
     }
 }

compiler/util/src/org/jetbrains/kotlin/config/LanguageVersionSettings.kt

@@ -17,6 +17,7 @@
 package org.jetbrains.kotlin.config
 
 import org.jetbrains.kotlin.config.LanguageVersion.KOTLIN_1_1
+import org.jetbrains.kotlin.utils.DescriptionAware
 
 enum class LanguageFeature(val sinceVersion: LanguageVersion) {
     // Note: names of these entries are also used in diagnostic tests
@@ -43,10 +44,13 @@ enum class LanguageFeature(val sinceVersion: LanguageVersion) {
     }
 }
 
-enum class LanguageVersion(val versionString: String) {
+enum class LanguageVersion(val versionString: String) : DescriptionAware {
     KOTLIN_1_0("1.0"),
     KOTLIN_1_1("1.1");
 
+    override val description: String
+        get() = versionString
+
     override fun toString() = versionString
 
     companion object {

compiler/util/src/org/jetbrains/kotlin/utils/DescriptionAware.kt

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2010-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.utils;
+
+interface DescriptionAware {
+    val description: String
+}