Clean up language feature

Author: szakarias

lib/resources/docs.dart.js

@@ -49,7 +49,6 @@ import 'package:dartdoc/src/generator/templates.aot_renderers_for_html.dart'
 import 'package:dartdoc/src/generator/templates.runtime_renderers.dart'
     as runtime_renderers;
 import 'package:dartdoc/src/model/annotation.dart';
-import 'package:dartdoc/src/model/feature_set.dart';
 import 'package:dartdoc/src/model/language_feature.dart';
 import 'package:dartdoc/src/model/model.dart';
 import 'package:dartdoc/src/mustachio/annotations.dart';
@@ -73,7 +72,6 @@ const _visibleTypes = {
   Extension,
   ExtensionType,
   ExternalItem,
-  FeatureSet,
   FunctionTypeElementType,
   InheritingContainer,
   LanguageFeature,

lib/resources/docs.dart.js.map

@@ -13,7 +13,6 @@ import 'package:dartdoc/src/generator/template_data.dart';
 import 'package:dartdoc/src/model/annotation.dart';
 import 'package:dartdoc/src/model/attribute.dart';
 import 'package:dartdoc/src/model/comment_referable.dart';
-import 'package:dartdoc/src/model/feature_set.dart';
 import 'package:dartdoc/src/model/language_feature.dart';
 import 'package:dartdoc/src/model/model.dart';
 import 'package:dartdoc/src/mustachio/parser.dart';
@@ -2362,7 +2361,7 @@ class _Renderer_Category extends RendererBase<Category> {
   }
 }
 
-String renderCategory(CategoryTemplateData context, Template template) {
+String renderCategoryRedirect(CategoryTemplateData context, Template template) {
   var buffer = StringBuffer();
   _render_CategoryTemplateData(context, template.ast, template, buffer);
   return buffer.toString();
@@ -2612,7 +2611,7 @@ class _Renderer_CategoryTemplateData
   }
 }
 
-String renderCategoryRedirect(CategoryTemplateData context, Template template) {
+String renderCategory(CategoryTemplateData context, Template template) {
   var buffer = StringBuffer();
   _render_CategoryTemplateData(context, template.ast, template, buffer);
   return buffer.toString();
@@ -9122,133 +9121,6 @@ class _Renderer_ExternalItem extends RendererBase<ExternalItem> {
   }
 }
 
-class _Renderer_FeatureSet extends RendererBase<FeatureSet> {
-  static final Map<Type, Object> _propertyMapCache = {};
-  static Map<String, Property<CT_>> propertyMap<CT_ extends FeatureSet>() =>
-      _propertyMapCache.putIfAbsent(
-            CT_,
-            () => {
-              'displayedLanguageFeatures': Property(
-                getValue: (CT_ c) => c.displayedLanguageFeatures,
-                renderVariable:
-                    (CT_ c, Property<CT_> self, List<String> remainingNames) =>
-                        self.renderSimpleVariable(
-                          c,
-                          remainingNames,
-                          'Iterable<LanguageFeature>',
-                        ),
-
-                renderIterable:
-                    (
-                      CT_ c,
-                      RendererBase<CT_> r,
-                      List<MustachioNode> ast,
-                      StringSink sink,
-                    ) {
-                      return c.displayedLanguageFeatures.map(
-                        (e) => _render_LanguageFeature(
-                          e,
-                          ast,
-                          r.template,
-                          sink,
-                          parent: r,
-                        ),
-                      );
-                    },
-              ),
-              'hasFeatureSet': Property(
-                getValue: (CT_ c) => c.hasFeatureSet,
-                renderVariable:
-                    (CT_ c, Property<CT_> self, List<String> remainingNames) =>
-                        self.renderSimpleVariable(c, remainingNames, 'bool'),
-
-                getBool: (CT_ c) => c.hasFeatureSet,
-              ),
-              'library': Property(
-                getValue: (CT_ c) => c.library,
-                renderVariable:
-                    (CT_ c, Property<CT_> self, List<String> remainingNames) {
-                      if (remainingNames.isEmpty) {
-                        return self.getValue(c).toString();
-                      }
-                      var name = remainingNames.first;
-                      var nextProperty = _Renderer_Library.propertyMap()
-                          .getValue(name);
-                      return nextProperty.renderVariable(
-                        self.getValue(c) as Library,
-                        nextProperty,
-                        [...remainingNames.skip(1)],
-                      );
-                    },
-
-                isNullValue: (CT_ c) => false,
-
-                renderValue:
-                    (
-                      CT_ c,
-                      RendererBase<CT_> r,
-                      List<MustachioNode> ast,
-                      StringSink sink,
-                    ) {
-                      _render_Library(
-                        c.library,
-                        ast,
-                        r.template,
-                        sink,
-                        parent: r,
-                      );
-                    },
-              ),
-              'packageGraph': Property(
-                getValue: (CT_ c) => c.packageGraph,
-                renderVariable:
-                    (CT_ c, Property<CT_> self, List<String> remainingNames) =>
-                        self.renderSimpleVariable(
-                          c,
-                          remainingNames,
-                          'PackageGraph',
-                        ),
-
-                isNullValue: (CT_ c) => false,
-
-                renderValue:
-                    (
-                      CT_ c,
-                      RendererBase<CT_> r,
-                      List<MustachioNode> ast,
-                      StringSink sink,
-                    ) {
-                      renderSimple(
-                        c.packageGraph,
-                        ast,
-                        r.template,
-                        sink,
-                        parent: r,
-                        getters: _invisibleGetters['PackageGraph']!,
-                      );
-                    },
-              ),
-            },
-          )
-          as Map<String, Property<CT_>>;
-
-  _Renderer_FeatureSet(
-    FeatureSet context,
-    RendererBase<Object>? parent,
-    Template template,
-    StringSink sink,
-  ) : super(context, parent, template, sink);
-
-  @override
-  Property<FeatureSet>? getProperty(String key) {
-    if (propertyMap<FeatureSet>().containsKey(key)) {
-      return propertyMap<FeatureSet>()[key];
-    } else {
-      return null;
-    }
-  }
-}
-
 void _render_Field(
   Field context,
   List<MustachioNode> ast,
@@ -11631,8 +11503,8 @@ class _Renderer_InheritingContainer extends RendererBase<InheritingContainer> {
                       );
                     },
               ),
-              'displayedLanguageFeatures': Property(
-                getValue: (CT_ c) => c.displayedLanguageFeatures,
+              'displayedClassModifiers': Property(
+                getValue: (CT_ c) => c.displayedClassModifiers,
                 renderVariable:
                     (CT_ c, Property<CT_> self, List<String> remainingNames) =>
                         self.renderSimpleVariable(
@@ -11648,7 +11520,7 @@ class _Renderer_InheritingContainer extends RendererBase<InheritingContainer> {
                       List<MustachioNode> ast,
                       StringSink sink,
                     ) {
-                      return c.displayedLanguageFeatures.map(
+                      return c.displayedClassModifiers.map(
                         (e) => _render_LanguageFeature(
                           e,
                           ast,
@@ -11758,6 +11630,14 @@ class _Renderer_InheritingContainer extends RendererBase<InheritingContainer> {
                       );
                     },
               ),
+              'hasDisplayedClassModifiers': Property(
+                getValue: (CT_ c) => c.hasDisplayedClassModifiers,
+                renderVariable:
+                    (CT_ c, Property<CT_> self, List<String> remainingNames) =>
+                        self.renderSimpleVariable(c, remainingNames, 'bool'),
+
+                getBool: (CT_ c) => c.hasDisplayedClassModifiers,
+              ),
               'hasModifiers': Property(
                 getValue: (CT_ c) => c.hasModifiers,
                 renderVariable:
@@ -12594,8 +12474,8 @@ class _Renderer_LanguageFeature extends RendererBase<LanguageFeature> {
             CT_,
             () => {
               ..._Renderer_Object.propertyMap<CT_>(),
-              'featureDescription': Property(
-                getValue: (CT_ c) => c.featureDescription,
+              'description': Property(
+                getValue: (CT_ c) => c.description,
                 renderVariable:
                     (CT_ c, Property<CT_> self, List<String> remainingNames) {
                       if (remainingNames.isEmpty) {
@@ -12611,7 +12491,7 @@ class _Renderer_LanguageFeature extends RendererBase<LanguageFeature> {
                       );
                     },
 
-                isNullValue: (CT_ c) => c.featureDescription == null,
+                isNullValue: (CT_ c) => c.description == null,
 
                 renderValue:
                     (
@@ -12621,7 +12501,7 @@ class _Renderer_LanguageFeature extends RendererBase<LanguageFeature> {
                       StringSink sink,
                     ) {
                       _render_String(
-                        c.featureDescription!,
+                        c.description!,
                         ast,
                         r.template,
                         sink,
@@ -12664,8 +12544,8 @@ class _Renderer_LanguageFeature extends RendererBase<LanguageFeature> {
                       );
                     },
               ),
-              'featureUrl': Property(
-                getValue: (CT_ c) => c.featureUrl,
+              'name': Property(
+                getValue: (CT_ c) => c.name,
                 renderVariable:
                     (CT_ c, Property<CT_> self, List<String> remainingNames) {
                       if (remainingNames.isEmpty) {
@@ -12681,7 +12561,7 @@ class _Renderer_LanguageFeature extends RendererBase<LanguageFeature> {
                       );
                     },
 
-                isNullValue: (CT_ c) => c.featureUrl == null,
+                isNullValue: (CT_ c) => false,
 
                 renderValue:
                     (
@@ -12690,17 +12570,11 @@ class _Renderer_LanguageFeature extends RendererBase<LanguageFeature> {
                       List<MustachioNode> ast,
                       StringSink sink,
                     ) {
-                      _render_String(
-                        c.featureUrl!,
-                        ast,
-                        r.template,
-                        sink,
-                        parent: r,
-                      );
+                      _render_String(c.name, ast, r.template, sink, parent: r);
                     },
               ),
-              'name': Property(
-                getValue: (CT_ c) => c.name,
+              'url': Property(
+                getValue: (CT_ c) => c.url,
                 renderVariable:
                     (CT_ c, Property<CT_> self, List<String> remainingNames) {
                       if (remainingNames.isEmpty) {
@@ -12716,7 +12590,7 @@ class _Renderer_LanguageFeature extends RendererBase<LanguageFeature> {
                       );
                     },
 
-                isNullValue: (CT_ c) => false,
+                isNullValue: (CT_ c) => c.url == null,
 
                 renderValue:
                     (
@@ -12725,7 +12599,7 @@ class _Renderer_LanguageFeature extends RendererBase<LanguageFeature> {
                       List<MustachioNode> ast,
                       StringSink sink,
                     ) {
-                      _render_String(c.name, ast, r.template, sink, parent: r);
+                      _render_String(c.url!, ast, r.template, sink, parent: r);
                     },
               ),
             },
@@ -16150,7 +16024,6 @@ class _Renderer_ModelElement extends RendererBase<ModelElement> {
               ..._Renderer_Locatable.propertyMap<CT_>(),
               ..._Renderer_Nameable.propertyMap<CT_>(),
               ..._Renderer_SourceCode.propertyMap<CT_>(),
-              ..._Renderer_FeatureSet.propertyMap<CT_>(),
               ..._Renderer_DocumentationComment.propertyMap<CT_>(),
               'annotations': Property(
                 getValue: (CT_ c) => c.annotations,
@@ -19779,7 +19652,7 @@ class _Renderer_Package extends RendererBase<Package> {
   }
 }
 
-String renderIndex(PackageTemplateData context, Template template) {
+String renderError(PackageTemplateData context, Template template) {
   var buffer = StringBuffer();
   _render_PackageTemplateData(context, template.ast, template, buffer);
   return buffer.toString();
@@ -20137,7 +20010,7 @@ class _Renderer_PackageTemplateData extends RendererBase<PackageTemplateData> {
   }
 }
 
-String renderError(PackageTemplateData context, Template template) {
+String renderIndex(PackageTemplateData context, Template template) {
   var buffer = StringBuffer();
   _render_PackageTemplateData(context, template.ast, template, buffer);
   return buffer.toString();

lib/src/generator/templates.aot_renderers_for_html.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.
 
-import 'package:dartdoc/src/model/language_feature.dart';
-
 /// Represents a single modifier applicable to containers.
 class ContainerModifier implements Comparable<ContainerModifier> {
   final String name;
@@ -42,10 +40,22 @@ class ContainerModifier implements Comparable<ContainerModifier> {
   static const ContainerModifier mixin = ContainerModifier._('mixin', order: 4);
 }
 
-extension BuildLanguageFeatureSet on Iterable<ContainerModifier> {
-  /// Transforms [ContainerModifier]s into a series of [LanguageFeature] objects
-  /// suitable for rendering as chips.   Assumes iterable is sorted.
-  Iterable<LanguageFeature> get asLanguageFeatureSet =>
-      where((m) => !m.hideIfPresent.any(contains))
-          .map((m) => LanguageFeature(m.name));
-}
+const Map<String, String> classModifierDescriptions = {
+  'sealed':
+      'The direct subtypes of this class will be checked for exhaustiveness in switches.',
+  'abstract': 'This type can not be directly constructed.',
+  'base':
+      'This class or mixin can only be extended (not implemented or mixed in).',
+  'interface': 'This class can only be implemented (not extended or mixed in).',
+  'final': 'This class can neither be extended, implemented, nor mixed in.',
+  'mixin': 'This class can be used as a class and a mixin.',
+};
+
+const Map<String, String> classModifierUrls = {
+  'sealed': 'https://dart.dev/language/class-modifiers#sealed',
+  'abstract': 'https://dart.dev/language/class-modifiers#abstract',
+  'base': 'https://dart.dev/language/class-modifiers#base',
+  'interface': 'https://dart.dev/language/class-modifiers#interface',
+  'final': 'https://dart.dev/language/class-modifiers#final',
+  'mixin': 'https://dart.dev/language/mixins#class-mixin-or-mixin-class',
+};