diff --git a/lib/src/model/language_feature.dart b/lib/src/model/language_feature.dart index 79f65ed7f2..b8b313c5f1 100644 --- a/lib/src/model/language_feature.dart +++ b/lib/src/model/language_feature.dart @@ -2,8 +2,6 @@ // 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. -// @dart=2.9 - import 'package:dartdoc/src/render/language_feature_renderer.dart'; const Map _featureDescriptions = { @@ -18,11 +16,11 @@ const Map _featureUrls = { /// the user that the documentation should be specially interpreted. class LanguageFeature { /// The description of this language feature. - String get featureDescription => _featureDescriptions[name]; + String? get featureDescription => _featureDescriptions[name]; /// A URL containing more information about this feature or `null` if there /// is none. - String /*?*/ get featureUrl => _featureUrls[name]; + String? get featureUrl => _featureUrls[name]; /// The rendered label for this language feature. String get featureLabel => _featureRenderer.renderLanguageFeatureLabel(this); diff --git a/lib/src/render/category_renderer.dart b/lib/src/render/category_renderer.dart index 45d6db7eec..0b6e838bc4 100644 --- a/lib/src/render/category_renderer.dart +++ b/lib/src/render/category_renderer.dart @@ -2,8 +2,6 @@ // 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. -// @dart=2.9 - import 'package:dartdoc/src/model/category.dart'; /// A renderer for a [Category]. diff --git a/lib/src/render/documentation_renderer.dart b/lib/src/render/documentation_renderer.dart index aab5206137..7049dd839d 100644 --- a/lib/src/render/documentation_renderer.dart +++ b/lib/src/render/documentation_renderer.dart @@ -2,16 +2,13 @@ // 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. -// @dart=2.9 - import 'package:html/parser.dart' show parse; import 'package:markdown/markdown.dart' as md; -import 'package:meta/meta.dart'; abstract class DocumentationRenderer { DocumentationRenderResult render( List nodes, { - @required bool processFullDocs, + required bool processFullDocs, }); } @@ -21,7 +18,7 @@ class DocumentationRendererHtml implements DocumentationRenderer { @override DocumentationRenderResult render( List nodes, { - @required bool processFullDocs, + required bool processFullDocs, }) { if (nodes.isEmpty) { return DocumentationRenderResult.empty; @@ -51,11 +48,10 @@ class DocumentationRendererHtml implements DocumentationRenderer { if (processFullDocs) { // `trim` fixes an issue with line ending differences between Mac and // Windows. - asHtml = asHtmlDocument.body.innerHtml?.trim(); + asHtml = (asHtmlDocument.body?.innerHtml ?? '').trim(); } - var asOneLiner = asHtmlDocument.body.children.isEmpty - ? '' - : asHtmlDocument.body.children.first.innerHtml; + var children = asHtmlDocument.body?.children ?? []; + var asOneLiner = children.isEmpty ? '' : children.first.innerHtml; return DocumentationRenderResult(asHtml: asHtml, asOneLiner: asOneLiner); } @@ -68,5 +64,5 @@ class DocumentationRenderResult { final String asOneLiner; const DocumentationRenderResult( - {@required this.asHtml, @required this.asOneLiner}); + {required this.asHtml, required this.asOneLiner}); } diff --git a/lib/src/render/enum_field_renderer.dart b/lib/src/render/enum_field_renderer.dart index b8f847a9c4..99f370fbd5 100644 --- a/lib/src/render/enum_field_renderer.dart +++ b/lib/src/render/enum_field_renderer.dart @@ -2,8 +2,6 @@ // 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. -// @dart=2.9 - import 'package:dartdoc/src/model/enum.dart'; abstract class EnumFieldRenderer { diff --git a/lib/src/render/feature_renderer.dart b/lib/src/render/feature_renderer.dart index 3eb18c1b60..7cce8145ac 100644 --- a/lib/src/render/feature_renderer.dart +++ b/lib/src/render/feature_renderer.dart @@ -2,8 +2,6 @@ // 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. -// @dart=2.9 - import 'dart:convert'; import 'package:dartdoc/src/model/annotation.dart'; diff --git a/lib/src/render/language_feature_renderer.dart b/lib/src/render/language_feature_renderer.dart index 24972ab9d9..5117d71623 100644 --- a/lib/src/render/language_feature_renderer.dart +++ b/lib/src/render/language_feature_renderer.dart @@ -2,8 +2,6 @@ // 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. -// @dart=2.9 - import 'package:dartdoc/src/model/language_feature.dart'; /// A renderer for a [LanguageFeature]. diff --git a/lib/src/render/model_element_renderer.dart b/lib/src/render/model_element_renderer.dart index b37bc20de9..63885667ef 100644 --- a/lib/src/render/model_element_renderer.dart +++ b/lib/src/render/model_element_renderer.dart @@ -2,8 +2,6 @@ // 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. -// @dart=2.9 - import 'package:dartdoc/src/model/feature.dart'; import 'package:dartdoc/src/model/model_element.dart'; diff --git a/lib/src/render/parameter_renderer.dart b/lib/src/render/parameter_renderer.dart index df0f17a970..ff0f22d7b8 100644 --- a/lib/src/render/parameter_renderer.dart +++ b/lib/src/render/parameter_renderer.dart @@ -2,14 +2,10 @@ // 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. -// @dart=2.9 - import 'dart:convert'; -import 'package:analyzer/dart/element/type.dart'; import 'package:dartdoc/src/element_type.dart'; import 'package:dartdoc/src/model/parameter.dart'; -import 'package:meta/meta.dart' as meta; /// Render HTML in an extended vertical format using
    tag. class ParameterRendererHtmlList extends ParameterRendererHtml { @@ -136,7 +132,7 @@ abstract class ParameterRenderer { void _renderLinkedParameterSublist( List parameters, StringBuffer output, - {@meta.required bool trailingComma, + {required bool trailingComma, String openBracket = '', String closeBracket = '', bool showMetadata = true, @@ -164,8 +160,8 @@ abstract class ParameterRenderer { String _renderParam( Parameter param, { - @meta.required String prefix, - @meta.required String suffix, + required String prefix, + required String suffix, bool showMetadata = true, bool showNames = true, }) { @@ -195,8 +191,7 @@ abstract class ParameterRenderer { buf.write(typeName(returnTypeName)); if (showNames) { buf.write(' ${parameterName(param.name)}'); - } else if (paramModelType.isTypedef || - paramModelType.type is FunctionType) { + } else { buf.write(' ${parameterName(paramModelType.name)}'); } if (!paramModelType.isTypedef && paramModelType is DefinedElementType) { @@ -208,7 +203,7 @@ abstract class ParameterRenderer { buf.write(')'); buf.write(paramModelType.nullabilitySuffix); } - if (!paramModelType.isTypedef && paramModelType.type is FunctionType) { + if (!paramModelType.isTypedef) { buf.write('('); buf.write(renderLinkedParams(paramModelType.parameters, showMetadata: showMetadata, showNames: showNames)); diff --git a/lib/src/render/source_code_renderer.dart b/lib/src/render/source_code_renderer.dart index 91ffec2d73..0a15830d78 100644 --- a/lib/src/render/source_code_renderer.dart +++ b/lib/src/render/source_code_renderer.dart @@ -2,8 +2,6 @@ // 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. -// @dart=2.9 - import 'dart:convert'; /// Renderer for source code snippets extracted from source files. diff --git a/lib/src/render/template_renderer.dart b/lib/src/render/template_renderer.dart index 73475e2a70..24da3e01ca 100644 --- a/lib/src/render/template_renderer.dart +++ b/lib/src/render/template_renderer.dart @@ -2,8 +2,6 @@ // 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. -// @dart=2.9 - abstract class LayoutRenderer { String composeLayoutTitle(String name, String kind, bool isDeprecated); } diff --git a/lib/src/render/type_parameters_renderer.dart b/lib/src/render/type_parameters_renderer.dart index c205f79f2b..26d947a103 100644 --- a/lib/src/render/type_parameters_renderer.dart +++ b/lib/src/render/type_parameters_renderer.dart @@ -2,8 +2,6 @@ // 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. -// @dart=2.9 - import 'package:dartdoc/src/model/type_parameter.dart'; abstract class TypeParametersRenderer { diff --git a/lib/src/render/typedef_renderer.dart b/lib/src/render/typedef_renderer.dart index a491744c7b..0a0e224716 100644 --- a/lib/src/render/typedef_renderer.dart +++ b/lib/src/render/typedef_renderer.dart @@ -2,8 +2,6 @@ // 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. -// @dart=2.9 - import 'package:dartdoc/src/model/type_parameter.dart'; import 'package:dartdoc/src/model/typedef.dart';