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

[Gradle, JS] Renames

Browse Source 
^KT-41054 fixed
This commit is contained in:
Ilya Goncharov
2020-08-05 15:29:58 +03:00
parent fec8c6c0ae
commit 7f3a2ac953
3 changed files with 8 additions and 7 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/NpmRange.kt
+4 -4
View File
@@ -6,10 +6,10 @@
package org.jetbrains.kotlin.gradle.targets.js.npm package org.jetbrains.kotlin.gradle.targets.js.npm
import com.github.gundy.semver4j.model.Version import com.github.gundy.semver4j.model.Version
import org.jetbrains.kotlin.gradle.targets.js.npm.NpmVersionInvertedVisitor.Companion.GT import org.jetbrains.kotlin.gradle.targets.js.npm.NpmRangeVisitor.Companion.GT
import org.jetbrains.kotlin.gradle.targets.js.npm.NpmVersionInvertedVisitor.Companion.GTEQ import org.jetbrains.kotlin.gradle.targets.js.npm.NpmRangeVisitor.Companion.GTEQ
import org.jetbrains.kotlin.gradle.targets.js.npm.NpmVersionInvertedVisitor.Companion.LT import org.jetbrains.kotlin.gradle.targets.js.npm.NpmRangeVisitor.Companion.LT
import org.jetbrains.kotlin.gradle.targets.js.npm.NpmVersionInvertedVisitor.Companion.LTEQ import org.jetbrains.kotlin.gradle.targets.js.npm.NpmRangeVisitor.Companion.LTEQ
data class NpmRange( data class NpmRange(
val startVersion: SemVer? = null, val startVersion: SemVer? = null,
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmVersionInvertedVisitor.kt → libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmRangeVisitor.kt
+1 -1
View File
@@ -10,7 +10,7 @@ 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
class NpmVersionInvertedVisitor : NodeSemverExpressionBaseVisitor<List<NpmRange?>>() { class NpmRangeVisitor : NodeSemverExpressionBaseVisitor<List<NpmRange?>>() {
override fun visitEmptyRange(ctx: NodeSemverExpressionParser.EmptyRangeContext): List<NpmRange?> = override fun visitEmptyRange(ctx: NodeSemverExpressionParser.EmptyRangeContext): List<NpmRange?> =
listOf(null) listOf(null)
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmVersionInverter.kt → libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmVersions.kt
+3 -2
View File
@@ -15,7 +15,7 @@ fun versionToNpmRanges(version: String): List<NpmRange?> {
val lexer = NodeSemverExpressionLexer(ANTLRInputStream(version)) val lexer = NodeSemverExpressionLexer(ANTLRInputStream(version))
val tokens = CommonTokenStream(lexer) val tokens = CommonTokenStream(lexer)
val parser = NodeSemverExpressionParser(tokens) val parser = NodeSemverExpressionParser(tokens)
return NpmVersionInvertedVisitor() return NpmRangeVisitor()
.visit(parser.rangeSet())!! .visit(parser.rangeSet())!!
} }
@@ -59,5 +59,6 @@ fun buildNpmVersion(
} else } else
excludedRanges excludedRanges
.mapNotNull { it intersect includedRange } .mapNotNull { it intersect includedRange }
.joinToString(NpmVersionInvertedVisitor.OR) .sortedBy { it.startVersion }
.joinToString(NpmRangeVisitor.OR)
} }