summaryrefslogtreecommitdiff
path: root/src/scaladoc
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge commit '1b7e660' into merge-2.11-may-12Lukas Rytz2015-05-121-127/+0
|\|
| * Remove unused, mostly commented out doc/html/page/Source.scalaMichał Pociecha2015-05-021-127/+0
| | | | | | | | | | | | | | | | | | | | This file seems to be some early, unfinished draft. It's unused and mostly commented out. De facto it hasn't been changed since this version: https://github.com/scala/scala/blob/d9e3dde6d6d18b9a93e7566447cc3ee342f033d5/src/compiler/scala/tools/nsc/doc/html/page/Source.scala Just in meantime someone updated imports, moved it to other package etc. but nothing more.
* | Merge remote-tracking branch 'origin/2.11.x' into ↵Jason Zaugg2015-05-015-3/+74
|\| | | | | | | merge/2.11.x-to-2.12.x-20150501
| * SI-4476 add an index of deprecated members to scaladocAntoine Gourlay2015-04-225-3/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The deprecated list is only emitted if there actually are deprecated members; same for the link in the left sidebar. We just build on the existing index support, with an additional method to avoid having to go through the whole index if we won't generate the page anyway. The deprecated list page itself is completely identical to the normal index pages, except we don't strike through any entry (there are *all* deprecated already). There is just about enough space in the left sidebar for the deprecated link, see [1], and [2] for when there are no deprecated members. [1]: http://static.gourlaysama.net/img/scaladoc-deprecated.png [2]: http://static.gourlaysama.net/img/scaladoc-deprecated-empty.png
| * Merge pull request #4428 from kzys/7601-img-alt-211Lukas Rytz2015-04-092-17/+36
| |\ | | | | | | [nomerge] SI-7601 Scaladoc: img elements must have an "alt" attribute
| | * [nomerge] SI-7601 Scaladoc: img elements must have an "alt" attributeKato Kazuyoshi2015-04-022-17/+36
| | | | | | | | | | | | | | | | | | This change makes Scaladoc's HTML valid a bit. Backport of #4407 to 2.11.x
* | | Merge commit 'fedbfd7' into merge/2.11-to-2.12-apr-21Lukas Rytz2015-04-212-15/+20
|\| |
| * | SI-5795 empty scaladoc tags should be omitted from outputAntoine Gourlay2015-04-021-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Empty scaladoc tags, like `@param`, `@return`, `@version`, etc. should be omitted from the output when they have no meaning by themselves. They are still parsed, for validation (warning that a tag doesn't exist and so on), but are removed, if empty, when building the Comment. The only ones that stay even when empty are `@deprecated`, so that the class name can be striked-through ("Deprecated" also appears in the header, even if there is no message with it), and `@throws`.
| * | fix scaladoc issue with parsing of empty tagsAntoine Gourlay2015-04-021-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consider the following code: /** * @see * @deprecated */ object Foo The comment parser properly parsed the body of the 'see' tag as empty, but not the one of 'deprecated': it supposedly contains a single character, a newline '\n', which is wrong. This always happened to the last tag in the list; it is always appended a new line (whether empty or not), which breaks formatting (and things later on that test if a body is empty of not).
| * | fix Scaladoc html display when there are empty tagsAntoine Gourlay2015-04-021-0/+2
| |/ | | | | | | | | | | | | | | | | | | Empty scaladoc tags used to completely break the HTML layout of classes and methods. See the difference between before [1] and after [2]. [1]: http://static.gourlaysama.net/img/scaladoc_t5795_before.png [2]: http://static.gourlaysama.net/img/scaladoc_t5795_after.png
| * [nomerge] SI-8940 Scaladoc: Fix "Order by Alphabetical" buttonKato Kazuyoshi2015-04-011-1/+1
| | | | | | | | The selector has been wrong since 0c2614e.
* | Merge commit '32f520f' into merge/2.11-to-2.12-apr-1Lukas Rytz2015-04-011-17/+17
|\|
| * SI-9038 fix scaladoc syntax highlightning to leave unicode aloneAntoine Gourlay2015-03-261-17/+17
| | | | | | | | | | | | | | | | Syntax highlightning in code blocks used to manipulate the raw bytes of a String, converting them to chars when needed, which breaks Unicode surrogate pairs. Using a char array instead of a byte array will leave them alone.
* | Merge commit 'fcc20fe' into merge/2.11-to-2.12-apr-1Lukas Rytz2015-04-018-44/+34
|\|
| * Scaladoc js location synch more robustAdriaan Moors2015-02-201-1/+1
| | | | | | | | | | | | Tested on: - Mac: FF35/Safari 8/Chrome 41 - Win: IE11
| * SI-9164 Fix thread safety of Scaladoc diagram generatorJason Zaugg2015-02-195-40/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In a bug reminiscent of SI-7603 / ab8a223, when running multiple instances of Scaladoc in one JVM/classloader, we are exposed to race conditions in unprotected mutable state in a top-level object. This commit moves that state into the `Universe` object, which corresponds to a single Scaladoc instance. It also removes a little premature abstraction from the code. Note: the statistics code is still not thread safe, but this is no worse than the compiler itself, and not a real problem, as they are only enabled begind a `-Y` option.
| * SI-9148: Appends companion type to link tooltipsJustinPihony2015-02-122-3/+15
| |
* | Merge pull request #4406 from kzys/8940-scaladoc-alphabetic-buttonLukas Rytz2015-04-011-1/+1
|\ \ | | | | | | SI-8940 Scaladoc: Fix "Order by Alphabetical" button
| * | SI-8940 Scaladoc: Fix "Order by Alphabetical" buttonKato Kazuyoshi2015-03-251-1/+1
| | | | | | | | | | | | The selector has been wrong since 0c2614e.
* | | SI-7601 Scaladoc: img elements must have an "alt" attributeKato Kazuyoshi2015-03-262-17/+36
|/ / | | | | | | This change makes Scaladoc's HTML valid a bit.
* | Merge remote-tracking branch 'origin/2.11.x' into ↵Jason Zaugg2015-01-293-3/+3
|\| | | | | | | | | | | | | | | | | merge/2.11.x-to-2.12.x-20150129 Conflicts: build.number src/library/scala/concurrent/Future.scala versions.properties
| * Fix many typos in docs and commentsmpociecha2014-12-143-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | This commit corrects many typos found in scaladocs, comments and documentation. It should reduce a bit number of PRs which fix one typo. There are no changes in the 'real' code except one corrected name of a JUnit test method and some error messages in exceptions. In the case of typos in other method or field names etc., I just skipped them. Obviously this commit doesn't fix all existing typos. I just generated in IntelliJ the list of potential typos and looked through it quickly.
* | Merge commit '7ba38a0' into merge/2.11.x-to-2.12.x-20150129Jason Zaugg2015-01-297-10/+65
|\| | | | | | | | | | | | | | | Conflicts: build.number src/compiler/scala/tools/nsc/transform/ExtensionMethods.scala src/library/scala/collection/Iterator.scala versions.properties
| * SI-9006 Scaladoc: explicit companion and package linksDick Wall2014-11-263-1/+35
| | | | | | | | | | | | | | | | The existing navigation mechanisms have proved hard to discover for newcomers to Scaladoc. This commit adds textual links in the navigation bar to the docs of the companion (if defined) and to those of the enclosing package.
| * No list of subclasses for Any in scaladoc, it's useless.Antoine Gourlay2014-11-151-1/+1
| |
| * SI-8948 resurrect the scaladoc for Any/AnyRef/Nothing/Null.Antoine Gourlay2014-11-151-1/+2
| | | | | | | | | | | | | | | | | | | | | | They disappeared in dc1cd96 when `scala.tools.nsc.doc.DocParser` lost its `override def forScaladoc = true`, which used to trigger whether to parse `DocDef` nodes. This was deprecated in favor of a custom global when scaladoc was modularized out (#2226), but `DocParser` didn't get it since it didn't override `forScaladoc` anymore... I added back `forScaladoc` in `DocParser` for consistency with `ScaladocGlobal`, although it doesn't do anything anymore.
| * SI-5730 hide constructors of sealed abstract classes in scaladocAntoine Gourlay2014-11-071-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Sealed abstract classes (like `List`) have a primary constructor, public by default. It can never be called by external code but it shows up in the scaladoc as a nice `new List()` construtor... If a class is only abstract, the constructor is still useful because people can subclass and call it. If it is only sealed (i.e. effectively final), then it is the normal constructor of a final class. But sealed *and* abstract makes documenting the constructor useless. This should remove the misleading constructors of `List`, `Double`, `Option` and others from the scaladoc.
| * SI-6626 make @throws tags create links to exceptionsAntoine Gourlay2014-11-053-5/+23
| | | | | | | | | | | | In scaladoc, this turns exceptions in @throws tags into links (when it can find the target exception), instead of just showing the name.
* | Merge commit 'eb15950' into merge/2.11.x-to-2.12.x-20150129Jason Zaugg2015-01-291-9/+11
|\|
| * Make Scaladoc actually exit with non-zero exit code in case of errors,David Turner2014-10-041-9/+11
| | | | | | | | as its docs say it does.
* | More uniform treatment of package objectsJason Zaugg2014-11-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Introduce `Symbol#packageObject` and `Type#packageObject` to lookup the member package object of a package class/module, and use this far and wide. - Replace the overly complicated (and still buggy) implementation of `Context#isInPackageObject` with a one liner. The simplifying insight is that if we select a symbol from a package prefix that does not own that symbol, it *must* have really been selected from the package object. - Change implicit search to use the cache in `ModuleSymbol#implicitMembers` via `Type#implicitMembers`, which lets the client code read more naturally. Fixes a bug with `adapt::insertApply` that Adriaan spotted in a feat of lateral thinking. This is tested in t8862b.scala. alladin763.scala adds the test case from the bug originally remedied by `insertApply` to check we haven't regressed.
* | Merge commit 'abd595d' into merge/2.11.x-to-2.12.x-20140915Jason Zaugg2014-09-161-44/+14
|\|
| * Merge pull request #3951 from pawel-wiejacha/2.11.x_SI-8810_fixGrzegorz Kossakowski2014-09-031-42/+8
| |\ | | | | | | scaladoc: fixed code block indentation normalization
| | * SI-8810 scaladoc: fixed code block indentation normalizationPaweł Wiejacha2014-09-031-42/+8
| | |
| * | SI-8113 allow a newline between a link target and titleAntoine Gourlay2014-09-031-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Parsing "[[http://foo.bar link title]]" stops at the first whitespace. This breaks pretty badly in: [[http://foo.bar link title]] It stops after "link", interprets what it parsed as a link to a member, obviously fails, and then just ouputs "title". It should at least return a proper error, or, even better, just allow a newline between the target and title. I went for the latter.
| * | Merge remote-tracking branch 'upstream/2.11.x' into backportsLukas Rytz2014-08-261-3/+4
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/library/scala/util/matching/Regex.scala
| * | | [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-112-11/+12
| | | | | | | | | | | | | | | | (cherry picked from commit 68b16a0992877b4ebbb7c967804edbb72c05ceb5)
* | | | Removing deprecationsFrançois Garillot2014-09-097-18/+18
| | | | | | | | | | | | | | | | drive-by cleanups.
* | | | Merge commit '47908f1' into ↵Lukas Rytz2014-09-021-3/+4
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | merge/2.11-to-2.12-is-it-really-sept-2-already-where-was-summer Conflicts: src/library/scala/util/matching/Regex.scala
| * | | Regularize `comment` hook methodAdriaan Moors2014-07-171-3/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is currently pretty borken, but let's at least not clutter innocent interfaces with this functionality. Moved `comment` (as `signalParsedDocComment`) next to the other hook methods in `Global`. For now, it calls the old `reporter.comment` hook method. As soon as the IDE is refactored to receive comments properly, the deprecated `Reporter#comment` method can be removed.
* | | Merge commit '01f2d27' into ↵Lukas Rytz2014-09-023-3/+3
|\| | | | | | | | | | | merge/2.11-to-2.12-is-it-really-sept-2-already-where-was-summer
| * | Merge pull request #3792 from som-snytt/issue/8525Lukas Rytz2014-07-161-1/+1
| |\ \ | | | | | | | | SI-8525 -Xlint:nowarn-missing-interpolator
| | * | SI-8525 No anonymous lintSom Snytt2014-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turn anonymous references to `settings.lint` into named settings. After that, trust to Adriaan to make them filterable. There are a few remaining top-level -Y lint warnings that are deprecated.
| * | | Merge pull request #3883 from gourlaysama/wip/t8557Vlad Ureche2014-07-152-2/+2
| |\ \ \ | | |/ / | |/| | SI-8557 make scaladoc normalize paths of external jars.
| | * | SI-8557 make scaladoc normalize paths of external jars.Antoine Gourlay2014-07-152-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Scaladoc compares (string representations of) the paths from -doc-external-doc and the paths form `sym.underlyingSource`. We now normalize on both ends before comparing them.
* | | | Scaladoc: the value of an id attribute must be unique within a documentKato Kazuyoshi2014-08-133-20/+26
| | | | | | | | | | | | | | | | The value of an id attribute must be unique, according to HTML spec.
* | | | Merge pull request #3881 from pocket7878/issue/6144Grzegorz Kossakowski2014-07-252-11/+12
|\ \ \ \ | | | | | | | | | | Update javadoc tag to new scaladoc tags.
| * | | | Update javadoc tag to new scaladoc tags.Masato Sogame2014-07-152-11/+12
| | | | |
* | | | | Merge remote-tracking branch 'origin/2.11.x' into ↵Jason Zaugg2014-07-142-6/+6
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / merge/2.11.x-to-2.12.x-20140714
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-05 23:03:27 +0000