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

[Gradle, JS] Right wildcard range

Browse Source 
^KT-41054 fixed
This commit is contained in:
Ilya Goncharov
2020-08-05 18:15:36 +03:00
parent f848b7cbeb
commit a4de85da13
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmRangeVisitor.kt
+19 -3
View File
@@ -9,6 +9,7 @@ import com.github.gundy.semver4j.generated.grammar.NodeSemverExpressionBaseVisit
import com.github.gundy.semver4j.generated.grammar.NodeSemverExpressionParser import com.github.gundy.semver4j.generated.grammar.NodeSemverExpressionParser
import com.github.gundy.semver4j.model.Version import com.github.gundy.semver4j.model.Version
import org.antlr.v4.runtime.tree.TerminalNode import org.antlr.v4.runtime.tree.TerminalNode
import org.gradle.api.GradleException
import org.jetbrains.kotlin.gradle.utils.toListOrEmpty import org.jetbrains.kotlin.gradle.utils.toListOrEmpty
class NpmRangeVisitor : NodeSemverExpressionBaseVisitor<List<NpmRange>>() { class NpmRangeVisitor : NodeSemverExpressionBaseVisitor<List<NpmRange>>() {
@@ -18,9 +19,24 @@ class NpmRangeVisitor : NodeSemverExpressionBaseVisitor<List<NpmRange>>() {
override fun visitWildcard(ctx: NodeSemverExpressionParser.WildcardContext): List<NpmRange> = override fun visitWildcard(ctx: NodeSemverExpressionParser.WildcardContext): List<NpmRange> =
listOf(NpmRange()) listOf(NpmRange())
// TODO check it override fun visitWildcardRange(ctx: NodeSemverExpressionParser.WildcardRangeContext): List<NpmRange> {
override fun visitWildcardRange(ctx: NodeSemverExpressionParser.WildcardRangeContext): List<NpmRange> = val partialWildcardSemver = ctx.partialWildcardSemver()
listOf(eq(ctx.partialWildcardSemver().text)) val versionText = partialWildcardSemver.text
val version = versionText
.replace(".x", "")
.replace(".X", "")
.replace(".*", "")
.let { Version.fromString(it) }
val nextVersion = when {
partialWildcardSemver.minor == null -> version.incrementMajor()
partialWildcardSemver.patch == null -> version.incrementMinor()
else -> throw GradleException("Incorrect version pattern $versionText")
}
return (gteq(version) intersect lt(nextVersion))
.toListOrEmpty()
}
override fun visitOperator(ctx: NodeSemverExpressionParser.OperatorContext): List<NpmRange> { override fun visitOperator(ctx: NodeSemverExpressionParser.OperatorContext): List<NpmRange> {
val eq: TerminalNode? = ctx.unaryOperator().EQ() val eq: TerminalNode? = ctx.unaryOperator().EQ()