summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3928 from kzys/dup-html-idsGrzegorz Kossakowski2014-09-024-24/+35
|\ | | | | Scaladoc: the value of an id attribute must be unique within a document
| * Scaladoc: the value of an id attribute must be unique within a documentKato Kazuyoshi2014-08-134-24/+35
| | | | | | | | The value of an id attribute must be unique, according to HTML spec.
* | Merge pull request #3920 from rubyu/issue/7350Grzegorz Kossakowski2014-09-014-73/+391
|\ \ | | | | | | SI-7350 Prevent resource leaks in PipedProcesses.runAndExitValue()
| * | Translate to jUnit test casesrubyu2014-08-263-345/+298
| | |
| * | SI-7350 Prevent resource leaks in PipedProcesses.runAndExitValue()rubyu2014-08-075-73/+438
| | |
* | | Merge pull request #3924 from denisrosset/2.12.xGrzegorz Kossakowski2014-08-191-1/+1
|\ \ \ | | | | | | | | mutable.LongMap.fromZip takes collection.Iterable
| * | | mutable.LongMap.fromZip takes collection.IterableDenis Rosset2014-08-101-1/+1
| | |/ | |/| | | | The type should be qualified as collection.Iterable, because Iterable is that context is mutable.Iterable.
* | | Merge pull request #3900 from kzys/jira-7905Lukas Rytz2014-08-122-0/+37
|\ \ \ | |/ / |/| | Prevent SI-7905 by adding a test just in case
| * | Prevent SI-7905 by adding a testKato Kazuyoshi2014-07-312-0/+37
| |/ | | | | | | The original issue was fixed already. This test is just for make sure.
* | Merge pull request #3918 from dgruntz/doc/firstSentenceFixesGrzegorz Kossakowski2014-08-0711-18/+18
|\ \ | | | | | | Fixes cut sentences in the generated scaladocs
| * | Fixes cut sentences in the generated scaladocsDominik Gruntz2014-08-0611-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
* | Merge pull request #3898 from adriaanm/jxcoder-issue-3861Grzegorz Kossakowski2014-08-071-3/+3
|\ \ | |/ |/| Refactored example to Option.collect method.
| * Refactored example to Option.collect method.jxcoder2014-07-251-3/+3
| |
* | Merge pull request #3892 from misberner/docfix-PartialOrderingGrzegorz Kossakowski2014-07-251-5/+12
|\ \ | |/ |/| Fixed error in the documentation of scala.math.PartialOrdering
| * Fixed mathematically wrong statement in the documentation of ↵Malte Isberner2014-07-211-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.
* | Merge pull request #3822 from ↵Grzegorz Kossakowski2014-07-251-0/+5
|\ \ | | | | | | | | | | | | mlbileschi/mlbileschi-updatePartialFunctionDocumentation Mlbileschi update partial function documentation
| * | som-snytt's update to wordingMax Bileschi2014-07-081-3/+3
| | |
| * | Revised comment to appeal to lchoran's and som-snytts commentsMax Bileschi2014-06-271-5/+4
| | |
| * | Update PartialFunction documentation to include the fact that the caller is ↵Max Bileschi2014-06-121-1/+1
| | | | | | | | | | | | responsible for checking 'isDefinedAt'
| * | Update PartialFunction documentation to include the fact that the caller is ↵Max Bileschi2014-06-121-1/+7
| | | | | | | | | | | | responsible for checking 'isDefinedAt'
* | | Merge pull request #3881 from pocket7878/issue/6144Grzegorz Kossakowski2014-07-253-12/+20
|\ \ \ | | | | | | | | Update javadoc tag to new scaladoc tags.
| * | | Update javadoc tag to new scaladoc tags.Masato Sogame2014-07-153-12/+20
| | | |
* | | | Merge pull request #3880 from dgruntz/patch-1Grzegorz Kossakowski2014-07-251-2/+2
|\ \ \ \ | | | | | | | | | | Fixes first sentence delimiters
| * | | | Did not know of the fix for SI-8672. Followed the recommendation given by ↵Dominik Gruntz2014-07-151-2/+2
| | | | | | | | | | | | | | | | | | | | som-snytt.
| * | | | Fixes first sentence delimitersdgruntz2014-07-151-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.e.`. 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.
* | | | Merge pull request #3891 from lukaselmer/fix-scaladoc-typoGrzegorz Kossakowski2014-07-251-1/+1
|\ \ \ \ | |_|_|/ |/| | | Fix scaladoc typo
| * | | Fix scaladoc typoLukas Elmer2014-07-211-1/+1
|/ / /
* | | Merge pull request #3877 from retronym/merge/2.11.x-to-2.12.x-20140714Jason Zaugg2014-07-18120-611/+1121
|\ \ \ | | | | | | | | Merge 2.11.x to 2.12.x
| * \ \ Merge remote-tracking branch 'origin/2.11.x' into ↵Jason Zaugg2014-07-14120-611/+1121
| |\ \ \ | | |/ / | |/| | | | | | merge/2.11.x-to-2.12.x-20140714
| | * | Merge pull request #3867 from lrytz/t8708Lukas Rytz2014-07-0911-6/+122
| | |\ \ | | | | | | | | | | SI-8708 Fix pickling of LOCAL_CHILD child of sealed classes
| | | * | SI-8708 Fix pickling of LOCAL_CHILD child of sealed classesLukas Rytz2014-07-0711-6/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a sealed class or trait has local children, they are not pickled in as part of the children of the symbol (introduced in 12a2b3b to fix Aladdin bug 1055). Instead the compiler adds a single child class named LOCAL_CHILD. The parents of its ClassInfoType were wrong: the first parent should be a class. For sealed traits, we were using the trait itself. Also, the LOCAL_CHILD dummy class was entered as a member of its enclosing class, which is wrong: it represents a local (non-member) class, and it's a synthetic dummy anyway.
| | * | | Merge pull request #3866 from Blaisorblade/issue/8677-backportLukas Rytz2014-07-092-1/+6
| | |\ \ \ | | | | | | | | | | | | SI-8677 Duration: Zero - Inf should be MinusInf
| | | * | | [backport] SI-8677 Duration: Zero - Inf should be MinusInfPaolo G. Giarrusso2014-07-042-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #8677. Add basic tests. This is a backport from 2.12.x of dead39dc5f21c6eac41788e93426c50ddd398c24.
| | * | | | Merge pull request #3868 from adriaanm/report-filterAdriaan Moors2014-07-081-0/+13
| | |\ \ \ \ | | | | | | | | | | | | | | Restore reporter forwarders in CompilationUnit
| | | * | | | Restore reporter forwarders in CompilationUnitAdriaan Moors2014-07-081-0/+13
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deprecate them so that we can remove them in a couple of 2.11.x releases. Plenty of plugins were probably using `unit.error` et al. The continuations plugin was, for one (remedying this with pending PR).
| | * | | | Merge pull request #3820 from adriaanm/report-filterAdriaan Moors2014-07-0686-469/+651
| | |\ \ \ \ | | | | | | | | | | | | | | refactor error/warning reporting
| | | * | | | Use countElementsAsString for summarized warnings.Adriaan Moors2014-07-0420-23/+23
| | | | | | |
| | | * | | | Encapsulate deprecation warning message synthesis.Adriaan Moors2014-07-044-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both refchecks and typer constructed the same message. But different. Now with more DRYness. Note that no check files had to be updated (disconcerting)...
| | | * | | | Remove deprecationWarning, currentReporting from ReportingAdriaan Moors2014-07-047-33/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves us a bit closer to the goal of having a single entry point to reporting. Must modularize Reporting a bit so it can be used in Variances (need a reference to `currentRun` in `reflect.internal.Reporting`).
| | | * | | | Rip out reporting indirection from CompilationUnitAdriaan Moors2014-07-0444-175/+152
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inline the forwarders from CompilationUnit, which should not affect behavior. Since all forwarders lead to global.reporter, don't first navigate to a compilation unit, only to then forward back to global.reporter. The cleanup in the previous commits revealed a ton of confusion regarding how to report an error. This was a mechanical search/replace, which has low potential for messing things up, since the list of available methods are disjoint between `reporter` and `currentRun.reporting`. The changes involving `typer.context` were done previously. Essentially, there are three ways to report: - via typer.context, so that reporting can be silenced (buffered) - via global.currentRun.reporting, which summarizes (e.g., deprecation) - via global.reporter, which is (mostly) stateless and straightforward. Ideally, these should all just go through `global.currentRun.reporting`, with the typing context changing that reporter to buffer where necessary. After the refactor, these are the ways in which we report (outside of typer): - reporter.comment - reporter.echo - reporter.error - reporter.warning - currentRun.reporting.deprecationWarning - currentRun.reporting.incompleteHandled - currentRun.reporting.incompleteInputError - currentRun.reporting.inlinerWarning - currentRun.reporting.uncheckedWarning Before: - c.cunit.error - c.enclosingUnit.deprecationWarning - context.unit.error - context.unit.warning - csymCompUnit.warning - cunit.error - cunit.warning - currentClass.cunit.warning - currentIClazz.cunit.inlinerWarning - currentRun.currentUnit.error - currentRun.reporting - currentUnit.deprecationWarning - currentUnit.error - currentUnit.warning - getContext.unit.warning - getCurrentCUnit.error - global.currentUnit.uncheckedWarning - global.currentUnit.warning - global.reporter - icls.cunit.warning - item.cunit.warning - reporter.comment - reporter.echo - reporter.error - reporter.warning - reporting.deprecationWarning - reporting.incompleteHandled - reporting.incompleteInputError - reporting.inlinerWarning - reporting.uncheckedWarning - typer.context.unit.warning - unit.deprecationWarning - unit.echo - unit.error - unit.incompleteHandled - unit.incompleteInputError - unit.uncheckedWarning - unit.warning - v1.cunit.warning All these methods ended up calling a method on `global.reporter` or on `global.currentRun.reporting` (their interfaces are disjoint). Also clean up `TypeDiagnostics`: inline nearly-single-use private methods.
| | | * | | | Route type checker reporting through contextAdriaan Moors2014-07-044-28/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Continue the work started in SI-8450 (no "implicit numeric widening" warning in silent mode), which was caused by going straight to the reporter instead of using the context for type error reporting (which buffers in silent mode). Ideally, this mistake should not be possible: typer should change the current reporter to buffer where appropriate.
| | | * | | | Track symbol that caused a deprecation warning.Adriaan Moors2014-07-048-22/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So that we can filter deprecations based on defining package. Configurable error reporting will support a rule like: "In compilation unit X, escalate deprecation warnings that result from accessing members in package P that have been deprecated since version V. Report an error instead of a warning for those." TODO: remove deprecationWarning overload that doesn't take a `Symbol`? (Replace by a default value of `NoSymbol` for the deprecated symbol arg?)
| | | * | | | Uniformly route reporting through reporter.Adriaan Moors2014-07-047-58/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sharpen interfaces, reduce footprint of Reporting trait. Ideally, all reporting should indirect through reporter, and the `Reporting` trait itself should be restricted to a single method that retrieves the current `reporter`. Pull up some more reporting to reflect.internal. Would like to do more, but need to move partest to the reflect.internal interface first. (Its `errorCount` relies on `ERROR.count` in `tools.nsc.Reporter`.)
| | | * | | | Move reporting logic into Reporting traitAdriaan Moors2014-07-0420-193/+268
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move code from Global/SymbolTable to separate Reporting traits to start carving out an interface in scala.reflect.internal.Reporting, with internals in scala.tools.nsc. Reporting is mixed into the cake. It contains a nested class PerRunReporting. Should do the same for debugging/logging. The idea is that CompilationUnit and Global forward all reporting to Reporter. The Reporting trait contains these forwarders, and PerRunReporting, which accumulates warning state during a run. In the process, I slightly changed the behavior of `globalError` in reflect.internal.SymbolTable: it used to abort, weirdly. I assume that was dummy behavior to avoid introducing an abstract method. It's immediately overridden in Global, and I couldn't find any other subclasses, so I don't think the behavior in SymbolTable was ever observed. Provide necessary hooks for scala.reflect.macros.Parsers#parse. See scala/reflect/macros/contexts/Parsers.scala's parse method, which overrides the reporter to detect when parsing goes wrong. This should be refactored, but that goes beyond the scope of this PR. Don't pop empty macro context stack. (Ran into this while reworking -Xfatal-warnings logic.) Fix -Xfatal-warnings behavior (and check files): it wasn't meant to influence warning reporting, except for emitting one final error; if necessary to fail the compile (when warnings but no errors were reported). Warnings should stay warnings. This was refactored in fbbbb22946, but we soon seem to have relapsed. An hour of gitfu did not lead to where it went wrong. Must've been a merge.
| | | * | | | Pure refactor: reorder definitionsAdriaan Moors2014-07-041-23/+32
| | | | | | |
| | | * | | | Unclutter Reporter. Move truncation to ReplReporter.Adriaan Moors2014-07-0411-62/+77
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor to reduce the Reporter interface. Working towards minimal interfaces in scala.reflect.internal that can be consumed by sbt/IDE/.... The scala.tools.nsc package is entirely private to the compiler (in principle). A `Reporter` should only be used to inform (info/warning/error). No state. Ideally, we'd move to having only one reporter, whose lifetime is adjusted appropriately (from per-run in general to per-context for type checking, so errors can be buffered -- "silenced" -- during nested type checking calls). Start the clean up by moving truncation to the REPL, since it's not relevant for regular reporting. Perversely, we were checking truncation all the time, even though it's only on during a repl run. (Truncation is now always turned off in the repl under -verbose.) Untangle error resetting on symbols from error reporting (reportAdditionalErrors). This fixes a nice&subtle bug that caused feature warnings to be suppressed under `-Xfatal-warnings`: ``` def reportCompileErrors() { if (!reporter.hasErrors && reporter.hasWarnings && settings.fatalWarnings) globalError("No warnings can be incurred under -Xfatal-warnings.") if (reporter.hasErrors) { ... } else { // will erroneously not get here if // `reporter.hasWarnings && settings.fatalWarnings` // since the `globalError` call above means `reporter.hasErrors`... allConditionalWarnings foreach (_.summarize()) ... } } ``` The second `if`'s condition depends on the `globalError` call in the first `if`...
| | * | | | Merge pull request #3842 from Ichoran/issue/8335Adriaan Moors2014-07-041-4/+2
| | |\ \ \ \ | | | |_|/ / | | |/| | | SI-8335 List.++ avoidably burns memory
| | | * | | SI-8335 List.++ avoidably burns memoryRex Kerr2014-06-271-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | Changed to check the identity of the CanBuildFrom instead of the identity of the generated builder to shortcut building. Should reduce memory churn on ++ a little.
| | * | | | Merge pull request #3788 from som-snytt/issue/8494Adriaan Moors2014-07-041-40/+56
| | |\ \ \ \ | | | | | | | | | | | | | | SI-8494 Restore filtering javap output
| | | * | | | SI-8494 Javap filter includes specializedSom Snytt2014-05-231-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When filtering javap output, include specialized versions of methods. For anonfuns, in particular, the apply$sp is the method of interest.
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-09 10:17:45 +0000