summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | SI-8787 Update doc for RegexSom Snytt2014-08-101-134/+175
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify the exposition and update the examples. Emphasize pattern matching, especially using `r.unanchored` instead of `for (r(x,y,z) <- r findFirstIn text)`. Certain details are moved to method docs. It would be nice to fix matching package doc, but the doc must attach to the package object, it seems. Introducing a package object is not binary-compatible. Includes a doc line edit on 2.12, anticipating the merge.
| * | | | | SI-8787 If you love nulls, so does RegexSom Snytt2014-08-082-10/+28
| | | | | | | | | | | | | | | | | | | | | | | | Regex is robust when unapplying null. A null never matches.
* | | | | | Merge pull request #3909 from som-snytt/issue/8512Grzegorz Kossakowski2014-08-196-4/+40
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | SI-8512 Infer a type for f"$args"
| * | | | | SI-8512 Infer Any for the qSom Snytt2014-08-123-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid the widening bug for q. This resolution also suffers from the inference of Any, which can trigger a warning and an anxiety attack. But that's still better than doing the wrong thing. Right?
| * | | | | SI-8512 Infer a type for f"$args"Som Snytt2014-08-123-2/+15
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The f-interpolator gets a type param that better be Any to avoid unfortunate widenings. Hey, it worked! Unfortunately, when `Any` is inferred, `-Xlint:infer-any` takes notice. This is probably a greater problem for the f-interpolator than for quasiquotes, which are a more specialized tool.
* | | | | Merge pull request #3927 from lrytz/innerClassesTestLukas Rytz2014-08-123-0/+310
|\ \ \ \ \ | | | | | | | | | | | | test for InnerClass and EnclosingMethod attributes
| * | | | | test for InnerClass and EnclosingMethod attributesLukas Rytz2014-08-123-0/+310
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Some parts of the test assert (current) buggy behavior. This is marked in the test file with TODO. It will be fixed in later work on the backend.
* | | | | Merge pull request #3907 from gourlaysama/wip/proxyLukas Rytz2014-08-124-0/+4
|\ \ \ \ \ | | | | | | | | | | | | a few missing deprecations in proxy collections.
| * | | | | a few missing deprecations in proxy collections.Antoine Gourlay2014-07-314-0/+4
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | SeqProxy was properly deprecated, so were the CollProxyLike classes, and the ones in collection.immutable, but these four somehow survived the Big Proxy Deprecation (tm).
* | | | | Merge pull request #3902 from gourlaysama/wip/t4563Lukas Rytz2014-08-1280-81/+89
|\ \ \ \ \ | | | | | | | | | | | | SI-4563 friendlier behavior for Ctrl+D in the REPL
| * | | | | SI-4563 friendlier behavior for Ctrl+D in the REPLAntoine Gourlay2014-07-2980-81/+89
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closing the REPL with Ctrl+D does not issue a newline, so the user's prompt displays on the same line as the `scala>` prompt. This is bad. We now force a newline before closing the interpreter, and display `:quit` while we're at it so that people know how to exit the REPL (since `exit` doesn't exist anymore). The tricky part was to only add a newline when the console is interrupted, and *not* when it is closed by a command (like `:quit`), since commands are processed after their text (including newline) has been sent to the console.
* | | | | Merge pull request #3889 from som-snytt/issue/6476-altLukas Rytz2014-08-126-77/+75
|\ \ \ \ \ | |_|/ / / |/| | | | SI-6476 Improve error on escapement
| * | | | SI-6476 Unitize ALL the procedures!Som Snytt2014-07-192-27/+26
| | | | |
| * | | | SI-6476 Unitize procedures, readabilitySom Snytt2014-07-192-28/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Strictly trivial updates for readability. I used to prefer procedure syntax, but since it was scheduled for removal, I can't scan a def without an equals sign.
| * | | | SI-6476 DocumentationSom Snytt2014-07-183-18/+16
| | | | | | | | | | | | | | | | | | | | And adjust the test.
| * | | | SI-6476 Improve error on escapementSom Snytt2014-07-182-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Behavior of escape processing under string interpolation can be confusing. This commit improves the exception message so you know at least what sort of escapes are handled. This came up on SO in the form `s"\d".r`, where it may not be obvious what is throwing and how to work around it. ``` scala> s"\d".r scala.StringContext$InvalidEscapeException: invalid escape '\d' not one of [\b, \t, \n, \f, \r, \\, \", \'] at index 0 in "\d". Use \\ for literal \. scala> s"a\" scala.StringContext$InvalidEscapeException: invalid escape at terminal index 1 in "a\". Use \\ for literal \. ``` Referencing SI-6476 because that has become the magnet ticket for "escape processing under string interpolation, huh?" This doesn't address `$"` and doesn't handle the more interesting parse error `s"a\"b"`.
| | | | * [backport] Rewrite explanation of doc-source-url option more clearly, and ↵Masato Sogame2014-08-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix encoding to show euro-sign correctly. (cherry picked from commit 13054daa658484df30b71447dbe684f475537252)
| | | | * [backport] Update javadoc tag to new scaladoc tags.Masato Sogame2014-08-113-12/+20
| | | | | | | | | | | | | | | | | | | | (cherry picked from commit 68b16a0992877b4ebbb7c967804edbb72c05ceb5)
| | | | * [backport] Fixes cut sentences in the generated scaladocsDominik Gruntz2014-08-1111-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit changes all first sentences of library functions which contain `i.e.` or `e.g.` and adds a `,` to prevent that the scaladoc summary sentence is cut after this abbreviation. This is possible as pull/3824 fixed how Scaladoc parses the first sentence of a method description into a sumary sentence(now the first sentence has to end with a dot followed by whitespace). Only docs in the core library are changed (src/library/**/*.scala) and only if they occur in the first sentence. Review by @heathermiller (cherry picked from commit 72721ff5dd06dea1235ecb71acae0bd61aee4814)
| | | | * [backport] Refactored example to Option.collect method.jxcoder2014-08-111-3/+3
| | | | | | | | | | | | | | | | | | | | (cherry picked from commit 7cca7635b392cb533d0f8e26b74d7362c0dd3891)
| | | | * [backport] Fixed mathematically wrong statement in the documentation of ↵Malte Isberner2014-08-111-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scala.math.PartialOrdering. - Previous (misleading) documentation suggested that a partial ordering *is* an equivalence relation. This has now been clarified. - Existing documentation on properties of partial orderings (reflexive, transitive, antisymmetric) had several formatting inconsistencies that have now been remove. (cherry picked from commit 528df5becee03175e7462b64d7c22460cc5992f7)
| | | | * [backport] Fix scaladoc typoLukas Elmer2014-08-111-1/+1
| | | | | | | | | | | | | | | | | | | | (cherry picked from commit 0a1694d8048f01b7f0812cedaa341813e9044e7f)
| | | | * [backport] Did not know of the fix for SI-8672. Followed the recommendation ↵Dominik Gruntz2014-08-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | given by som-snytt. (cherry picked from commit ec4abf5483e890976ae460252e80a66a95674e61)
| | | | * [backport] Fixes first sentence delimitersdgruntz2014-08-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scaladoc places the first sentence in the method summary table and index. The first sentence is defined as the sequence of chars up to the first period (not as in JavaDoc where the sentence ends with the first period *followed by a blank*). As a consequence, the clause starting with `i.e.` is interpreted as sentende delimiter. This request replaces `i.e.` with `i&period;e&period;`. Alghough a valid HTML code, I do not know whether this change is compatible with other tools. And I assume that this is not the only source file affected. (cherry picked from commit c2e4da674d8c40e2d220854a966b0510fb6d459e)
| | | | * [backport] [scaladoc] Changed align of example code to Option.contains and ↵Maks Atygaev2014-08-111-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Option.collect methods. (cherry picked from commit e3311073bbad6f6f0dfdd3ea09628d324b4b3614)
| | | | * [backport] SI-8705 Added example to Option.contains method.jxcoder2014-08-111-0/+11
| | | | | | | | | | | | | | | | | | | | (cherry picked from commit 1e2a21681a4a55469faa59b07473a3b269e70258)
| | | | * [backport] Added example to Option.collect method.jxcoder2014-08-111-0/+11
| | | | | | | | | | | | | | | | | | | | (cherry picked from commit 6c698089aeb55e649a65dd7ae1bce2b4514ee865)
| | | | * [backport] Change StringContext scaladocEvgeny Vereshchagin2014-08-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See e2a3498 commit message for explanation Explicit private declaration better than implicit Thanks to @som-snytt (cherry picked from commit d071abe8dd9035d8dd246ecb6b207e584b6437fa)
| | | | * [backport] som-snytt's update to wordingMax Bileschi2014-08-111-3/+3
| | | | | | | | | | | | | | | | | | | | (cherry picked from commit 80a9e908fd7b591a6fe452d908407d537675a999)
| | | | * [backport] Revised comment to appeal to lchoran's and som-snytts commentsMax Bileschi2014-08-111-5/+4
| | | | | | | | | | | | | | | | | | | | (cherry picked from commit 71bc2e5f4c49463a754a6f23e3abd2d27467fca4)
| | | | * [backport] Update PartialFunction documentation to include the fact that the ↵Max Bileschi2014-08-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | caller is responsible for checking 'isDefinedAt' (cherry picked from commit 455bcd65c055119f928b3367839f0093cf0e251a)
| | | | * [backport] Update PartialFunction documentation to include the fact that the ↵Max Bileschi2014-08-111-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | caller is responsible for checking 'isDefinedAt' (cherry picked from commit f7d2cec3a0c31836747a25e3cc5949d1f3cbdff4)
| | | | * [backport] Make comment consistent with codeEvgeny Vereshchagin2014-08-111-1/+1
| | | | | | | | | | | | | | | | | | | | (cherry picked from commit fd001811c662f6daecf91319b36c1ad14a87ff72)
| | | | * [backport] Update AnyVals.scalaharryhuk2014-08-111-2/+2
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | Corrected api doc for >> operator to say it bit-shifts right rather than left, and fills the left bits rather than the right bit (cherry picked from commit 17b99e2587251cdb02e9d96fc2f87143be3160b8)
* | | | Merge pull request #3914 from som-snytt/issue/orphan-checkGrzegorz Kossakowski2014-08-071-1/+0
|\ \ \ \ | | | | | | | | | | Orphan check file
| * | | | Orphan check fileSom Snytt2014-08-031-1/+0
| | |/ / | |/| | | | | | | | | | | | | | | | | | Orphaned by the override check reversion that deleted the test source. 2524fdde3edc7b668fdb4bf68e990141d3ec18d6
* | | | Merge pull request #3921 from gourlaysama/goodbye-jlineGrzegorz Kossakowski2014-08-0754-7654/+0
|\ \ \ \ | | | | | | | | | | remove jline sources from src/ now that we use a released jline.
| * | | | remove jline sources from src/ now that we use a released jline.Antoine Gourlay2014-08-0754-7654/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | We don't need those, right? We don't even build that folder anymore (since 1b0fa91), it is just dead code.
* | | | Merge pull request #3916 from retronym/ticket/8781Grzegorz Kossakowski2014-08-074-1/+23
|\ \ \ \ | |/ / / |/| | | SI-8781 Avoid double-expansion under -Ymacro-expand:discard
| * | | SI-8781 Avoid double-expansion under -Ymacro-expand:discardJason Zaugg2014-08-064-1/+23
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This mode of macro expansion is used by the presentation compiler to leave the original macro applications ("expandees") in the type checked trees, annotated with the types of the expansions. However, under some circumstances involving implicits, we would re-expand the macro. If the macro wasn't stable, this could lead to a type mismatch. The originally reported problem was with the shapeless `mkSingletonOps` macro. Its expansion had the type of a freshly-named class local to the expansion. Upon the re-expansion, a new class was generated, which lead to errors like: client/Client.scala:4: error: type mismatch; found : fresh$macro$2 required: fresh$macro$1 This commit suppressed re-expansion of the expandee by use of the existing, tree attachment driven mechanism.
* | | Merge pull request #3895 from lrytz/jline-updateGrzegorz Kossakowski2014-07-251-0/+2
|\ \ \ | | | | | | | | Also update jline.version when update.versions is set during build
| * | | Also update jline.version when update.versions is set during buildLukas Rytz2014-07-221-0/+2
| | | |
* | | | Merge pull request #3894 from adriaanm/depmsgGrzegorz Kossakowski2014-07-256-21/+25
|\ \ \ \ | | | | | | | | | | Better error message than 'bad symbolic reference'.
| * | | | Better error message than 'bad symbolic reference'.Adriaan Moors2014-07-226-21/+25
| |/ / / | | | | | | | | | | | | | | | | | | | | Let's not scare people, and try to give them some advice. PS: we should really come up with a better mechanism for testing errors/warnings
* | | | Merge pull request #3897 from lrytz/2.11.2-bumpGrzegorz Kossakowski2014-07-252-7/+7
|\ \ \ \ | | | | | | | | | | Bump versions for Scala 2.11.2
| * | | | Bump versions for Scala 2.11.2Lukas Rytz2014-07-232-7/+7
| |/ / /
* | | | Merge pull request #3890 from dhgarrette/2.11.xGrzegorz Kossakowski2014-07-251-3/+1
|\ \ \ \ | | | | | | | | | | Remove "throws InvalidEscapeException" from StringContext.raw doc
| * | | | Fixed incorrect example in StringContext.raw docDan Garrette2014-07-211-1/+1
| | | | | | | | | | | | | | | As pointed out by @som-snytt, \u0023 is #, not \u0025.
| * | | | Remove "throws InvalidEscapeException" from StringContext.raw docDan Garrette2014-07-211-2/+0
| |/ / / | | | | | | | | Since StringContext.raw doesn't escape its input, it does not call `treatEscapes` and cannot throw the InvalidEscapeException.
* | | | Merge pull request #3884 from mpociecha/remove-invalidation-from-globalGrzegorz Kossakowski2014-07-252-238/+0
|\ \ \ \ | | | | | | | | | | Remove invalidation from Global.scala