From 711398f14ff5e9f5f2299954c658475d6ba428fb Mon Sep 17 00:00:00 2001 From: Sergey Mashkov Date: Thu, 13 Apr 2017 17:56:35 +0300 Subject: [PATCH] Maven: eliminate constants in maven.xml --- .../idea/maven/MavenCompletionProviders.kt | 43 +++++++++++++++++++ .../kotlin/idea/maven/VersionsProviders.kt | 24 ----------- idea/src/META-INF/maven.xml | 6 +-- 3 files changed, 46 insertions(+), 27 deletions(-) create mode 100644 idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/MavenCompletionProviders.kt delete mode 100644 idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/VersionsProviders.kt diff --git a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/MavenCompletionProviders.kt b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/MavenCompletionProviders.kt new file mode 100644 index 00000000000..914ce572766 --- /dev/null +++ b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/MavenCompletionProviders.kt @@ -0,0 +1,43 @@ +/* + * Copyright 2010-2017 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.idea.maven + +import com.intellij.openapi.util.text.StringUtil +import org.jetbrains.idea.maven.plugins.api.MavenFixedValueReferenceProvider +import org.jetbrains.kotlin.cli.common.arguments.DefaultValues +import org.jetbrains.kotlin.config.JvmTarget +import org.jetbrains.kotlin.config.LanguageVersion + +class LanguageVersionsProvider : MavenFixedValueReferenceProvider( + LanguageVersion.values().map { it.versionString }.toTypedArray() +) + +class ApiVersionsProvider : MavenFixedValueReferenceProvider( + LanguageVersion.values().map { it.versionString }.toTypedArray() +) + +class JvmTargetsProvider : MavenFixedValueReferenceProvider( + JvmTarget.values().map { it.description }.toTypedArray() +) + +class JsModuleKindsProvider : MavenFixedValueReferenceProvider( + DefaultValues.JsModuleKinds.possibleValues?.map { StringUtil.unquoteString(it) }?.toTypedArray() ?: emptyArray() +) + +class JsMainCallProvider : MavenFixedValueReferenceProvider( + DefaultValues.JsMain.possibleValues?.map { StringUtil.unquoteString(it) }?.toTypedArray() ?: emptyArray() +) \ No newline at end of file diff --git a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/VersionsProviders.kt b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/VersionsProviders.kt deleted file mode 100644 index eebdc43253d..00000000000 --- a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/VersionsProviders.kt +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright 2010-2017 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.idea.maven - -import org.jetbrains.idea.maven.plugins.api.MavenFixedValueReferenceProvider -import org.jetbrains.kotlin.config.LanguageVersion - -class LanguageVersionsProvider : MavenFixedValueReferenceProvider(LanguageVersion.values().map { it.versionString }.toTypedArray()) - -class ApiVersionsProvider : MavenFixedValueReferenceProvider(LanguageVersion.values().map { it.versionString }.toTypedArray()) diff --git a/idea/src/META-INF/maven.xml b/idea/src/META-INF/maven.xml index c0c8fb70407..fa6f515d830 100644 --- a/idea/src/META-INF/maven.xml +++ b/idea/src/META-INF/maven.xml @@ -22,9 +22,9 @@ - - - + + +