summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Make Range.Partial a value classxuwei-k2016-05-171-1/+1
|
* Reduce boilerplate in compiler JUnit tests (#5158)Jason Zaugg2016-05-1625-258/+112
| | | | | | | | | | | | | | | | Many JUnit tests share a compiler instance between all test cases in a class to reduce overhead. This commit refactors the mechanism to reduce the boilerplate. In the new scheme: - Using the `@ClassRule` hook in JUnit, we create a per-class map for each test class. - Per-class values are registered from the test class itself by calling `cached("someKey", () => mkExpensiveThing)` - At the end of the test, the entries in this map are `close()`-ed (if they implement `Closable`), and are released for garbage collection.)
* Add summary reporting to Scaladoc (#5063)Felix Mulder2016-05-137-23/+81
|
* Merge pull request #5146 from som-snytt/issue/9045-msgLukas Rytz2016-05-137-39/+52
|\ | | | | SI-9045 Error on recursive ctor
| * SI-9045 Error on recursive ctorSom Snytt2016-05-047-11/+32
| | | | | | | | If the constructor invokes itself, say so.
| * SI-9045 Refactor to abuse of matchSom Snytt2016-05-041-36/+28
| | | | | | | | | | Collapse conditionals into match for legible. Yes, guards have scary eval order.
* | Add check to scala REPL package to improve feedback about implicits (#5159)Jens2016-05-135-4/+33
| | | | | | | | | | | | | | When the repl is started with additional compiler flags that prevent implicits being in scope (like -Yno-predef) the default message of implicits in scope using :implicits stays the same. This additional check will return the same message if predef is indeed in scope and an adjusted message if Predef is not in scope.
* | Merge pull request #5156 from retronym/topic/partest-1.0.14Jason Zaugg2016-05-123-3/+3
|\ \ | | | | | | Bump to scala-partest 1.0.14
| * | Bump to scala-partest 1.0.14Jason Zaugg2016-05-123-3/+3
| | | | | | | | | | | | | | | This should fix the bootstrap build by incorporating https://github.com/scala/scala-partest/pull/58
* | | Correct off-by-one error in Product documentation (#5148)Janek Bogucki2016-05-111-1/+1
| | |
* | | SI-9397 Add "_root_" to "GenUtils.scalaFactoryCall" to avoid the scala ↵Shixiong Zhu2016-05-113-2/+14
| | | | | | | | | | | | | | | package name conflits (#5150) When a user imports some package ending with `scala`, the macro expansion of TypeTag may not work because it uses `scala.collection.immutable.List` but it's overrided. This patch adds the `_root_` prefix to avoid the scala package name conflits. Of cause, after this fix, importing a package ending with `_root_` has the same issue. However, people rarely do that.
* | | SI-9666: Use inline group names in Regex (#4990)som-snytt2016-05-113-8/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delegate `Match group name` to the underlying `matcher`. If that fails, try explicit group names as a fall back. No attempt is made to correlate inline and explicit names. In the following case, either name is accepted: ``` new Regex("a(?<Bar>b*)c", "Bee") ``` But if names are reversed, the error is undetected: ``` new Regex("a(?<Bee>b*)(?<Bar>c)", "Bar", "Bee") ``` Throw IllegalArg on bad group name to be consistent with Java.
* | | BitSet{1,2} conversion (#5127)Ruslan Sennov2016-05-111-5/+7
|/ / | | | | | | | | | | In current implementation when we set high word (elems1) of BitSet2 to zero, the result is BitSet2 again. I believe it is leading to excessive memory usage and result should be BitSet1. Private helper method createSmall(a: Long, b: Long) introduced.
* | Merge pull request #5154 from retronym/merge/2.11.x-to-2.12.x-20160511Jason Zaugg2016-05-112-22/+49
|\ \ | | | | | | Merge 2.11.x to 2.12.x
| * \ Merge commit 'd06ce96' into merge/2.11.x-to-2.12.x-20160511Jason Zaugg2016-05-112-22/+49
| |\ \
| | * \ Merge pull request #5128 from szeiger/wip/sbt-ivy-2.11Jason Zaugg2016-05-112-26/+53
| | |\ \ | | | | | | | | | | Publish usable Scala distributions to Ivy repositories
| | | * | Publish usable Scala distributions to Ivy repositoriesStefan Zeiger2016-05-062-26/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - sbt requires a `default` configuration in the Scala distribution but doesn’t publish such a configuration to Ivy repositories by default. This is not a problem when publishing to a Maven repository because Maven doesn’t use the concept of configurations and Ivy creates a standard set (including `default`) when resolving artifacts from Maven repositories, but it prevents the use of any Scala distribution published with `publishLocal`. The underlying issue is that sbt requires `default` instead of `default(compile)`. We work around this limitation by publishing a dummy `default` configuration. - sbt has hardcoded dependencies on the `scala-library` artifact of type `jar`. In the tradition of `sbt-osgi` we used type `bundle` when publishing via Ivy but this makes the artifacts unusable from sbt. We now publish the OSGi bundles directly as type `jar` (which is compatible with how they appear in Ivy after resolving from a Maven repository). - We have to be more aggressive about not publishing certain subprojects, otherwise `ivy.xml` files could still be published even when using `publishArtifacts := false`. - `removePomDependencies` now also modifies `ivy.xml` in addition to the Maven POM so that bogus dependencies do not leak into the Ivy descriptors. Fixes https://github.com/scala/scala-dev/issues/130
| * | | | Merge commit 'cf38506' into merge/2.11.x-to-2.12.x-20160511Jason Zaugg2016-05-110-0/+0
|/| | | | | |/ / /
| * | | Merge pull request #5139 from SethTisue/disable-integrate-ideAdriaan Moors2016-04-281-0/+4
| |\ \ \ | | | | | | | | | | disable integrate/ide script on 2.11.x
| | * | | disable integrate/ide script on 2.11.xSeth Tisue2016-04-281-0/+4
| | | | |
* | | | | Merge pull request #5042 from soc/SI-9539Jason Zaugg2016-05-051-2/+2
|\ \ \ \ \ | | | | | | | | | | | | SI-9539 Specify charset when reading ScalaSignatures, ...
| * | | | | SI-9539 Specify charset when reading ScalaSignatures, ...Simon Ochsenreither2016-03-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | ... without it we would use the platform's default charset.
* | | | | | Merge pull request #5083 from xuwei-k/fix-Future-scaladocJason Zaugg2016-05-051-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | use Future#foreach instead of onSuccess in example code
| * | | | | | use Future#foreach instead of onSuccess in example codexuwei-k2016-04-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bacause Future#onSuccess is deprecated https://github.com/scala/scala/commit/fa0743c32338f147eaf7a
* | | | | | | Merge pull request #5112 from lrytz/dropRecursiveClasspathJason Zaugg2016-05-0534-1200/+380
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove legacy recursive classpath implementation
| * | | | | | | Remove abstraction layer in classpath implementationLukas Rytz2016-05-0233-440/+339
| | | | | | | |
| * | | | | | | faster AggregateClassPath.findClassLukas Rytz2016-04-231-13/+12
| | | | | | | |
| * | | | | | | remove recursive classpath implementationLukas Rytz2016-04-2324-803/+85
| | | | | | | |
* | | | | | | | Merge pull request #5132 from acdenhartog/patch-1Jason Zaugg2016-05-052-3/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Avoid function chaining with reverse method
| * | | | | | | | test PriorityQueue.reverseArno den Hartog2016-05-021-0/+7
| | | | | | | | |
| * | | | | | | | Avoid function chaining with reverse methodArno den Hartog2016-04-271-3/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #5140 from lrytz/inlineDefaultMethodsJason Zaugg2016-05-058-65/+200
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | SD-140 inline the correct default method
| * | | | | | | | SD-140 inline the correct default methodLukas Rytz2016-04-288-65/+200
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When inheriting multiple default methods, select the correct one to inline. Implements method resolution according to the JVM spec.
* | | | | | | | Emit a warning when a constant expression evaluates to an ↵Olli Helenius2016-05-025-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ArithmeticException (#5123)
* | | | | | | | SI-9752 never ignore blank lines when parsing code blocks (#5125)Antoine Gourlay2016-05-023-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default behavior when parsing the content of a tag text (like after `@example`) was to ignore empty lines. That's fine, except when we are in the middle of a code block, where preserving formatting matters.
* | | | | | | | SD-142 Avoid noisy log output in backend (#5134)Jason Zaugg2016-05-022-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `withCurrentUnit` is designed to be called once per compilation unit as it side effects by logging and updating progress counters. `GenBCode` was calling it more frequently (once per `ClassDef`.) This is due to the somewhat convoluted internal architecture of that phase, which is designed to support paralellism in the future. This commit factors out the internal part of `withCompilationUnit` that modifies `currentUnit`, and calls that instead in the loop over classes. After this change: ``` % qscala -Ydebug ... [running phase jvm on <console>] // only once ```
* | | | | | | | Add examples to Exception object and group members (#5111)Janek Bogucki2016-05-021-25/+165
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Extend main comment with additional examples - Group methods from a user perspective - List exceptions special cased by shouldRethrow - Include overlooked withTry in opt, either notes.
* | | | | | | | Merge pull request #5129 from retronym/ticket/9762Jason Zaugg2016-04-293-29/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | SI-9762 Update the REPL to use JLine 2.14.1
| * | | | | | | | SI-9762 Remove workaround after upstream fix in jlineJason Zaugg2016-04-271-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we use a release of JLine that includes the fix for: https://github.com/jline/jline2/issues/208 We no longer need to the workaround introduced in 7719a3c. Screencast of the still-fixed behaviour: http://recordit.co/5pzh9OhlQv.gif
| * | | | | | | | SI-9762 Update to JLine 2.14.1Jason Zaugg2016-04-273-9/+11
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Motivated by the improvements to multi-byte character handling. Screencast showing the reported bug is fixed: http://g.recordit.co/ie1Z367NUl.gif Here's the changelog since JLine 2.12.1: https://github.com/jline/jline2/compare/jline-2.12.1...jline-2.14.1 I needed to disable a new, on-by-default feature in JLine so that it didn't add a " " after completing the token `equals` in `foo.equa<TAB>`.
* | | | | | | | Fix the Eclipse classpaths for 2.12.0-M4. (#5136)Performant Data2016-04-283-5/+5
| | | | | | | |
* | | | | | | | Merge pull request #5094 from lrytz/classOfUnitAdriaan Moors2016-04-272-2/+15
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Fix erasure for classOf[Unit], don't erase to classOf[BoxedUnit]
| * | | | | | | Fix erasure for classOf[Unit], don't erase to classOf[BoxedUnit]Lukas Rytz2016-04-202-2/+15
| | | | | | | |
* | | | | | | | More efficient code for deciding if a mixin forwarder is needed (#5116)Lukas Rytz2016-04-258-16/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also adds a warning on junit test methods that compile as default methods.
* | | | | | | | Merge pull request #5115 from lrytz/merge-2.11-to-2.12-apr-22Lukas Rytz2016-04-2516-35/+193
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Merge 2.11 to 2.12 apr 22
| * \ \ \ \ \ \ \ Merge commit '2dd311f' into merge-2.11-to-2.12-apr-22Lukas Rytz2016-04-220-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | CI: hardcode java path in integrate/windows scriptAdriaan Moors2016-04-211-5/+6
| | | | | | | | |
| | * | | | | | | Merge pull request #5113 from adriaanm/ci-win-java6Adriaan Moors2016-04-211-0/+3
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | CI: use java 6 for windows integration
| | | * | | | | | | CI: use java 6 for windows integrationAdriaan Moors2016-04-211-0/+3
| | |/ / / / / / /
| * | | | | | | | Merge commit '684c314' into merge-2.11-to-2.12-apr-22Lukas Rytz2016-04-227-6/+90
| |\| | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-28 18:54:44 +0000