summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* [SI-9664] - Updating README.md's IntelliJ version reference.JoeRatt2016-02-221-2/+2
|
* Merge pull request #4981 from retronym/topic/version-override-sbtStefan Zeiger2016-02-191-1/+3
|\ | | | | [sbt] Allow system properties to override entries in verions.props
| * [sbt] Allow system properties to override entries in verions.propsJason Zaugg2016-02-191-1/+3
|/
* Merge pull request #4967 from lrytz/smhasherUrlSeth Tisue2016-02-152-2/+2
|\ | | | | fix smhasher url
| * fix smhasher urlxuwei-k2016-02-152-2/+2
|/ | | | | google code is dead http://google-opensource.blogspot.jp/2015/03/farewell-to-google-code.html
* Merge pull request #4960 from janekdb/2.11.x-Scaladoc-ProductN-off-by-oneLukas Rytz2016-02-1523-24/+23
|\ | | | | Fix off-by-one documentation error in Product<N>
| * Fix off-by-one documentation error in Product<N>Janek Bogucki2016-02-1123-24/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sanity check: scala> case class P2(i: Int, j: Int) defined class P2 val p2 = P2(1, 3) p2.productElement(0) res0: Any = 1 p2.productElement(1) res1: Any = 3 p2.productElement(2) java.lang.IndexOutOfBoundsException: 2 at P2.productElement(<console>:10)
* | Merge pull request #4956 from retronym/topic/sbt-tweaks-4Seth Tisue2016-02-113-18/+17
|\ \ | |/ |/| Fix SBT tab completion of scala command
| * Fix SBT tab completion of scala commandJason Zaugg2016-02-113-18/+17
| | | | | | | | | | | | | | | | | | | | | | `scala -deprecation` (without a trailing script argument) wasn't allowed. Now it is. I also supported trailing whitespace on all commands. Also fixed: a bug with completion of `scalac ./san<TAB>`. It was completing as though the `./` had not been typed, which threw the suggestion off by a few characters.
* | Merge pull request #4954 from retronym/topic/fullnameLukas Rytz2016-02-101-13/+25
|\ \ | | | | | | Micro optimise Symbol#fullName
| * | Micro optimise Symbol#fullNameJason Zaugg2016-02-091-13/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old approach of recursively calling `fullNameAsName` creates a lot of garbage for intermediate results, in addition to needless interning of those results into the name table. This commit instead creates a string buffer of the correct capacity and writes the component names directly into this. I compared old and new approaches and this shows a 2x speedup. ``` scala> val th = ichi.bench.Thyme.warmed(verbose = print) th: ichi.bench.Thyme = ichi.bench.Thyme@1643e817 scala> val w_old = th.Warm(sym.fullNameAsNameOld('.')) w_old: th.Warm[$r.intp.global.Name] = ichi.bench.Thyme$Warm@7a8d001b scala> val w_new = th.Warm(sym.fullNameAsName('.')) w_new: th.Warm[$r.intp.global.Name] = ichi.bench.Thyme$Warm@1ec14586 scala> th.pbenchOffWarm("", x => println(x))(w_old, 10, "old")(w_new, 10, "new") Benchmark comparison (in 4.084 s) old vs new Significantly different (p ~= 0) Time ratio: 0.53572 95% CI 0.51618 - 0.55525 (n=20) old 64.54 ns 95% CI 62.41 ns - 66.67 ns new 34.57 ns 95% CI 34.04 ns - 35.11 ns res3: $r.intp.global.Name = scala.collection.parallel.mutable.ParSeq ``` It is still expensive enough that we should still consider caching. The call to full name in `classBTypeFromSymbol` in the new backed is a prime candidate for optimization.
* | | Merge pull request #4939 from szeiger/issue/9624Lukas Rytz2016-02-103-15/+25
|\ \ \ | | | | | | | | SI-9624 Improve documentation for TraversableOnce
| * | | SI-9624 Improve documentation for TraversableOnceStefan Zeiger2016-02-043-15/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Move the doc comment for `hasDefiniteSize` up from TraversableLike to GenTraversableOnce and improve it. - Add a note to `GenTraversableOnce.isEmpty` that implementations must not consume elements. - Clarify alternatives to subclassing TraversableOnce.
* | | | Merge pull request #4928 from szeiger/wip/document-e-ncLukas Rytz2016-02-102-1/+14
|\ \ \ \ | |_|_|/ |/| | | Document that `scala -e` starts/uses a compilation daemon
| * | | Document when the `scala` command starts/uses a compilation daemonStefan Zeiger2016-02-012-1/+14
| | | |
* | | | Merge pull request #4950 from retronym/topic/sbt-tweaks-3Seth Tisue2016-02-096-4/+421
|\ \ \ \ | |_|_|/ |/| | | SBT build improvements
| * | | Add SBT tab completion for scala{,c,doc}Jason Zaugg2016-02-094-18/+221
| | | | | | | | | | | | | | | | | | | | Also refactor the partest parser to use the improved tab completion for test paths.
| * | | Enable IntellIJ smarts while editing the buildJason Zaugg2016-02-072-1/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even though our build can't be imported into IntelliJ automatically, we don't need to live in the dark ages of red squigglies when editing build.sbt. This commit hand-crafts the module defintion for the project, which has SBT and its dependendencies on the classpath. A screenshot of the code assist is worth the thousand expletives I uttered while writing the pictured code without this facility: https://www.dropbox.com/s/6mxv0iwxkhvnor7/Screenshot%202016-02-07%2022.09.12.png?dl=0 To download the sources for the SBT JARs that are referenced herein, run sbt> reload plugins sbt> updateClassifiers
| * | | Add tab completion to the partest commandJason Zaugg2016-02-062-1/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can complete partest options (I've excluded some that aren't relevant in SBT), as well as test file names. If `--srcpath scaladoc` is included, completion of test paths will be based on `test/scaladoc` rather than the default `test/files`. Note that the `--srcpath` option is currently broken via scala partest interface, this change to scala-partest is needed to make it work: https://github.com/scala/scala-partest/pull/49 I've also hijacked the `--grep` option with logic in the SBT command itself, rather than passing this to `partest`. Just like `./bin/partest-ack`, this looks for either test file names or regex matches within the contents of test, check, or flag files. I tried for some time to make the tab completion of thousands of filenames more user friendly, but wasn't able to get something working. Ideally, it should only suggest to `test/files/{pos, neg, ...}` on the first <TAB>, and then offer files on another TAB. Files should also be offered if a full directory has been entered. Hopefully a SBT parser guru will step in and add some polish here.
| * | | Convenient aliases for the SBT buildJason Zaugg2016-02-051-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The idea here is to avoid the need for switching between the SBT shell and Bash. - Add aliases for partest, scala{,c,p,doc} - Change working directory for these forked processes to the root project base directory, rather than the subprojects base directory. This lets us use relative paths to files in a more familar way. - Don't log the output of forked processes with the `[info] ` prefix, rather pass it through directly to stdout. Demo: ``` > partest --terse test/files/pos/t6231.scala [info] Packaging /Users/jason/code/scala2/build-sbt/pack/lib/scala-partest-javaagent.jar ... [info] Done packaging. Selected 1 tests drawn from specified tests . [info] Passed: Total 1, Failed 0, Errors 0, Passed 1 [success] Total time: 3 s, completed 05/02/2016 12:44:19 PM > scala sandbox/test.scala [info] Running scala.tools.nsc.MainGenericRunner -usejavacp sandbox/test.scala Hello, World! [success] Total time: 4 s, completed 05/02/2016 12:45:08 PM > scalac sandbox/test.scala [info] Running scala.tools.nsc.Main -usejavacp sandbox/test.scala [success] Total time: 3 s, completed 05/02/2016 12:45:15 PM > scala Test [info] Running scala.tools.nsc.MainGenericRunner -usejavacp Test Hello, World! [success] Total time: 1 s, completed 05/02/2016 12:45:20 PM > scala [info] Running scala.tools.nsc.MainGenericRunner -usejavacp Welcome to Scala 2.11.8-20160204-090931-42525ec (Java HotSpot(TM) 64-Bit Server VM, Java 1.8.0_71). Type in expressions for evaluation. Or try :help. scala> 1.to to toBinaryString toByte toChar toDegrees toDouble toFloat toHexString toInt toLong toOctalString toRadians toShort toString scala> 1.toString res0: String = 1 scala> :quit [success] Total time: 8 s, completed 05/02/2016 12:45:48 PM > ```
* | | | Merge pull request #4937 from szeiger/issue/9623-2.11Seth Tisue2016-02-082-6/+73
|\ \ \ \ | |/ / / |/| | | SI-9623 Avoid unnecessary hasNext calls in JoinIterator & ConcatIterator
| * | | SI-9623 Avoid unnecessary hasNext calls in JoinIterator & ConcatIteratorStefan Zeiger2016-02-012-6/+73
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These iterator implementations are used to concatenate two (JoinIterator) or more (ConcatIterator) other iterators with `++`. They used to perform many unnecessary calls to the child iterators’ `hasNext` methods. This improved state machine-based implementation reduces that number to the bare minimum, i.e. iterating over concatenated iterators with `foreach` calls the children's `hasNext` methods a total of (number of children) + (number of elements) times, the same as when iterating over all children separately.
* | | Merge pull request #4942 from SethTisue/copyright-2016Seth Tisue2016-02-047-9/+9
|\ \ \ | |_|/ |/| | bump copyright year to 2016
| * | bump copyright year to 2016Seth Tisue2016-02-037-9/+9
|/ /
* | Merge pull request #4927 from szeiger/issue/9572Jason Zaugg2016-02-015-35/+71
|\ \ | | | | | | SI-9572 Check for illegal tuple sizes in the parser
| * | SI-9572 Check for illegal tuple sizes in the parserStefan Zeiger2016-01-285-35/+71
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds explicit checks with syntax errors for tuple literals and types of more than 22 elements. An alternative approach to fixing SI-9572 would be to revert to the old failure mode of Scala 2.10 where references to arbitrary `scala.TupleXY` would be generated in the parser, which then leads to “type/object not found” errors in the typechecker. This fix here is more intrusive but arguably provides a better user experience. Methods `stripParens` and `makeBinop` are moved from `TreeBuilder` to `Parsers` because they can now generate syntax errors. New methods `makeSafeTupleType` and `makeSafeTupleTerm` implement the error checking on top of `makeTupleType` and `makeTupleTerm`. They are overridden with no-op versions in the quasiquotes parser because it also overrides `makeTupleType` and `makeTupleTerm` in a way that supports arbitrary tuple sizes.
* | Merge pull request #4922 from SethTisue/fix-cla-linksJason Zaugg2016-02-012-2/+2
|\ \ | | | | | | fix broken links to Scala CLA
| * | fix broken links to Scala CLASeth Tisue2016-01-272-2/+2
| | |
* | | Merge pull request #4921 from szeiger/issue/9534Jason Zaugg2016-02-012-1/+14
|\ \ \ | | | | | | | | SI-9534 Use BoxedUnit in all cases for creating Array[Unit]
| * | | SI-9534 Use BoxedUnit in all cases for creating Array[Unit]Stefan Zeiger2016-01-272-1/+14
| | |/ | |/| | | | | | | | | | | | | | | | | | | Calling `wrap` or one of the higher-dimension Array factory methods on the `Manifest` for `Unit` led to an exception because it tried to use `void` as a primitive type. Unlike all other primitive Scala types, `Unit` needs to be boxed. The basic `newArray` method was not affected by this bug because it was already special-cased. The fix is to also special-case `arrayClass`.
* | | Merge pull request #4932 from SethTisue/readme-tweakSeth Tisue2016-01-291-1/+1
|\ \ \ | | | | | | | | tweak my own entry in the readme
| * | | tweak my own entry in the readmeSeth Tisue2016-01-291-1/+1
|/ / /
* | | Merge pull request #4884 from szeiger/wip/sbt-pr-validationSeth Tisue2016-01-297-68/+121
|\ \ \ | |/ / |/| | sbt-based PR validation job
| * | Use sbt for PR validation builds.Stefan Zeiger2016-01-127-68/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Improve version handling in the sbt build: The new settings `baseVersion` and `baseVersionSuffix` make it easier to set version numbers for different kinds of builds in a consistent way without e.g. having to first get a git SHA outside of sbt. The new task `generateBuildCharacterPropertiesFile` writes the file `buildcharacter.properties` to the root dir. The format is compatible with the same file produced by the ANT build but it only contains a subset of the properties, in particular the Maven version, which is needed in publishing scripts and passed around between different Jenkins jobs as `jenkins.properties`. SHAs in version numbers are consistently shortened to 7 digits (as used by git and github). Previously we used 7 digits in Maven snapshot version numbers but 10 digits in canonical and OSGi version numbers. # Add Jenkins script support to the sbt build: The new command `setupPublishCore` takes the PR validation snapshot repository as an argument and changes the required settings for the `publish-core` build (use SHA-SNAPSHOT versioning, compile with optimization enabled, do not publish scaladoc sets) For example, the following command can be used to generate `buildcharacter.properties` with the version numbers needed for PR validation builds: sbt setupPublishCore dummy generateBuildCharacterPropertiesFile The sbt build will now automatically detect and use a “~/.credentials” file with the credentials for publishing to a remote repository. # Call sbt from `publish-core`: The correct`$SBT_CMD` is set directly in `bootstrap` and used by `publish-core` to first generate `buildcharacter.properties` and then build and publish. Parsing the git revision, computing a version number and getting binary dependencies are no longer required in the script. This is all done in the sbt build.
* | | Merge pull request #4891 from janekdb/2.11.x-CommentFactoryBase-mix-1Lukas Rytz2016-01-263-18/+85
|\ \ \ | | | | | | | | Trim complexity in CommentFactoryBase
| * | | Trim complexity in CommentFactoryBaseJanek Bogucki2016-01-253-18/+85
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | 1. Replace option handling with library call 2. Remove NumberFormatException catch presumed to be copy/paste legacy 3. It's Scaladoc 4. Parse trailing whitespace regex once instead of per line 5. Use string interpolation where it improves readability 6. Add missed alternative to block grammar production rule 7. Add regression test for tag requirement warnings
* | | Merge pull request #4913 from szeiger/wip/sbt-windows-fixesLukas Rytz2016-01-263-12/+20
|\ \ \ | | | | | | | | Some fixes for the sbt build on Windows
| * | | Improved EOL handling for scripts generated by the sbt buildStefan Zeiger2016-01-251-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We now normalize EOLs in `ScalaTool` to LF when reading the templates, and write them as CRLF or LF depending on the target platform. This allows the script templates to be stored locally with either LF or CRLF line endings (which can both happen, depending on the platform and git configuration).
| * | | Use portable Java APIs instead of calling chmod from sbtStefan Zeiger2016-01-251-3/+4
| | | | | | | | | | | | | | | | | | | | Instead of waiting for a Java-8-only build to use `Files.setPosixPermissions()` we can call `setExecutable` and `setReadable`, both of which are available on Java 6.
| * | | Use Windows classpath in sh scripts when building in sbt on WindowsStefan Zeiger2016-01-211-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The generated scripts for "quick" are not portable anyway (neither in the sbt build nor in the ant build) because they contain absolute paths. When using the sh versions on Windows in MSYS or Cygwin, the classpath must be in Windows format because "java" expects it that way. Note that none of this applies to "pack" (and thus to distribution builds) where the classpath is constructed dynamically by the launcher scripts itself.
| * | | Normalize Windows paths when calling JarJar from the sbt buildStefan Zeiger2016-01-141-2/+2
| | | |
* | | | Merge pull request #4918 from raboof/patch-1Lukas Rytz2016-01-251-0/+2
|\ \ \ \ | |_|/ / |/| | | Link 'Future' scaladoc to 'Futures and Promises'
| * | | Link 'Future' scaladoc to 'Futures and Promises'Arnout Engelen2016-01-251-0/+2
|/ / /
* | | Merge pull request #4899 from som-snytt/issue/9616Jason Zaugg2016-01-194-24/+96
|\ \ \ | | | | | | | | [backport] SI-9616 False positive in unused import warning
| * | | [backport] SI-9616 False positive in unused import warningSom Snytt2016-01-074-24/+96
| | | | | | | | | | | | | | | | This is a minimal backport of the fix for SI-9383.
* | | | Merge pull request #4905 from SethTisue/disable-flaky-prezzy-test-on-windowsJason Zaugg2016-01-181-0/+6
|\ \ \ \ | | | | | | | | | | disable flaky presentation compiler test on Windows
| * | | | disable flaky presentation compiler test on WindowsSeth Tisue2016-01-151-0/+6
| | |/ / | |/| | | | | | | | | | see https://github.com/scala/scala-dev/issues/72 for details
* | | | Merge pull request #4910 from grimreaper/eax/spelling/earlytheJason Zaugg2016-01-1810-13/+13
|\ \ \ \ | |/ / / |/| | | Fix some simple extra words
| * | | Fix some simple extra wordsEitan Adler2016-01-1710-13/+13
|/ / / | | | | | | | | | The the word 'the' is often used twice. Fix that.
* | | Merge pull request #4886 from janekdb/2.11.x-scaladoc-Duration-linksSeth Tisue2016-01-141-2/+2
|\ \ \ | | | | | | | | Fix Scaladoc overloaded method link to Duration companion object
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-01 06:00:05 +0000