diff --git a/DEPS b/DEPS index 85850c246eb..ac240086106 100644 --- a/DEPS +++ b/DEPS @@ -84,7 +84,7 @@ vars = { # For more details, see https://github.com/dart-lang/sdk/issues/30164 "dart_style_tag": "@1.0.10", # Please see the note above before updating. - "dartdoc_tag" : "@v0.17.1+1", + "dartdoc_tag" : "@v0.18.0", "fixnum_tag": "@0.10.5", "func_rev": "@25eec48146a58967d75330075ab376b3838b18a8", "glob_tag": "@1.1.5", diff --git a/dartdoc_options.yaml b/dartdoc_options.yaml new file mode 100644 index 00000000000..4e73e84cf68 --- /dev/null +++ b/dartdoc_options.yaml @@ -0,0 +1,2 @@ +dartdoc: + categoryOrder: ["VM", "Web"] diff --git a/sdk/BUILD.gn b/sdk/BUILD.gn index b3e25e2c26e..c22d56773b9 100644 --- a/sdk/BUILD.gn +++ b/sdk/BUILD.gn @@ -922,6 +922,17 @@ copy("copy_license") { ] } +# This rule copies the dartdoc_options.yaml file. +copy("copy_dartdoc_options") { + visibility = [ ":create_common_sdk" ] + sources = [ + "../dartdoc_options.yaml", + ] + outputs = [ + "$root_out_dir/dart-sdk/dartdoc_options.yaml", + ] +} + # This rule copies the API readme file to lib/ copy("copy_api_readme") { visibility = [ ":create_common_sdk" ] @@ -942,6 +953,7 @@ group("create_common_sdk") { ":copy_api_readme", ":copy_dart", ":copy_dartdoc_files", + ":copy_dartdoc_options", ":copy_headers", ":copy_libraries_dart", ":copy_license", diff --git a/sdk/lib/cli/cli.dart b/sdk/lib/cli/cli.dart index 1dc4ca71f66..9c19c3a3252 100644 --- a/sdk/lib/cli/cli.dart +++ b/sdk/lib/cli/cli.dart @@ -2,6 +2,7 @@ // for details. All rights reserved. Use of this source code is governed by a // BSD-style license that can be found in the LICENSE file. +/// {@category VM} library dart.cli; import 'dart:async'; diff --git a/sdk/lib/html/dart2js/html_dart2js.dart b/sdk/lib/html/dart2js/html_dart2js.dart index f76fa2e1739..62e862af1ad 100644 --- a/sdk/lib/html/dart2js/html_dart2js.dart +++ b/sdk/lib/html/dart2js/html_dart2js.dart @@ -21,6 +21,8 @@ * * For even more examples, see * [Dart HTML5 Samples](https://github.com/dart-lang/dart-html5-samples) * on Github. + * + * {@category Web} */ library dart.dom.html; diff --git a/sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart b/sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart index 7edd685212d..e17e1e21136 100644 --- a/sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart +++ b/sdk/lib/indexed_db/dart2js/indexed_db_dart2js.dart @@ -69,6 +69,8 @@ * * [IndexedDB reference](http://docs.webplatform.org/wiki/apis/indexeddb) * provides wiki-style docs about indexedDB + * + * {@category Web} */ library dart.dom.indexed_db; diff --git a/sdk/lib/io/io.dart b/sdk/lib/io/io.dart index 0feb4ba1596..bc7e88aae0f 100644 --- a/sdk/lib/io/io.dart +++ b/sdk/lib/io/io.dart @@ -185,6 +185,8 @@ * (the program blocks waiting for user to type information): * * String inputText = stdin.readLineSync(); + * + * {@category VM} */ library dart.io; diff --git a/sdk/lib/isolate/isolate.dart b/sdk/lib/isolate/isolate.dart index 5fec1c09f53..496c820e3fd 100644 --- a/sdk/lib/isolate/isolate.dart +++ b/sdk/lib/isolate/isolate.dart @@ -11,6 +11,8 @@ * To use this library in your code: * * import 'dart:isolate'; + * + * {@category VM} */ library dart.isolate; diff --git a/sdk/lib/js/dart2js/js_dart2js.dart b/sdk/lib/js/dart2js/js_dart2js.dart index 74c55b86926..e0aedb952cd 100644 --- a/sdk/lib/js/dart2js/js_dart2js.dart +++ b/sdk/lib/js/dart2js/js_dart2js.dart @@ -78,6 +78,8 @@ * This expression creates a JavaScript array: * * var jsArray = new JsObject.jsify([1, 2, 3]); + * + * {@category Web} */ library dart.js; diff --git a/sdk/lib/js_util/dart2js/js_util_dart2js.dart b/sdk/lib/js_util/dart2js/js_util_dart2js.dart index efc4386e6e2..ac832ff08d3 100644 --- a/sdk/lib/js_util/dart2js/js_util_dart2js.dart +++ b/sdk/lib/js_util/dart2js/js_util_dart2js.dart @@ -7,6 +7,8 @@ /// methods when the same effect cannot be achieved with @JS annotations. /// These methods would be extension methods on JSObject if Dart supported /// extension methods. +/// +/// {@category Web} library dart.js_util; import 'dart:_foreign_helper' show JS; diff --git a/sdk/lib/mirrors/mirrors.dart b/sdk/lib/mirrors/mirrors.dart index 6b455c63589..0811fdb2f05 100644 --- a/sdk/lib/mirrors/mirrors.dart +++ b/sdk/lib/mirrors/mirrors.dart @@ -52,6 +52,8 @@ * result of user feedback. This library is platform dependent and therefore it * has implementations for both dart2js and the Dart VM. Both are under * development and may not support all operations yet. + * + * {@category VM} */ library dart.mirrors; diff --git a/sdk/lib/svg/dart2js/svg_dart2js.dart b/sdk/lib/svg/dart2js/svg_dart2js.dart index fb3da8bed6b..16ba80390e5 100644 --- a/sdk/lib/svg/dart2js/svg_dart2js.dart +++ b/sdk/lib/svg/dart2js/svg_dart2js.dart @@ -5,6 +5,8 @@ * For details about the features and syntax of SVG, a W3C standard, * refer to the * [Scalable Vector Graphics Specification](http://www.w3.org/TR/SVG/). + * + * {@category Web} */ library dart.dom.svg; diff --git a/sdk/lib/web_audio/dart2js/web_audio_dart2js.dart b/sdk/lib/web_audio/dart2js/web_audio_dart2js.dart index 707b1e789f6..c9275590ce0 100644 --- a/sdk/lib/web_audio/dart2js/web_audio_dart2js.dart +++ b/sdk/lib/web_audio/dart2js/web_audio_dart2js.dart @@ -1,5 +1,7 @@ /** * High-fidelity audio programming in the browser. + * + * {@category Web} */ library dart.dom.web_audio; diff --git a/sdk/lib/web_gl/dart2js/web_gl_dart2js.dart b/sdk/lib/web_gl/dart2js/web_gl_dart2js.dart index d441cf1f73b..657d0a879ae 100644 --- a/sdk/lib/web_gl/dart2js/web_gl_dart2js.dart +++ b/sdk/lib/web_gl/dart2js/web_gl_dart2js.dart @@ -1,5 +1,7 @@ /** * 3D programming in the browser. + * + * {@category Web} */ library dart.dom.web_gl; diff --git a/sdk/lib/web_sql/dart2js/web_sql_dart2js.dart b/sdk/lib/web_sql/dart2js/web_sql_dart2js.dart index 9a84406c1c8..633ebe5cb87 100644 --- a/sdk/lib/web_sql/dart2js/web_sql_dart2js.dart +++ b/sdk/lib/web_sql/dart2js/web_sql_dart2js.dart @@ -7,6 +7,8 @@ * for more information. * * The [dart:indexed_db] APIs is a recommended alternatives. + * + * {@category Web} */ library dart.dom.web_sql;