summaryrefslogtreecommitdiff
path: root/src/scaladoc
Commit message (Collapse)AuthorAgeFilesLines
* 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)
* | Add doc annotation `@shortDescription` to enable explicit synopsisFelix Mulder2016-02-222-5/+15
| | | | | | | | | | | | | | | | Entities with this annotation will be able to control what is shown in the method summary on entity pages as well as the hover text on search results. Review: @VladUreche
* | Add progress bar for searchFelix Mulder2016-02-184-42/+57
| |
* | Add better hover-text in search resultsFelix Mulder2016-02-186-27/+24
| |
* | Replace UTF8 glyphs with the Material TypefaceFelix Mulder2016-02-173-43/+75
| | | | | | | | | | | | | | | | This commit removes arrows and other symbols previously provided by UTF8-symbols. Instead it uses the Material Typeface that we've used for the search icon and graph symbols. review: @VladUreche, @lrytz
* | Add package member filteringFelix Mulder2016-02-171-22/+18
| | | | | | | | | | | | Previously only entities like classes and traits would allow for filter of members. This commit removes that restriction by always including the `<div id="order">` in the entity template.
* | Scaladoc: Add new search, featuring entity and member searchFelix Mulder2016-02-1719-940/+2183
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds a revamped search function for the scaladoc tool. It also contains a number of small fixes for HTML-layout and JavaScript issues. The search is implemented by enhancing the scheduler and using JavaScript promises. List of changes/additions: * Revamped search functionality - Search members as well as entities - Preserve keyboard navigation - Scroll to selected entity if outside of viewport - Non-blocking, cancelable * Display of library name (top left) * Refactored scheduler * Cleanup of HTML layout - Remove left pane - Better mobile layout, no need for dynamic offsets - Remove unused element classes - Remove iframe structure - Better layout for kinds
* | Merge branch '2.11.x' into topic/merge-2.11.x-to-2.12.x-20160210Jason Zaugg2016-02-101-1/+1
|\| | | | | | | | | | | | | | | | | Conflicts: src/library/scala/collection/Iterator.scala | `-- trivial conflicts only. Parens were added to the next() calls in 2.12.x, while in the meantime `{Concat,Join}Iterator` were optimized in 2.11.x
| * bump copyright year to 2016Seth Tisue2016-02-031-1/+1
| |
* | SI-9620: add doc annotation to hide specific conversionsFelix Mulder2016-02-094-70/+57
| | | | | | | | | | | | | | | | | | | | | | This commit will introduce the doc annotation `@hideImplicitConversion`. By specifying which conversions to hide, the user can "toggle" which conversions are kept in the parsed entity. This implementation is a better workaround than hardcoding which ones to ignore when running scaladoc. Review: @VladUreche
* | Scaladoc: fix duplicate implicits in ArrayFelix Mulder2016-02-061-0/+11
| |
* | Add panzoom feature to Type Inheritance graphsFelix Mulder2016-02-0610-155/+193
| |
* | Scaladoc: fix stray number in codeblocks for firefoxFelix Mulder2016-02-051-0/+4
| |
* | Merge commit 'cc6fea6' into merge/2.11.x-to-2.12.x-20160203Jason Zaugg2016-02-041-18/+16
|\| | | | | | | | | | | Conflicts: build.sbt scripts/jobs/integrate/bootstrap
| * Trim complexity in CommentFactoryBaseJanek Bogucki2016-01-251-18/+16
| | | | | | | | | | | | | | | | | | | | 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 commit 'bf599bc' into merge/2.11.x-to-2.12.x-20160203Jason Zaugg2016-02-032-3/+3
|\| | | | | | | | | | | | | | | | | Conflicts: src/compiler/scala/tools/nsc/backend/opt/ConstantOptimization.scala src/compiler/scala/tools/nsc/transform/Constructors.scala src/compiler/scala/tools/nsc/typechecker/Contexts.scala src/scaladoc/scala/tools/nsc/doc/html/page/Template.scala src/scaladoc/scala/tools/nsc/doc/html/resource/lib/jquery.layout.js
| * Fix some simple extra wordsEitan Adler2016-01-172-4/+4
| | | | | | | | The the word 'the' is often used twice. Fix that.
| * Apply title case to Scaladoc buttons: By Inheritance & Show AllJanek Bogucki2015-12-151-2/+2
| | | | | | | | | | The alternative choice was to change "Hide All" to "Hide all" to match existing capitalization but title case fits for this UI.
* | SI-9599 Multiple @todo formatted with comma on separate linepeterz2016-01-291-1/+1
| |
* | Add partial appearance update of inheritence graphs in scaladocFelix Mulder2016-01-2314-5628/+89
| | | | | | | | | | | | | | | | This commit updates color and shape of the inheritence graphs. Also adds a dropshadow on hover instead of opacity change. Graphviz broke upon trying to include svg buttons instead of png. Looking for a solution.
* | add mobile CSS rules for updated scaladoc lookFelix Mulder2016-01-045-86/+270
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit addresses the need for an improved mobile viewing experience. Specifically it introduces CSS media queries to adjust sizing and indentation of elements on mobile devices. This includes the following changes: - replace absolute font sizing with relative font sizing - fix font-resizing issues for mobile by fixing viewport - hide related links when viewport too small - fix missing trigram from heaven on Android - remove indentation on annotations e.g. `@throws` and place associated text on a separate line - fix bottom scoll-bar appearing on code-snippets - add spacing between entity icons in browser - add dynamic top offset for entity description - fix long entity names corrupting style - remove "EXPERIMENTAL" button from shortcomment divs on mobile