Merge pull request scala#6280 from SethTisue/merge-2.12.x-to-2.13.x-20180124

Merge 2.12.x to 2.13.x [ci:last-only]

Author: lrytz

LICENSE

@@ -1,7 +1,7 @@
 This software includes projects with other licenses -- see `doc/LICENSE.md`.
 
-Copyright (c) 2002-2017 EPFL
-Copyright (c) 2011-2017 Lightbend, Inc.
+Copyright (c) 2002-2018 EPFL
+Copyright (c) 2011-2018 Lightbend, Inc.
 
 All rights reserved.
 

README.md

@@ -141,7 +141,6 @@ codebase and re-compiles too many files, resulting in long build times (check
 meantime you can:
   - Enable "Ant mode" in which sbt only re-compiles source files that were modified.
     Create a file `local.sbt` containing the line `antStyle := true`.
-    Add an entry `local.sbt` to your `~/.gitignore`.
   - Use IntelliJ IDEA for incremental compiles (see [IDE Setup](#ide-setup) below) - its
     incremental compiler is a bit less conservative, but usually correct.
 
@@ -265,6 +264,10 @@ before the commit's PR has been merged. That commit is then used to
 build a large number of open-source projects from source and run their
 test suites.
 
+To request a community build run on your PR, just ask in a comment on
+the PR and a Scala team member will take care of
+it. ([details](https://github.com/scala/community-builds/wiki#can-i-run-it-against-a-pull-request-in-scalascala))
+
 Community builds run on the Scala Jenkins instance.  The jobs are
 named `..-integrate-community-build`. See the
 [scala/community-builds](https://github.com/scala/community-builds)

doc/LICENSE.md

@@ -2,9 +2,9 @@ Scala is licensed under the [BSD 3-Clause License](http://opensource.org/license
 
 ## Scala License
 
-Copyright (c) 2002-2017 EPFL
+Copyright (c) 2002-2018 EPFL
 
-Copyright (c) 2011-2017 Lightbend, Inc.
+Copyright (c) 2011-2018 Lightbend, Inc.
 
 All rights reserved.
 

doc/License.rtf

@@ -10,8 +10,8 @@
 \fs48 Scala License
 \fs40 \
 
-\fs26 Copyright (c) 2002-2017 EPFL\
-Copyright (c) 2011-2017 Lightbend, Inc.\
+\fs26 Copyright (c) 2002-2018 EPFL\
+Copyright (c) 2011-2018 Lightbend, Inc.\
 All rights reserved.\
 \
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\

project/VersionUtil.scala

@@ -26,7 +26,7 @@ object VersionUtil {
   )
 
   lazy val generatePropertiesFileSettings = Seq[Setting[_]](
-    copyrightString := "Copyright 2002-2017, LAMP/EPFL and Lightbend, Inc.",
+    copyrightString := "Copyright 2002-2018, LAMP/EPFL and Lightbend, Inc.",
     resourceGenerators in Compile += generateVersionPropertiesFile.map(file => Seq(file)).taskValue,
     generateVersionPropertiesFile := generateVersionPropertiesFileImpl.value
   )

spec/07-implicits.md

@@ -155,7 +155,7 @@ sort(yss)
 The call above will be completed by passing two nested implicit arguments:
 
 ```scala
-sort(yss)(xs: List[Int] => list2ordered[Int](xs)(int2ordered))
+sort(yss)((xs: List[Int]) => list2ordered[Int](xs)(int2ordered))
 ```
 
 The possibility of passing implicit arguments to implicit arguments

src/compiler/scala/tools/nsc/Global.scala

@@ -1347,7 +1347,7 @@ class Global(var currentSettings: Settings, var reporter: Reporter)
     def compiles(sym: Symbol): Boolean =
       if (sym == NoSymbol) false
       else if (symSource.isDefinedAt(sym)) true
-      else if (!sym.isTopLevel) compiles(sym.enclosingTopLevelClassOrDummy)
+      else if (!sym.isTopLevel) compiles(sym.originalEnclosingTopLevelClassOrDummy)
       else if (sym.isModuleClass) compiles(sym.sourceModule)
       else false
 

src/compiler/scala/tools/nsc/ast/DocComments.scala

@@ -70,9 +70,10 @@ trait DocComments { self: Global =>
    *  the doc comment of the overridden version is copied instead.
    */
   def cookedDocComment(sym: Symbol, docStr: String = ""): String = cookedDocComments.getOrElseUpdate(sym, {
-    var ownComment = if (docStr.length == 0) docComments get sym map (_.template) getOrElse ""
-                       else DocComment(docStr).template
-    ownComment = replaceInheritDocToInheritdoc(ownComment)
+    val ownComment = replaceInheritDocToInheritdoc {
+      if (docStr.length == 0) docComments get sym map (_.template) getOrElse ""
+      else DocComment(docStr).template
+    }
 
     superComment(sym) match {
       case None =>
@@ -133,8 +134,12 @@ trait DocComments { self: Global =>
     mapFind(sym :: allInheritedOverriddenSymbols(sym))(docComments get _)
 
   /** The cooked doc comment of an overridden symbol */
-  protected def superComment(sym: Symbol): Option[String] =
-    allInheritedOverriddenSymbols(sym).iterator map (x => cookedDocComment(x)) find (_ != "")
+  protected def superComment(sym: Symbol): Option[String] = {
+    val getter: Symbol = sym.getter
+    allInheritedOverriddenSymbols(getter.orElse(sym)).iterator
+      .map(cookedDocComment(_))
+      .find(_ != "")
+  }
 
   private def mapFind[A, B](xs: Iterable[A])(f: A => Option[B]): Option[B] =
     xs collectFirst scala.Function.unlift(f)

src/compiler/scala/tools/nsc/ast/TreeGen.scala

@@ -351,7 +351,7 @@ abstract class TreeGen extends scala.reflect.internal.TreeGen with TreeDSL {
       case mt @ MethodType(params, res) => copyMethodType(mt, selfParamSym :: params, res)
     })
     val selfParam = ValDef(selfParamSym)
-    val rhs = orig.rhs.substituteThis(newSym.owner, gen.mkAttributedIdent(selfParamSym)) // SD-186 intentionally leaving Ident($this) is unpositioned
+    val rhs = orig.rhs.substituteThis(newSym.owner, gen.mkAttributedIdent(selfParamSym)) // scala/scala-dev#186 intentionally leaving Ident($this) is unpositioned
       .substituteSymbols(origParams, newSym.info.params.drop(1)).changeOwner(origSym -> newSym)
     treeCopy.DefDef(orig, orig.mods, orig.name, orig.tparams, (selfParam :: orig.vparamss.head) :: Nil, orig.tpt, rhs).setSymbol(newSym)
   }

src/compiler/scala/tools/nsc/ast/parser/Parsers.scala

@@ -2899,9 +2899,8 @@ self =>
       val name = ident()
       val tstart = in.offset
       atPos(start, if (name == nme.ERROR) start else nameOffset) {
-        val mods1 = if (in.token == SUBTYPE) mods | Flags.DEFERRED else mods
-        val template = templateOpt(mods1, name, NoMods, Nil, tstart)
-        ModuleDef(mods1, name.toTermName, template)
+        val template = templateOpt(mods, name, NoMods, Nil, tstart)
+        ModuleDef(mods, name.toTermName, template)
       }
     }
 
@@ -3003,13 +3002,17 @@ self =>
 
     /** {{{
      *  ClassTemplateOpt ::= `extends' ClassTemplate | [[`extends'] TemplateBody]
-     *  TraitTemplateOpt ::= TraitExtends TraitTemplate | [[`extends'] TemplateBody] | `<:' TemplateBody
-     *  TraitExtends     ::= `extends' | `<:'
+     *  TraitTemplateOpt ::= TraitExtends TraitTemplate | [[TraitExtends] TemplateBody]
+     *  TraitExtends     ::= `extends' | `<:' (deprecated)
      *  }}}
      */
     def templateOpt(mods: Modifiers, name: Name, constrMods: Modifiers, vparamss: List[List[ValDef]], tstart: Offset): Template = {
+      def deprecatedUsage(): Boolean = {
+        deprecationWarning(in.offset, "Using `<:` for `extends` is deprecated", since = "2.12.5")
+        true
+      }
       val (parents, self, body) = (
-        if (in.token == EXTENDS || in.token == SUBTYPE && mods.isTrait) {
+        if (in.token == EXTENDS || in.token == SUBTYPE && mods.isTrait && deprecatedUsage()) {
           in.nextToken()
           template()
         }
@@ -3230,11 +3233,12 @@ self =>
      *  }}}
      */
     def blockStatSeq(): List[Tree] = checkNoEscapingPlaceholders {
+      def acceptStatSepOptOrEndCase() = if (!isCaseDefEnd) acceptStatSepOpt()
       val stats = new ListBuffer[Tree]
       while (!isStatSeqEnd && !isCaseDefEnd) {
         if (in.token == IMPORT) {
           stats ++= importClause()
-          acceptStatSepOpt()
+          acceptStatSepOptOrEndCase()
         }
         else if (isDefIntro || isLocalModifier || isAnnotation) {
           if (in.token == IMPLICIT) {
@@ -3244,11 +3248,11 @@ self =>
           } else {
             stats ++= localDef(0)
           }
-          acceptStatSepOpt()
+          acceptStatSepOptOrEndCase()
         }
         else if (isExprIntro) {
           stats += statement(InBlock)
-          if (!isCaseDefEnd) acceptStatSep()
+          acceptStatSepOptOrEndCase()
         }
         else if (isStatSep) {
           in.nextToken()