Skip to content

Formatting Dart code + enforcing it on CI. #4073

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
184 changes: 120 additions & 64 deletions lib/src/generator/templates.aot_renderers_for_html.dart

Large diffs are not rendered by default.

45,017 changes: 21,275 additions & 23,742 deletions lib/src/generator/templates.runtime_renderers.dart

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion lib/src/model/accessor.dart
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import 'package:dartdoc/src/warnings.dart';

/// Getters and setters.
class Accessor extends ModelElement {

@override
final PropertyAccessorElement2 element;

Expand Down
4 changes: 1 addition & 3 deletions lib/src/model/class.dart
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import 'package:dartdoc/src/model/model.dart';
/// **inherited**: Filtered getters giving only inherited children.
class Class extends InheritingContainer with Constructable, MixedInTypes {
@override

@override
final ClassElement2 element;

Expand Down Expand Up @@ -75,8 +74,7 @@ class Class extends InheritingContainer with Constructable, MixedInTypes {
bool get isFinal => element.isFinal && !element.isSealed;

@override
bool get isImplementableInterface =>
element.isInterface && !element.isSealed;
bool get isImplementableInterface => element.isInterface && !element.isSealed;

@override
bool get isMixinClass => element.isMixinClass;
Expand Down
3 changes: 1 addition & 2 deletions lib/src/model/constructor.dart
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,7 @@ class Constructor extends ModelElement with ContainerMember, TypeParameters {
@override
Kind get kind => Kind.constructor;

late final Callable modelType =
getTypeFor(element.type, library) as Callable;
late final Callable modelType = getTypeFor(element.type, library) as Callable;

@override
String get name =>
Expand Down
5 changes: 2 additions & 3 deletions lib/src/model/dynamic.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ import 'package:dartdoc/src/model/kind.dart';
import 'package:dartdoc/src/model/model.dart';

class Dynamic extends ModelElement with HasNoPage {

@override
final Element2 element;
@override
final Element2 element;

Dynamic(this.element, PackageGraph packageGraph)
: super(Library.sentinel, packageGraph);
Expand Down
9 changes: 3 additions & 6 deletions lib/src/model/extension_type.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ import 'package:dartdoc/src/model/model.dart';
import 'package:meta/meta.dart';

class ExtensionType extends InheritingContainer with Constructable {

@override
final ExtensionTypeElement2 element;
final ExtensionTypeElement2 element;

late final ElementType representationType =
getTypeFor(element.representation2.type, library);
Expand Down Expand Up @@ -45,13 +44,11 @@ class ExtensionType extends InheritingContainer with Constructable {
ContainerAccessor? getter, setter;
final fieldGetter = field.getter2;
if (fieldGetter != null) {
getter = ContainerAccessor(
fieldGetter, library, packageGraph, this);
getter = ContainerAccessor(fieldGetter, library, packageGraph, this);
}
final fieldSetter = field.setter2;
if (fieldSetter != null) {
setter = ContainerAccessor(
fieldSetter, library, packageGraph, this);
setter = ContainerAccessor(fieldSetter, library, packageGraph, this);
}
return getModelForPropertyInducingElement(field, library,
getter: getter, setter: setter) as Field;
Expand Down
10 changes: 3 additions & 7 deletions lib/src/model/field.dart
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import 'package:dartdoc/src/model/model.dart';

class Field extends ModelElement
with GetterSetterCombo, ContainerMember, Inheritable {

@override
final FieldElement2 element;

Expand All @@ -33,8 +32,7 @@ class Field extends ModelElement
super.packageGraph,
this.getter,
this.setter,
) :
isInherited = false,
) : isInherited = false,
enclosingElement =
ModelElement.for_(element.enclosingElement2, library, packageGraph)
as Container,
Expand All @@ -50,8 +48,7 @@ class Field extends ModelElement
super.packageGraph,
this.getter,
this.setter,
) :
isInherited = false,
) : isInherited = false,
assert(getter != null || setter != null) {
getter?.enclosingCombo = this;
setter?.enclosingCombo = this;
Expand All @@ -64,8 +61,7 @@ class Field extends ModelElement
super.packageGraph,
this.getter,
this.setter,
) :
isInherited = true,
) : isInherited = true,
assert(getter != null || setter != null) {
// Can't set `isInherited` to true if this is the defining element, because
// that would mean it isn't inherited.
Expand Down
3 changes: 1 addition & 2 deletions lib/src/model/library.dart
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,7 @@ class Library extends ModelElement
/// not found in it's 'lib/src' directory, and it is not excluded.
bool get isPublic {
if (!super.isPublic) return false;
final sdkLib =
packageGraph.sdkLibrarySources[element.firstFragment.source];
final sdkLib = packageGraph.sdkLibrarySources[element.firstFragment.source];
if (sdkLib != null && (sdkLib.isInternal || !sdkLib.isDocumented)) {
return false;
}
Expand Down
5 changes: 2 additions & 3 deletions lib/src/model/method.dart
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import 'package:dartdoc/src/model/model.dart';

class Method extends ModelElement
with ContainerMember, Inheritable, TypeParameters {

@override
final MethodElement2 element;

Expand All @@ -30,8 +29,8 @@ class Method extends ModelElement
_calcTypeParameters();
}

Method.inherited(this.element, this._enclosingContainer, super.library,
super.packageGraph,
Method.inherited(
this.element, this._enclosingContainer, super.library, super.packageGraph,
{ExecutableMember? super.originalMember})
: _isInherited = true {
_calcTypeParameters();
Expand Down
1 change: 0 additions & 1 deletion lib/src/model/mixin.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import 'package:dartdoc/src/model_utils.dart' as model_utils;
import 'package:meta/meta.dart';

class Mixin extends InheritingContainer {

@override
final MixinElement2 element;

Expand Down
7 changes: 3 additions & 4 deletions lib/src/model/model_function.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import 'package:dartdoc/src/model/model.dart';

/// A [ModelElement] for a [TopLevelFunctionElement] that isn't part of a type definition.
class ModelFunction extends ModelFunctionTyped with Categorization {
ModelFunction(TopLevelFunctionElement super.element, super.library,
super.packageGraph);
ModelFunction(
TopLevelFunctionElement super.element, super.library, super.packageGraph);

bool get isStatic => element.isStatic;

Expand Down Expand Up @@ -82,8 +82,7 @@ class ModelFunctionTyped extends ModelElement with TypeParameters {
@override
Iterable<CommentReferable> get referenceParents => [library];

late final Callable modelType =
getTypeFor(element.type, library) as Callable;
late final Callable modelType = getTypeFor(element.type, library) as Callable;

// For use in templates.
bool get isProvidedByExtension => false;
Expand Down
1 change: 0 additions & 1 deletion lib/src/model/never.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import 'package:dartdoc/src/model/kind.dart';
import 'package:dartdoc/src/model/model.dart';

class NeverType extends ModelElement with HasNoPage {

@override
final Element2 element;

Expand Down
4 changes: 1 addition & 3 deletions lib/src/model/parameter.dart
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,13 @@ import 'package:dartdoc/src/model/kind.dart';
import 'package:dartdoc/src/model/model.dart';

class Parameter extends ModelElement with HasNoPage {

@override
final FormalParameterElement element;

Parameter(this.element, super.library, super.packageGraph,
{ParameterMember? super.originalMember});

String? get defaultValue =>
hasDefaultValue ? element.defaultValueCode : null;
String? get defaultValue => hasDefaultValue ? element.defaultValueCode : null;

@override
ModelElement? get enclosingElement {
Expand Down
5 changes: 2 additions & 3 deletions lib/src/model/top_level_variable.dart
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import 'package:dartdoc/src/model/model.dart';
/// Top-level variables. But also picks up getters and setters?
class TopLevelVariable extends ModelElement
with GetterSetterCombo, Categorization {

@override
final TopLevelVariableElement2 element;

Expand All @@ -20,8 +19,8 @@ class TopLevelVariable extends ModelElement
@override
final Accessor? setter;

TopLevelVariable(this.element, super.library, super.packageGraph,
this.getter, this.setter) {
TopLevelVariable(this.element, super.library, super.packageGraph, this.getter,
this.setter) {
getter?.enclosingCombo = this;
setter?.enclosingCombo = this;
}
Expand Down
1 change: 0 additions & 1 deletion lib/src/model/type_parameter.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import 'package:dartdoc/src/model/kind.dart';
import 'package:dartdoc/src/model/model.dart';

class TypeParameter extends ModelElement with HasNoPage {

@override
final TypeParameterElement2 element;

Expand Down
1 change: 0 additions & 1 deletion lib/src/model/typedef.dart
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import 'package:dartdoc/src/model/model.dart';

abstract class Typedef extends ModelElement
with TypeParameters, Categorization {

@override
final TypeAliasElement2 element;

Expand Down
Loading