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

Refactoring: inline KotlinInternalMode.enabled

Browse Source
This commit is contained in:
Nikolay Krasko
2018-04-24 20:30:44 +03:00
parent 82a21b3955
commit 144c41576e
24 changed files with 44 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/KotlinMavenArchetypesProvider.kt
+2 -2
View File
@@ -18,12 +18,12 @@ package org.jetbrains.kotlin.idea.maven
import com.google.gson.JsonElement
import com.google.gson.JsonParser
import com.intellij.openapi.application.ApplicationManager
import com.intellij.util.net.HttpConfigurable
import org.jetbrains.idea.maven.dom.MavenVersionComparable
import org.jetbrains.idea.maven.indices.MavenArchetypesProvider
import org.jetbrains.idea.maven.model.MavenArchetype
import org.jetbrains.kotlin.idea.KotlinPluginUtil
import org.jetbrains.kotlin.idea.actions.internal.KotlinInternalMode
import org.jetbrains.kotlin.utils.ifEmpty
import java.net.HttpURLConnection
import java.net.URLEncoder
@@ -62,7 +62,7 @@ class KotlinMavenArchetypesProvider(private val kotlinPluginVersion: String, pri
private val versionPrefix by lazy { versionPrefix(kotlinPluginVersion) }
private val fallbackVersion = "1.0.3"
private val internalMode: Boolean
get() = predefinedInternalMode ?: KotlinInternalMode.enabled
get() = predefinedInternalMode ?: ApplicationManager.getApplication().isInternal
private val archetypesBlocking by lazy {
try {
idea/idea-maven/src/org/jetbrains/kotlin/idea/maven/MavenCompletionProviders.kt
+3 -3
View File
@@ -16,19 +16,19 @@
package org.jetbrains.kotlin.idea.maven
import com.intellij.openapi.application.ApplicationManager
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
import org.jetbrains.kotlin.idea.actions.internal.KotlinInternalMode
class MavenLanguageVersionsCompletionProvider : MavenFixedValueReferenceProvider(
LanguageVersion.values().filter { it.isStable || KotlinInternalMode.enabled }.map { it.versionString }.toTypedArray()
LanguageVersion.values().filter { it.isStable || ApplicationManager.getApplication().isInternal }.map { it.versionString }.toTypedArray()
)
class MavenApiVersionsCompletionProvider : MavenFixedValueReferenceProvider(
LanguageVersion.values().filter { it.isStable || KotlinInternalMode.enabled }.map { it.versionString }.toTypedArray()
LanguageVersion.values().filter { it.isStable || ApplicationManager.getApplication().isInternal }.map { it.versionString }.toTypedArray()
)
class MavenJvmTargetsCompletionProvider : MavenFixedValueReferenceProvider(