luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3955 from dwijnand/fix-validID 

Fix validID & expand tests
This commit is contained in:
Dale Wijnand 2018-02-19 21:00:30 +00:00 committed by GitHub
parent b393631c90 fc73203d0b
commit c9f3a73c3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/util-complete/src/main/scala/sbt/internal/util/complete/Parsers.scala
View File

@ -317,7 +317,7 @@ object DefaultParsers extends Parsers with ParserMain {
/** Returns `true` if `s` parses successfully according to [[ID]].*/ /** Returns `true` if `s` parses successfully according to [[ID]].*/
def validID(s: String): Boolean = { def validID(s: String): Boolean = {
// Handwritten version of `matches(ID, s)` because validID turned up in profiling. // Handwritten version of `matches(ID, s)` because validID turned up in profiling.
def isIdChar(c: Char): Boolean = Character.isLetterOrDigit(c) || (c == '_') def isIdChar(c: Char): Boolean = Character.isLetterOrDigit(c) || (c == '-') || (c == '_')
@tailrec def isRestIdChar(cur: Int, s: String, length: Int): Boolean = @tailrec def isRestIdChar(cur: Int, s: String, length: Int): Boolean =
if (cur < length) if (cur < length)
isIdChar(s.charAt(cur)) && isRestIdChar(cur + 1, s, length) isIdChar(s.charAt(cur)) && isRestIdChar(cur + 1, s, length)

17
internal/util-complete/src/test/scala/DefaultParsersSpec.scala
View File

@ -8,10 +8,21 @@
package sbt.internal.util package sbt.internal.util
package complete package complete
import org.scalacheck._, Prop._ import org.scalacheck._, Gen._, Prop._
object DefaultParsersSpec extends Properties("DefaultParsers") { object DefaultParsersSpec extends Properties("DefaultParsers") {
import DefaultParsers._ import DefaultParsers.{ ID, isIDChar, matches, validID }
property("validID == matches(ID, s)") = forAll((s: String) => validID(s) == matches(ID, s)) property("∀ s ∈ String: validID(s) == matches(ID, s)") = forAll(
(s: String) => validID(s) == matches(ID, s))
property("∀ s ∈ genID: matches(ID, s)") = forAll(genID)(s => matches(ID, s))
property("∀ s ∈ genID: validID(s)") = forAll(genID)(s => validID(s))
private val chars: Seq[Char] = Char.MinValue to Char.MaxValue
private val genID: Gen[String] =
for {
c <- oneOf(chars filter (_.isLetter))
cs <- listOf(oneOf(chars filter isIDChar))
} yield (c :: cs).mkString
} }