diff --git a/lib/src/generator/templates.runtime_renderers.dart b/lib/src/generator/templates.runtime_renderers.dart index ce86ed959d..c53e169926 100644 --- a/lib/src/generator/templates.runtime_renderers.dart +++ b/lib/src/generator/templates.runtime_renderers.dart @@ -16059,21 +16059,19 @@ class _Renderer_Warnable extends RendererBase { const _invisibleGetters = { 'CategoryDefinition': { + 'displayName', + 'documentationMarkdown', 'hashCode', - 'runtimeType', 'name', - 'documentationMarkdown', - 'displayName' + 'runtimeType' }, 'CharacterLocation': { + 'columnNumber', 'hashCode', - 'runtimeType', 'lineNumber', - 'columnNumber' + 'runtimeType' }, 'ClassElement': { - 'hashCode', - 'runtimeType', 'accessors', 'allSupertypes', 'constructors', @@ -16082,6 +16080,7 @@ const _invisibleGetters = { 'fields', 'hasNonFinalField', 'hasStaticMember', + 'hashCode', 'interfaces', 'isAbstract', 'isDartCoreObject', @@ -16092,24 +16091,23 @@ const _invisibleGetters = { 'methods', 'mixins', 'name', + 'runtimeType', 'superclassConstraints', 'supertype', 'thisType', 'unnamedConstructor' }, 'CommentReferable': { - 'scope', + 'definingCommentReferable', 'href', + 'library', 'referenceChildren', - 'referenceParents', 'referenceGrandparentOverrides', 'referenceName', - 'library', - 'definingCommentReferable' + 'referenceParents', + 'scope' }, 'CompilationUnitElement': { - 'hashCode', - 'runtimeType', 'accessors', 'classes', 'enclosingElement', @@ -16117,19 +16115,20 @@ const _invisibleGetters = { 'extensions', 'functions', 'hasLoadLibraryFunction', + 'hashCode', 'lineInfo', 'mixins', + 'runtimeType', 'session', 'topLevelVariables', 'typeAliases', 'types' }, 'ConstructorElement': { - 'hashCode', - 'runtimeType', 'declaration', 'displayName', 'enclosingElement', + 'hashCode', 'isConst', 'isDefaultConstructor', 'isFactory', @@ -16137,17 +16136,17 @@ const _invisibleGetters = { 'nameEnd', 'periodOffset', 'redirectedConstructor', - 'returnType' + 'returnType', + 'runtimeType' }, - 'Context': {'hashCode', 'runtimeType', 'style', 'current', 'separator'}, + 'Context': {'current', 'hashCode', 'runtimeType', 'separator', 'style'}, 'DartType': { - 'hashCode', - 'runtimeType', 'alias', 'aliasArguments', 'aliasElement', 'displayName', 'element', + 'hashCode', 'isBottom', 'isDartAsyncFuture', 'isDartAsyncFutureOr', @@ -16167,75 +16166,74 @@ const _invisibleGetters = { 'isDynamic', 'isVoid', 'name', - 'nullabilitySuffix' + 'nullabilitySuffix', + 'runtimeType' }, 'DartdocOptionContext': { - 'hashCode', - 'runtimeType', - 'optionSet', - 'context', - 'exclude', 'allowTools', 'ambiguousReexportScorerMinConfidence', 'autoIncludeDependencies', - 'categoryOrder', 'categories', + 'categoryOrder', + 'context', 'dropTextFrom', 'examplePathPrefix', + 'exclude', + 'excludeFooterVersion', 'excludePackages', 'flutterRoot', + 'format', + 'hashCode', 'hideSdkText', 'include', 'includeExternal', 'includeSource', 'injectHtml', - 'sanitizeHtml', - 'excludeFooterVersion', - 'tools', 'inputDir', 'linkToRemote', 'linkToUrl', 'nodoc', + 'optionSet', 'output', 'packageMeta', 'packageOrder', - 'sdkDocs', 'resourceProvider', + 'runtimeType', + 'sanitizeHtml', 'sdkDir', + 'sdkDocs', + 'showStats', 'showUndocumentedCategories', + 'tools', 'topLevelPackageMeta', + 'useBaseHref', 'useCategories', - 'validateLinks', - 'showStats', - 'format', - 'useBaseHref' + 'validateLinks' }, - 'DocumentLocation': {'hashCode', 'runtimeType', 'index'}, + 'DocumentLocation': {'hashCode', 'index', 'runtimeType'}, 'Documentation': { - 'hashCode', - 'runtimeType', - 'hasExtendedDocs', 'asHtml', 'asOneLiner', - 'commentRefs' + 'commentRefs', + 'hasExtendedDocs', + 'hashCode', + 'runtimeType' }, 'DocumentationComment': { - 'needsPrecache', - 'documentationFrom', 'documentationAsHtml', - 'elementDocumentation', 'documentationComment', + 'documentationFrom', + 'documentationLocal', + 'elementDocumentation', + 'fullyQualifiedNameWithoutLibrary', 'hasDocumentationComment', 'hasNodoc', - 'sourceFileName', - 'fullyQualifiedNameWithoutLibrary', - 'pathContext', 'modelElementRenderer', - 'documentationLocal' + 'needsPrecache', + 'pathContext', + 'sourceFileName' }, 'Element': { - 'hashCode', - 'runtimeType', 'context', 'declaration', 'displayName', @@ -16261,6 +16259,7 @@ const _invisibleGetters = { 'hasVisibleForOverriding', 'hasVisibleForTemplate', 'hasVisibleForTesting', + 'hashCode', 'id', 'isPrivate', 'isPublic', @@ -16273,14 +16272,14 @@ const _invisibleGetters = { 'nameLength', 'nameOffset', 'nonSynthetic', + 'runtimeType', 'session', 'source' }, 'ElementAnnotation': { - 'hashCode', - 'runtimeType', 'constantEvaluationErrors', 'element', + 'hashCode', 'isAlwaysThrows', 'isDeprecated', 'isDoNotStore', @@ -16303,12 +16302,10 @@ const _invisibleGetters = { 'isUseResult', 'isVisibleForOverriding', 'isVisibleForTemplate', - 'isVisibleForTesting' + 'isVisibleForTesting', + 'runtimeType' }, 'ExecutableMember': { - 'hashCode', - 'runtimeType', - 'isLegacy', 'context', 'declaration', 'displayName', @@ -16318,6 +16315,7 @@ const _invisibleGetters = { 'hasDeprecated', 'hasDoNotStore', 'hasFactory', + 'hasImplicitReturnType', 'hasInternal', 'hasIsTest', 'hasIsTestGroup', @@ -16334,9 +16332,19 @@ const _invisibleGetters = { 'hasVisibleForOverriding', 'hasVisibleForTemplate', 'hasVisibleForTesting', + 'hashCode', 'id', + 'isAbstract', + 'isAsynchronous', + 'isExternal', + 'isGenerator', + 'isLegacy', + 'isOperator', 'isPrivate', 'isPublic', + 'isSimplyBounded', + 'isStatic', + 'isSynchronous', 'isSynthetic', 'kind', 'library', @@ -16347,73 +16355,64 @@ const _invisibleGetters = { 'nameLength', 'nameOffset', 'nonSynthetic', + 'parameters', + 'returnType', + 'runtimeType', 'session', 'source', 'substitution', - 'typeParameters', - 'hasImplicitReturnType', - 'isAbstract', - 'isAsynchronous', - 'isExternal', - 'isGenerator', - 'isOperator', - 'isSimplyBounded', - 'isStatic', - 'isSynchronous', - 'parameters', - 'returnType', - 'type' + 'type', + 'typeParameters' }, 'Expression': { 'hashCode', - 'runtimeType', 'inConstantContext', 'isAssignable', 'precedence', + 'runtimeType', 'staticParameterElement', 'staticType', 'unParenthesized' }, 'ExtensionElement': { - 'hashCode', - 'runtimeType', 'accessors', 'enclosingElement', 'extendedType', 'fields', - 'methods' + 'hashCode', + 'methods', + 'runtimeType' }, 'Feature': { - 'hashCode', - 'runtimeType', 'featurePrefix', - 'sortGroup', - 'name', + 'hashCode', + 'isPublic', 'linkedName', 'linkedNameWithParameters', - 'isPublic' + 'name', + 'runtimeType', + 'sortGroup' }, 'FieldElement': { - 'hashCode', - 'runtimeType', 'declaration', + 'hashCode', 'isAbstract', 'isCovariant', 'isEnumConstant', 'isExternal', - 'isStatic' + 'isStatic', + 'runtimeType' }, 'File': { - 'hashCode', - 'runtimeType', 'changes', + 'hashCode', 'lengthSync', - 'modificationStamp' + 'modificationStamp', + 'runtimeType' }, - 'FunctionElement': {'hashCode', 'runtimeType', 'isEntryPoint'}, + 'FunctionElement': {'hashCode', 'isEntryPoint', 'runtimeType'}, 'FunctionType': { 'hashCode', - 'runtimeType', 'namedParameterTypes', 'normalParameterNames', 'normalParameterTypes', @@ -16421,90 +16420,90 @@ const _invisibleGetters = { 'optionalParameterTypes', 'parameters', 'returnType', + 'runtimeType', 'typeFormals' }, 'FunctionTypedElement': { 'hashCode', - 'runtimeType', 'parameters', 'returnType', + 'runtimeType', 'type' }, 'GetterSetterCombo': { - 'enclosingElement', - 'documentationFrom', - 'getter', - 'setter', - 'annotations', 'allAccessors', + 'annotations', + 'arrow', + 'characterLocation', 'comboFeatures', - 'isInherited', 'constantInitializer', - 'characterLocation', 'constantValue', - 'constantValueTruncated', 'constantValueBase', - 'hasPublicGetter', - 'hasPublicSetter', - 'isPublic', - 'hasAccessorsWithDocs', - 'getterSetterBothAvailable', - 'oneLineDoc', + 'constantValueTruncated', 'documentationComment', + 'documentationFrom', + 'enclosingElement', + 'getter', + 'getterSetterBothAvailable', + 'hasAccessorsWithDocs', 'hasDocumentationComment', - 'modelType', - 'isCallable', - 'hasParameters', - 'parameters', - 'linkedParamsNoMetadata', 'hasExplicitGetter', 'hasExplicitSetter', 'hasGetter', - 'hasNoGetterSetter', 'hasGetterOrSetter', - 'hasSetter', + 'hasNoGetterSetter', + 'hasParameters', + 'hasPublicGetter', 'hasPublicGetterNoSetter', - 'arrow', + 'hasPublicSetter', + 'hasSetter', + 'isCallable', + 'isInherited', + 'isPublic', + 'linkedParamsNoMetadata', + 'modelType', + 'oneLineDoc', + 'parameters', 'readOnly', 'readWrite', - 'writeOnly', - 'referenceChildren' + 'referenceChildren', + 'setter', + 'writeOnly' }, 'HashMap': {'hashCode', 'runtimeType'}, 'Inheritable': { - 'overriddenDepth', - 'isInherited', - 'isCovariant', - 'features', 'canonicalLibrary', + 'features', 'inheritance', - 'overriddenElement', - 'isOverride' + 'isCovariant', + 'isInherited', + 'isOverride', + 'overriddenDepth', + 'overriddenElement' }, 'InheritanceManager3': {'hashCode', 'runtimeType'}, 'Iterable': { + 'first', 'hashCode', - 'runtimeType', - 'iterator', - 'length', 'isEmpty', 'isNotEmpty', - 'first', + 'iterator', 'last', + 'length', + 'runtimeType', 'single' }, 'LibraryElement': { - 'hashCode', - 'runtimeType', 'accessibleExtensions', 'definingCompilationUnit', 'entryPoint', - 'exportedLibraries', 'exportNamespace', + 'exportedLibraries', 'exports', 'featureSet', 'hasExtUri', 'hasLoadLibraryFunction', + 'hashCode', 'identifier', 'importedLibraries', 'imports', @@ -16519,6 +16518,7 @@ const _invisibleGetters = { 'parts', 'prefixes', 'publicNamespace', + 'runtimeType', 'scope', 'session', 'topLevelElements', @@ -16526,31 +16526,28 @@ const _invisibleGetters = { 'typeSystem', 'units' }, - 'List': {'hashCode', 'runtimeType', 'length', 'reversed'}, + 'List': {'hashCode', 'length', 'reversed', 'runtimeType'}, 'Locatable': { - 'hashCode', - 'runtimeType', 'documentationFrom', 'documentationIsLocal', 'fullyQualifiedName', + 'hashCode', 'href', - 'location' + 'location', + 'runtimeType' }, 'Map': { - 'hashCode', - 'runtimeType', 'entries', + 'hashCode', + 'isEmpty', + 'isNotEmpty', 'keys', - 'values', 'length', - 'isEmpty', - 'isNotEmpty' + 'runtimeType', + 'values' }, - 'MapEntry': {'hashCode', 'runtimeType', 'key', 'value'}, + 'MapEntry': {'hashCode', 'key', 'runtimeType', 'value'}, 'Member': { - 'hashCode', - 'runtimeType', - 'isLegacy', 'context', 'declaration', 'displayName', @@ -16576,7 +16573,9 @@ const _invisibleGetters = { 'hasVisibleForOverriding', 'hasVisibleForTemplate', 'hasVisibleForTesting', + 'hashCode', 'id', + 'isLegacy', 'isPrivate', 'isPublic', 'isSynthetic', @@ -16589,91 +16588,91 @@ const _invisibleGetters = { 'nameLength', 'nameOffset', 'nonSynthetic', + 'runtimeType', 'session', 'source', 'substitution' }, - 'MethodElement': {'hashCode', 'runtimeType', 'declaration'}, + 'MethodElement': {'declaration', 'hashCode', 'runtimeType'}, 'ModelElementRenderer': {'hashCode', 'runtimeType'}, 'ModelNode': { - 'hashCode', - 'runtimeType', 'commentRefs', 'element', + 'hashCode', 'resourceProvider', + 'runtimeType', 'sourceCode' }, 'ModelObjectBuilder': {'hashCode', 'runtimeType'}, 'PackageGraph': { - 'hashCode', - 'runtimeType', - 'specialClasses', - 'allImplementorsAdded', - 'allExtensionsAdded', - 'documentedExtensions', - 'allLibraries', + 'allCanonicalModelElements', 'allConstructedModelElements', + 'allExtensionsAdded', + 'allHrefs', + 'allImplementorsAdded', 'allInheritableElements', - 'packageMeta', + 'allLibraries', + 'allLibrariesAdded', + 'allLocalModelElements', + 'allModelElements', 'config', - 'rendererFactory', - 'packageMetaProvider', + 'dartCoreObject', 'defaultPackage', + 'defaultPackageName', + 'documentedExtensions', + 'documentedPackages', + 'extensions', 'hasEmbedderSdk', - 'packageMap', - 'sdk', - 'sdkLibrarySources', - 'allLibrariesAdded', - 'packageWarningCounter', - 'publicPackages', + 'hasFooterVersion', + 'hashCode', + 'implementors', + 'inheritThrough', + 'invisibleAnnotations', 'libraries', 'libraryCount', - 'publicLibraries', + 'libraryElementReexportedBy', + 'localPackages', 'localPublicLibraries', - 'dartCoreObject', - 'inheritThrough', - 'invisibleAnnotations', - 'allModelElements', - 'allLocalModelElements', - 'allCanonicalModelElements', - 'referenceChildren', 'name', - 'implementors', - 'extensions', - 'defaultPackageName', - 'hasFooterVersion', 'packageGraph', - 'resourceProvider', + 'packageMap', + 'packageMeta', + 'packageMetaProvider', + 'packageWarningCounter', 'packages', - 'localPackages', - 'documentedPackages', - 'libraryElementReexportedBy', - 'allHrefs', - 'referenceParents' + 'publicLibraries', + 'publicPackages', + 'referenceChildren', + 'referenceParents', + 'rendererFactory', + 'resourceProvider', + 'runtimeType', + 'sdk', + 'sdkLibrarySources', + 'specialClasses' }, 'PackageMeta': { - 'hashCode', - 'runtimeType', + 'description', 'dir', - 'resourceProvider', - 'pathContext', + 'hashCode', + 'homepage', + 'hostedAt', 'isSdk', + 'isValid', + 'name', 'needsPubGet', + 'pathContext', 'requiresFlutter', - 'name', - 'hostedAt', - 'version', - 'description', - 'homepage', - 'isValid', - 'resolvedDir' + 'resolvedDir', + 'resourceProvider', + 'runtimeType', + 'version' }, 'ParameterElement': { - 'hashCode', - 'runtimeType', 'declaration', 'defaultValueCode', 'hasDefaultValue', + 'hashCode', 'isCovariant', 'isInitializingFormal', 'isNamed', @@ -16687,21 +16686,22 @@ const _invisibleGetters = { 'name', 'parameterKind', 'parameters', + 'runtimeType', 'typeParameters' }, 'ParameterMember': { - 'hashCode', - 'runtimeType', - 'isLegacy', 'context', 'declaration', + 'defaultValueCode', 'displayName', 'documentationComment', 'enclosingElement', 'hasAlwaysThrows', + 'hasDefaultValue', 'hasDeprecated', 'hasDoNotStore', 'hasFactory', + 'hasImplicitType', 'hasInternal', 'hasIsTest', 'hasIsTestGroup', @@ -16718,9 +16718,18 @@ const _invisibleGetters = { 'hasVisibleForOverriding', 'hasVisibleForTemplate', 'hasVisibleForTesting', + 'hashCode', 'id', + 'isConst', + 'isConstantEvaluated', + 'isCovariant', + 'isFinal', + 'isInitializingFormal', + 'isLate', + 'isLegacy', 'isPrivate', 'isPublic', + 'isStatic', 'isSynthetic', 'kind', 'library', @@ -16731,41 +16740,31 @@ const _invisibleGetters = { 'nameLength', 'nameOffset', 'nonSynthetic', + 'parameterKind', + 'parameters', + 'runtimeType', 'session', 'source', 'substitution', - 'hasImplicitType', - 'isConst', - 'isConstantEvaluated', - 'isFinal', - 'isLate', - 'isStatic', 'type', - 'typeParameters', - 'defaultValueCode', - 'hasDefaultValue', - 'isCovariant', - 'isInitializingFormal', - 'parameterKind', - 'parameters' + 'typeParameters' }, 'ParameterizedType': {'hashCode', 'runtimeType', 'typeArguments'}, 'PropertyAccessorElement': { - 'hashCode', - 'runtimeType', 'correspondingGetter', 'correspondingSetter', 'declaration', 'enclosingElement', + 'hashCode', 'isGetter', 'isSetter', + 'runtimeType', 'variable' }, 'Scope': {'hashCode', 'runtimeType'}, 'SdkLibrary': { - 'hashCode', - 'runtimeType', 'category', + 'hashCode', 'isDart2JsLibrary', 'isDocumented', 'isImplementation', @@ -16773,57 +16772,58 @@ const _invisibleGetters = { 'isShared', 'isVmLibrary', 'path', + 'runtimeType', 'shortName' }, 'Set': { + 'first', 'hashCode', - 'runtimeType', - 'iterator', - 'length', 'isEmpty', 'isNotEmpty', - 'first', + 'iterator', 'last', + 'length', + 'runtimeType', 'single' }, 'TemplateOptions': { + 'customFooterContent', + 'customHeaderContent', + 'customInnerFooterText', 'hashCode', - 'runtimeType', 'relCanonicalPrefix', + 'runtimeType', 'toolVersion', - 'useBaseHref', - 'customHeaderContent', - 'customFooterContent', - 'customInnerFooterText' + 'useBaseHref' }, 'TypeAliasElement': { - 'hashCode', - 'runtimeType', 'aliasedElement', 'aliasedType', 'enclosingElement', - 'name' + 'hashCode', + 'name', + 'runtimeType' }, 'TypeParameterElement': { - 'hashCode', - 'runtimeType', 'bound', 'declaration', 'displayName', - 'name' + 'hashCode', + 'name', + 'runtimeType' }, 'TypeSystem': {'hashCode', 'runtimeType'}, 'Warnable': {'element', 'enclosingElement', 'package'}, 'int': { + 'bitLength', 'hashCode', - 'runtimeType', + 'isEven', + 'isFinite', + 'isInfinite', 'isNaN', 'isNegative', - 'isInfinite', - 'isFinite', - 'sign', - 'isEven', 'isOdd', - 'bitLength' + 'runtimeType', + 'sign' }, }; diff --git a/test/mustachio/foo.runtime_renderers.dart b/test/mustachio/foo.runtime_renderers.dart index c4a0935092..df7a2c1b94 100644 --- a/test/mustachio/foo.runtime_renderers.dart +++ b/test/mustachio/foo.runtime_renderers.dart @@ -550,24 +550,24 @@ class Renderer_Property3 extends RendererBase { const _invisibleGetters = { 'Object': {'hashCode', 'runtimeType'}, 'String': { + 'codeUnits', 'hashCode', - 'runtimeType', - 'length', 'isEmpty', 'isNotEmpty', - 'codeUnits', - 'runes' + 'length', + 'runes', + 'runtimeType' }, 'int': { + 'bitLength', 'hashCode', - 'runtimeType', + 'isEven', + 'isFinite', + 'isInfinite', 'isNaN', 'isNegative', - 'isInfinite', - 'isFinite', - 'sign', - 'isEven', 'isOdd', - 'bitLength' + 'runtimeType', + 'sign' }, }; diff --git a/tool/grind.dart b/tool/grind.dart index b2f99011be..5f748fb016 100644 --- a/tool/grind.dart +++ b/tool/grind.dart @@ -1050,8 +1050,7 @@ final _generatedFilesList = [ 'src/generator/html_resources.g.dart', 'src/generator/templates.aot_renderers_for_html.dart', 'src/generator/templates.aot_renderers_for_md.dart', - // TODO(jcollins-g): https://github.com/dart-lang/dartdoc/issues/2751 - //'src/generator/templates.runtime_renderers.dart', + 'src/generator/templates.runtime_renderers.dart', 'src/version.dart', '../test/mustachio/foo.dart', ].map((s) => path.joinAll(path.posix.split(s))); diff --git a/tool/mustachio/codegen_runtime_renderer.dart b/tool/mustachio/codegen_runtime_renderer.dart index 39b3c0e736..437f683020 100644 --- a/tool/mustachio/codegen_runtime_renderer.dart +++ b/tool/mustachio/codegen_runtime_renderer.dart @@ -587,7 +587,7 @@ renderValue: _buffer.write('const _invisibleGetters = {'); for (var class_ in _invisibleGetters.keys.toList()..sort()) { _buffer.write("'$class_':"); - var getters = _invisibleGetters[class_]!; + var getters = _invisibleGetters[class_]!.toList()..sort(); _buffer.write('{${getters.map((e) => "'$e'").join(', ')}},'); } _buffer.write('};');