summaryrefslogtreecommitdiff
path: root/src/scaladoc
Commit message (Collapse)AuthorAgeFilesLines
* pattern for entitylink was too narrow, cleaned up the testsPhilippus Baalman2017-03-031-1/+1
|
* added missing Inline matches to inlineToStr so it is now exhaustivePhilippus Baalman2017-02-253-17/+22
| | | | | | | | | | | | scala.xml.XML.loadString(tag).text will remove all html tags inside the HtmlTag use a regex to remove html tags inside the tag added some tests for the inlineToStr-method moved inlineToStr to companion object of Page added test for nested html tags
* Merge pull request #5681 from Philippus/issue/9704Lukas Rytz2017-02-221-3/+7
|\ | | | | SI-9704 don't add a closing HtmlTag if it is already closed
| * moved Pattern and TagsNotToClose to a HtmlTag companion objectPhilippus Baalman2017-02-211-4/+6
| |
| * SI-9704 don't add a closed HtmlTag if it is already closedPhilippus Baalman2017-02-081-1/+3
| |
* | fixed broken references after move from 'model' to 'base'Philippus Baalman2017-02-102-3/+4
|/
* Move Scaladoc's Partest base classes to partest-extrasJason Zaugg2017-01-272-219/+0
| | | | | | They exist in the current location for historical reasons. partest-extras is a cleaner home for them, as we can avoid the dependency of the scaladoc project on partest.
* Typo and spelling correctionsJanek Bogucki2016-11-116-11/+11
|
* Factor out some more into ScaladocScannerAdriaan Moors2016-10-191-29/+25
|
* DocScanner has doc-comment scanning hooks.Adriaan Moors2016-10-191-45/+14
| | | | | | | Align the Scala and Java doc comment scanning methods a bit. The Scala one especially had gotten a bit messy, with regular block comments being kind of accumulated, but never actually registered as DocComments.
* Keep `skipBlockComment` tail recursiveAdriaan Moors2016-10-191-31/+12
| | | | | | | Avoid StackOverflow on big comments. Simplify `ScaladocJavaUnitScanner` while in there. TODO: Do same for `ScaladocUnitScanner`?
* Merge pull request #5369 from lrytz/sd210Lukas Rytz2016-09-021-1/+1
|\ | | | | Fixes to mixin forwarders
| * Allow per-choice help in ChoiceSettingLukas Rytz2016-09-021-1/+1
| |
* | Fields phase expands lazy vals like modulesAdriaan Moors2016-08-291-10/+13
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They remain ValDefs until then. - remove lazy accessor logic now that we have a single ValDef for lazy vals, with the underlying machinery being hidden until the fields phase leave a `@deprecated def lazyAccessor` for scala-refactoring - don't skolemize in purely synthetic getters, but *do* skolemize in lazy accessor during typers Lazy accessors have arbitrary user code, so have to skolemize. We exempt the purely synthetic accessors (`isSyntheticAccessor`) for strict vals, and lazy accessors emitted by the fields phase to avoid spurious type mismatches due to issues with existentials (That bug is tracked as https://github.com/scala/scala-dev/issues/165) When we're past typer, lazy accessors are synthetic, but before they are user-defined to make this hack less hacky, we could rework our flag usage to allow for requiring both the ACCESSOR and the SYNTHETIC bits to identify synthetic accessors and trigger the exemption. see also https://github.com/scala/scala-dev/issues/165 ok 7 - pos/existentials-harmful.scala ok 8 - pos/t2435.scala ok 9 - pos/existentials.scala previous attempt: skolemize type of val inside the private[this] val because its type is only observed from inside the accessor methods (inside the method scope its existentials are skolemized) - bean accessors have regular method types, not nullary method types - must re-infer type for param accessor some weirdness with scoping of param accessor vals and defs? - tailcalls detect lazy vals, which are defdefs after fields - can inline constant lazy val from trait - don't mix in fields etc for an overridden lazy val - need try-lift in lazy vals: the assign is not seen in uncurry because fields does the transform (see run/t2333.scala) - ensure field members end up final in bytecode - implicit class companion method: annot filter in completer - update check: previous error message was tangled up with unrelated field definitions (`var s` and `val s_scope`), now it behaves consistently whether those are val/vars or defs - analyzer plugin check update seems benign, but no way to know... - error message gen: there is no underlying symbol for a deferred var look for missing getter/setter instead - avoid retypechecking valdefs while duplicating for specialize see pos/spec-private - Scaladoc uniformly looks to field/accessor symbol - test updates to innerClassAttribute by Lukas
* Javadoc: make parsing of java comments optionalJakob Odersky2016-08-133-3/+27
|
* Javadoc: fix problems in community buildJakob Odersky2016-08-131-1/+6
| | | | | | | - fix initialization NPE in doc headers - fix assertion errors for java fields - ignore comments when deciding where to put interface methods - consider DocDefs when checking for constructors
* Merge pull request #5231 from gourlaysama/ticket/t9585-scaladoc-wrong-implicitsStefan Zeiger2016-08-121-0/+14
|\ | | | | SI-9585 hide auto-implicit conversions from scaladoc
| * SI-9585 hide auto-implicit conversions from scaladocAntoine Gourlay2016-06-061-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This hides implicits conversions (and potential members obtained through it) that converts a type into itself, because these conversions are usually non-sensical. They are not completely removed, just placed behind `-doc-implicits-show-all`, like other implicits deemed probably useless. --- Consider the scaladoc for the following class: ``` object Box { implicit def anyToBox[T](t: T): Box[T] = new Box(t) } class Box[T](val t: T) ``` When looking for implicits members to add to class `Box`, it finds the implicit conversion `anyToBox`, and applies it to itself to have an implicit conversion to Box[Box[T]], which brings a useless implicit member `t: Box[T]`. This commit makes scaladoc ignore any conversion from a type to itself (even if type parameters differ) by default. Using the (very useful) `tools/scaladoc-diff` script, I found that this change removes the following conversion from the library doc: ``` Ensuring[A] to Ensuring[Ensuring[A]] anytostringadd[A] to any2stringadd[anytostringadd[A]] ArrowAssoc[A] to ArrowAssoc[ArrowAssoc[A]] =:=[From,To] to =:=[From,To] SearchImpl[A,Repr] to SearchImpl[A,SearchImpl[A,Repr]] CollectionsHaveToParArray[C, T] to CollectionsHaveToParArray[CollectionsHaveToParArray[C, T], T] Ordered[A] to Ordered[Ordered[A]] StringFormat[A] to StringFormat[StringFormat[A]] ```
* | Remove doc-version was too long warningAdriaan Moors2016-08-112-13/+10
| | | | | | | | | | It would trigger 3091 times per test run. Use CSS to handle overflow instead.
* | SI-9560 Remove dependency on parser-combinators/jsonSimon Ochsenreither2016-07-222-11/+66
| | | | | | | | | | | | | | Also update a few example IDE files for Eclipse and IntelliJ. This drops the dependency by integrating the bare minimum functionality to keep things working.
* | Retain javadoc comments in scaladocJakob Odersky2016-07-153-47/+77
| | | | | | | | | | * Hook into java parser to generate doc comments * Generate empty trees for java implementation bodies
* | Merge commit 'aaf7bc0' into merge-2.11-to-2.12-june-19Lukas Rytz2016-06-211-2/+16
|\ \ | |/ |/|
| * Use sbt for PR validationStefan Zeiger2016-06-141-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Support directories in `-doc-external-doc`: It is documented as accepting a “classpath_entry_path” for the keys but this only worked for JARs and not for individual class files. When checking for external-doc mappings for a Symbol, we now find the root directory relative to a class file instead of using the full class file path. The corresponding tests for SI-191 and SI8557 are also fixed to support individual class files instead of JARs in partest. This is required for the sbt build which runs partest on “quick” instead of “pack”. - Fix version and repository handling for bootstrapping. The bootstrap `scalaInstance` can now be resolved from any repository added to the project (not just the bootstrap repositories) by using a different workaround for https://github.com/sbt/sbt/issues/1872. - Workaround for https://github.com/sbt/sbt/issues/2640 (putting the wrong `scalaInstance` on partest’s classpath). The required `ScalaInstance` constructor is deprecated, so we have to disable deprecation warnings and fatal warnings until there is a better fix. - Add MiMa to the sbt build (port of the old `test.bc` ant task). The sbt-mima plugin doesn’t have all the features we need, so we do it manually in a similar way to what the plugin does. Checks are done in both directions for the `library` and `compiler` projects. The base version has to be set in `build.sbt`. When set to `None`, MiMa checks are skipped. MiMa checks are run sequentially to avoid spurious errors (see https://github.com/typesafehub/migration-manager/issues/115). - Port the OSGi tests to the sbt build. The set of JARs that gets copied into build/osgi as bundles is a bit different from the ant build. We omit the source JARs but add additional modules that are part of the Scala distribution, which seems more correct. - Get rid up `pull-binary-libs.sh` for the sbt build. Add artifacts are resolved from the special bootstrap repository through Ivy. The special `code.jar` and `instrumented.jar` artifacts are copied to the location where partest expects them (because these paths are hardcoded in partest). Other extra JARs for partest in `test/files/lib` are referenced directly from the Ivy cache. - Move common settings that should be available with unqualified names in local `.sbt` files and on the command line into an auto-plugin. - Add an `antStyle` setting to sbt to allow users to easily enable ant-style incremental compilation instead of sbt’s standard name hashing with `set antStyle := true`. - Disable verbose `info`-level logging during sbt startup for both, `validate/test` and `validate/publish-core` jobs. Update logging is no longer disabled when running locally (where it is useful and doesn’t generate excessive output). - Pass optimization flags for scalac down to partest, using the new partest version 1.0.15\6. - Call the new sbt-based PR validation from `scripts/jobs/validate/test`. - Disable the tests `run/t7843-jsr223-service` and `run/t7933` from https://github.com/scala/scala/pull/4959 for now. We need to set up a new test project (either partest or junit) that can run them on a packaged version of Scala, or possibly move them into a separate project that would naturally run from a packaged Scala as part of the community build.
* | Add summary reporting to Scaladoc (#5063)Felix Mulder2016-05-137-23/+81
| |
* | SI-9752 never ignore blank lines when parsing code blocks (#5125)Antoine Gourlay2016-05-021-1/+1
| | | | | | | | | | 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.
* | General cleanups and less warnings during a Scala buildsoc2016-04-041-1/+1
| |
* | Fix incorrect svg on objects with companion traitsFelix Mulder2016-04-035-35/+71
| |
* | Fix expansion on click for "Full Signature" elementFelix Mulder2016-04-031-1/+6
| |
* | Fix sidebar not displaying objects with no companionFelix Mulder2016-04-032-15/+23
| |
* | Fix inconsistent icon elem insertionFelix Mulder2016-04-031-1/+1
| |
* | Merge pull request #4971 from adriaanm/genbcode-delambdafyAdriaan Moors2016-03-311-1/+1
|\ \ | | | | | | Unify treatment of built-in functions and SAMs
| * | Refactoring. Simplify inferImplicit's boolean leversAdriaan Moors2016-03-261-1/+1
| | |
* | | Merge pull request #5066 from acjay/cleanup_scaladoc_hoverAdriaan Moors2016-03-301-3/+3
|\ \ \ | | | | | | | | minor style updates for Scaladoc formatting
| * | | minor style updates for Scaladoc formattingAlan Johnson2016-03-281-3/+3
| |/ / | | | | | | | | | | | | - lighten hover highlight color for higher text/background contrast - adjust border-left for div.members to prevent content shifts on-hover
* | | Merge pull request #5062 from felixmulder/topic/scaladoc-search-historySeth Tisue2016-03-301-0/+24
|\ \ \ | | | | | | | | Add back to search for Scaladoc
| * | | Add search history for ScaladocFelix Mulder2016-03-301-0/+24
| |/ /
* / / Add type and class/trait member search, fixes SI-9721 and SI-9722Felix Mulder2016-03-302-14/+29
|/ /
* | scaladoc fix permalinksDavid Hoepelman2016-03-251-25/+30
| | | | | | | | | | | | | | * Member description auto-expands * If member comes from implicits is now becomes visible * Member is no longer hidden by search bar after scrolling * Permalink button now works when member is in a group (scrolling is still broken)
* | Fixed Typo in scaladoc scheduler.jsPim Verkerk2016-03-251-1/+1
| |
* | Fix some typos in `spec` documents and comments.Dongjoon Hyun2016-03-155-5/+5
| |
* | Merge pull request #5040 from adriaanm/rebase-5031Jason Zaugg2016-03-152-2/+2
|\ \ | | | | | | Merge 2.11.x into 2.12.x [ci: last-only]
| * | Merge 2.11.x into 2.12.xAdriaan Moors2016-03-142-2/+2
| |\| | | | | | | | | | Resolved conflicts as in b0e05b67c7
| | * Typesafe -> Lightbend in more placesSeth Tisue2016-03-042-2/+2
| | |
* | | Change behavior of clear-button on input fieldsFelix Mulder2016-03-142-19/+13
|/ / | | | | | | | | | | | | This commit changes the behavior to only remove the "x" if there is no input in the input field. The old behavior was to bind the blur event to be fired later - but this had the drawback of not working properly on fast hardware as the timeout would actually beat the click event.
* | Remove unused classes from ScaladocFelix Mulder2016-03-1411-1226/+11
| | | | | | | | | | | | | | | | | | | | | | | | Several elements of the old Scaladoc are not in use anymore. To help with any reverting, the removal of these is done in a single commit (this one). The removal includes: - Old `Index`, the old top "index.html" - The letter index (with "_" and "deprecated") - The old `Template` which is superceded by `Entity`
* | Add fallback typefaces for monospaced sections in scaladocFelix Mulder2016-03-073-31/+32
| | | | | | | | | | | | | | | | | | | | | | | | This commit will also fix the `Filter All Members` input appearing if there are no members - please see root for an example. There's also a small CSS fix that addresses a vertical scrollbar on smaller viewports (footer was not responsively resized). review: @VladUreche lol
* | SI-6886: Deprecate -expand-all-typesJanek Bogucki2016-03-041-1/+5
| | | | | | | | | | | | | | This Scaladoc flag was added to assist with debugging and was not intended to have general availability. If an element requires a separate Scaladoc page add @documentable.
* | Fix diagrams for `Content Hierarchies` in scaladocFelix Mulder2016-03-023-10/+14
| |
* | Unclutter scaladoc entity membersFelix Mulder2016-03-017-145/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit attempts to fix some minor annoyances regarding the UI when it comes to how things are shown. I.e. the complete definition is now hidden. Long signatures like: ```scala class HashMap[A, +B] extends AbstractMap[A, B] with Map[A, B] with MapLike[A, B, HashMap[A, B]] with Serializable with CustomParallelizable[(A, B), ParHashMap[A, B]] ``` will be reduced to: `class HashMap[A, +B]`. Full signature will be shown on hover and unfold. The package-view has been tweaked to look better on non-HiDPI displays. Also, subpackages to current package are now displayed before other entities.
* | Add package view to scaladocFelix Mulder2016-02-265-11/+221
| | | | | | | | | | | | | | | | The package view shows the current package's: - siblings - children packages - path to root package - child entities (objects, traits, abstract types and classes)