Version 2.16.0-84.0.dev
Merge commit '24e681927a8b4541d05771588b78edb8f0925f58' into 'dev'
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c48329..79ffbe8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,15 @@
[an issue]: https://github.com/dart-lang/sdk/issues/new
+- **Breaking Change** [#46100](https://github.com/dart-lang/sdk/issues/46100):
+ The standalone `dartdoc` tool has been
+ marked deprecated as previously announced.
+ Its replacement is the `dart doc` command.
+ Should you find any issues, or missing features, in the replacement
+ command, kindly file [an issue][].
+
+[an issue]: https://github.com/dart-lang/sdk/issues/new
+
#### Linter
Updated the Linter to `1.15.0`, which includes changes that
diff --git a/pkg/analyzer/lib/src/dart/element/element.dart b/pkg/analyzer/lib/src/dart/element/element.dart
index d491590..0a5c264 100644
--- a/pkg/analyzer/lib/src/dart/element/element.dart
+++ b/pkg/analyzer/lib/src/dart/element/element.dart
@@ -1297,6 +1297,9 @@
bool get hasInitializer => false;
@override
+ bool get isEnumConstant => true;
+
+ @override
Element get nonSynthetic => this;
@override
@@ -3284,10 +3287,7 @@
}
@override
- bool get isEnumConstant =>
- enclosingElement is ClassElement &&
- (enclosingElement as ClassElement).isEnum &&
- !isSynthetic;
+ bool get isEnumConstant => false;
@override
bool get isExternal {
diff --git a/pkg/analyzer/lib/src/summary2/bundle_writer.dart b/pkg/analyzer/lib/src/summary2/bundle_writer.dart
index f6fdf85..1adc959 100644
--- a/pkg/analyzer/lib/src/summary2/bundle_writer.dart
+++ b/pkg/analyzer/lib/src/summary2/bundle_writer.dart
@@ -173,7 +173,8 @@
_sink._writeStringReference(element.name);
_resolutionSink._writeAnnotationList(element.metadata);
- var constants = element.fields.where((e) => !e.isSynthetic).toList();
+ var constants =
+ element.fields.whereType<ConstFieldElementImpl_EnumValue>().toList();
_writeList<FieldElement>(constants, (field) {
_sink._writeStringReference(field.name);
_resolutionSink._writeAnnotationList(field.metadata);
diff --git a/sdk/bin/dartdoc b/sdk/bin/dartdoc
index f7ad682..b7817c8 100755
--- a/sdk/bin/dartdoc
+++ b/sdk/bin/dartdoc
@@ -3,6 +3,8 @@
# 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.
+echo "Warning: 'dartdoc' is deprecated. Please use 'dart doc'." 1>&2
+
function follow_links() {
file="$1"
while [ -h "$file" ]; do
diff --git a/sdk/bin/dartdoc.bat b/sdk/bin/dartdoc.bat
index 876eb0e..ea32a87 100644
--- a/sdk/bin/dartdoc.bat
+++ b/sdk/bin/dartdoc.bat
@@ -3,6 +3,8 @@
REM for details. All rights reserved. Use of this source code is governed by a
REM BSD-style license that can be found in the LICENSE file.
+echo Warning: 'dartdoc' is deprecated. Please use 'dart doc'. 1>&2
+
setlocal
rem Handle the case where dart-sdk/bin has been symlinked to.
set DIR_NAME_WITH_SLASH=%~dp0
diff --git a/tools/VERSION b/tools/VERSION
index de66b7a..c66c69e 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -27,5 +27,5 @@
MAJOR 2
MINOR 16
PATCH 0
-PRERELEASE 83
+PRERELEASE 84
PRERELEASE_PATCH 0
\ No newline at end of file
