From 007408c7929f26536fde0e36a230ba56d1fb2fbb Mon Sep 17 00:00:00 2001 From: Sergey Mashkov Date: Fri, 14 Apr 2017 13:23:45 +0300 Subject: [PATCH] Maven: rename completion providers --- .../idea/maven/MavenCompletionProviders.kt | 16 ++++++++-------- idea/src/META-INF/maven.xml | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) 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 index 5627dfb845b..fe2790ebe58 100644 --- a/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/MavenCompletionProviders.kt +++ b/idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/MavenCompletionProviders.kt @@ -23,22 +23,22 @@ import org.jetbrains.kotlin.config.JvmTarget import org.jetbrains.kotlin.config.LanguageVersion import org.jetbrains.kotlin.idea.actions.internal.KotlinInternalMode -class LanguageVersionsProvider : MavenFixedValueReferenceProvider( +class MavenLanguageVersionsCompletionProvider : MavenFixedValueReferenceProvider( LanguageVersion.values().filter { it.isStable || KotlinInternalMode.enabled }.map { it.versionString }.toTypedArray() ) -class ApiVersionsProvider : MavenFixedValueReferenceProvider( +class MavenApiVersionsCompletionProvider : MavenFixedValueReferenceProvider( LanguageVersion.values().filter { it.isStable || KotlinInternalMode.enabled }.map { it.versionString }.toTypedArray() ) -class JvmTargetsProvider : MavenFixedValueReferenceProvider( - JvmTarget.values().map { it.description }.toTypedArray() +class MavenJvmTargetsCompletionProvider : MavenFixedValueReferenceProvider( + JvmTarget.values().map(JvmTarget::description).toTypedArray() ) -class JsModuleKindsProvider : MavenFixedValueReferenceProvider( - DefaultValues.JsModuleKinds.possibleValues?.map { StringUtil.unquoteString(it) }?.toTypedArray() ?: emptyArray() +class MavenJsModuleKindsCompletionProvider : MavenFixedValueReferenceProvider( + DefaultValues.JsModuleKinds.possibleValues!!.map(StringUtil::unquoteString).toTypedArray() ) -class JsMainCallProvider : MavenFixedValueReferenceProvider( - DefaultValues.JsMain.possibleValues?.map { StringUtil.unquoteString(it) }?.toTypedArray() ?: emptyArray() +class MavenJsMainCallCompletionProvider : MavenFixedValueReferenceProvider( + DefaultValues.JsMain.possibleValues!!.map(StringUtil::unquoteString).toTypedArray() ) \ No newline at end of file diff --git a/idea/src/META-INF/maven.xml b/idea/src/META-INF/maven.xml index fa6f515d830..dea8c99a851 100644 --- a/idea/src/META-INF/maven.xml +++ b/idea/src/META-INF/maven.xml @@ -20,11 +20,11 @@ - - - - - + + + + +