diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-02-19 10:25:59 -0800 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-02-19 10:25:59 -0800 |
commit | a3a794fc3ba7128342310517da43e1ec143f85bd (patch) | |
tree | 74c9b733f0eb21723460c684a39cc0031b757f32 /src/reflect | |
parent | 2d26cacd24b396c7f7449e731f059811d0d1fac4 (diff) | |
parent | 9cd5c881fc13acbd9aca08fd6ae2830292e5f1b4 (diff) | |
download | scala-a3a794fc3ba7128342310517da43e1ec143f85bd.tar.gz scala-a3a794fc3ba7128342310517da43e1ec143f85bd.tar.bz2 scala-a3a794fc3ba7128342310517da43e1ec143f85bd.zip |
Merge pull request #4340 from retronym/topic/infix-completion
SI-9153 More complete and stable results for completions
Diffstat (limited to 'src/reflect')
-rw-r--r-- | src/reflect/scala/reflect/internal/StdNames.scala | 1 | ||||
-rw-r--r-- | src/reflect/scala/reflect/internal/util/Collections.scala | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/reflect/scala/reflect/internal/StdNames.scala b/src/reflect/scala/reflect/internal/StdNames.scala index f32b7326fe..c0562b0679 100644 --- a/src/reflect/scala/reflect/internal/StdNames.scala +++ b/src/reflect/scala/reflect/internal/StdNames.scala @@ -1078,6 +1078,7 @@ trait StdNames { val reflPolyCacheName: NameType = "reflPoly$Cache" val reflParamsCacheName: NameType = "reflParams$Cache" val reflMethodName: NameType = "reflMethod$Method" + val argument: NameType = "<argument>" } diff --git a/src/reflect/scala/reflect/internal/util/Collections.scala b/src/reflect/scala/reflect/internal/util/Collections.scala index d128521be8..a743d8962a 100644 --- a/src/reflect/scala/reflect/internal/util/Collections.scala +++ b/src/reflect/scala/reflect/internal/util/Collections.scala @@ -181,6 +181,9 @@ trait Collections { final def mapFrom[A, A1 >: A, B](xs: List[A])(f: A => B): Map[A1, B] = { Map[A1, B](xs map (x => (x, f(x))): _*) } + final def linkedMapFrom[A, A1 >: A, B](xs: List[A])(f: A => B): mutable.LinkedHashMap[A1, B] = { + mutable.LinkedHashMap[A1, B](xs map (x => (x, f(x))): _*) + } final def mapWithIndex[A, B](xs: List[A])(f: (A, Int) => B): List[B] = { val lb = new ListBuffer[B] |