Skip to content

Commit 6d6af09

Browse files
committed
Use assign initial on declaration level only
1 parent fc7b80f commit 6d6af09

File tree

160 files changed

+780
-264
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

160 files changed

+780
-264
lines changed

src/AngleSharp.Css/Declarations/AlignContentDeclaration.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
namespace AngleSharp.Css.Declarations
22
{
3+
using AngleSharp.Css.Dom;
34
using System;
45
using static ValueConverters;
56

67
static class AlignContentDeclaration
78
{
89
public static String Name = PropertyNames.AlignContent;
910

10-
public static IValueConverter Converter = Or(AlignContentConverter, AssignInitial(InitialValues.AlignContentDecl));
11+
public static IValueConverter Converter = AlignContentConverter;
12+
13+
public static ICssValue InitialValue = InitialValues.AlignContentDecl;
1114

1215
public static PropertyFlags Flags = PropertyFlags.None;
1316
}

src/AngleSharp.Css/Declarations/AlignItemsDeclaration.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
namespace AngleSharp.Css.Declarations
22
{
3+
using AngleSharp.Css.Dom;
34
using System;
45
using static ValueConverters;
56

67
static class AlignItemsDeclaration
78
{
89
public static String Name = PropertyNames.AlignItems;
910

10-
public static IValueConverter Converter = Or(AlignItemsConverter, AssignInitial(InitialValues.AlignItemsDecl));
11+
public static IValueConverter Converter = AlignItemsConverter;
12+
13+
public static ICssValue InitialValue = InitialValues.AlignItemsDecl;
1114

1215
public static PropertyFlags Flags = PropertyFlags.None;
1316
}

src/AngleSharp.Css/Declarations/AlignSelfDeclaration.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
namespace AngleSharp.Css.Declarations
22
{
3+
using AngleSharp.Css.Dom;
34
using System;
45
using static ValueConverters;
56

67
static class AlignSelfDeclaration
78
{
89
public static String Name = PropertyNames.AlignSelf;
910

10-
public static IValueConverter Converter = Or(AlignSelfConverter, AssignInitial(InitialValues.AlignSelfDecl));
11+
public static IValueConverter Converter = AlignSelfConverter;
12+
13+
public static ICssValue InitialValue = InitialValues.AlignSelfDecl;
1114

1215
public static PropertyFlags Flags = PropertyFlags.None;
1316
}

src/AngleSharp.Css/Declarations/AnimationDeclaration.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ namespace AngleSharp.Css.Declarations
55
using AngleSharp.Css.Values;
66
using AngleSharp.Text;
77
using System;
8-
using System.Collections.Generic;
98
using System.Linq;
109
using static ValueConverters;
1110

@@ -15,6 +14,8 @@ static class AnimationDeclaration
1514

1615
public static IValueConverter Converter = new AnimationAggregator();
1716

17+
public static ICssValue InitialValue = null;
18+
1819
public static PropertyFlags Flags = PropertyFlags.Shorthand;
1920

2021
public static String[] Longhands = new[]
@@ -46,7 +47,7 @@ sealed class AnimationConverter : IValueConverter
4647

4748
sealed class AnimationAggregator : IValueAggregator, IValueConverter
4849
{
49-
private static readonly IValueConverter converter = Or(new AnimationConverter(), AssignInitial());
50+
private static readonly IValueConverter converter = new AnimationConverter();
5051

5152
public ICssValue Convert(StringSource source) => converter.Convert(source);
5253

src/AngleSharp.Css/Declarations/AnimationDelayDeclaration.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
namespace AngleSharp.Css.Declarations
22
{
33
using AngleSharp.Css.Converters;
4+
using AngleSharp.Css.Dom;
45
using System;
56
using static ValueConverters;
67

@@ -13,7 +14,9 @@ static class AnimationDelayDeclaration
1314
PropertyNames.Animation,
1415
};
1516

16-
public static IValueConverter Converter = Or(TimeConverter.FromList(), AssignInitial(InitialValues.AnimationDelayDecl));
17+
public static IValueConverter Converter = TimeConverter.FromList();
18+
19+
public static ICssValue InitialValue = InitialValues.AnimationDelayDecl;
1720

1821
public static PropertyFlags Flags = PropertyFlags.None;
1922
}

src/AngleSharp.Css/Declarations/AnimationDirectionDeclaration.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
namespace AngleSharp.Css.Declarations
22
{
33
using AngleSharp.Css.Converters;
4+
using AngleSharp.Css.Dom;
45
using System;
56
using static ValueConverters;
67

@@ -13,7 +14,9 @@ static class AnimationDirectionDeclaration
1314
PropertyNames.Animation,
1415
};
1516

16-
public static IValueConverter Converter = Or(AnimationDirectionConverter.FromList(), AssignInitial(InitialValues.AnimationDirectionDecl));
17+
public static IValueConverter Converter = AnimationDirectionConverter.FromList();
18+
19+
public static ICssValue InitialValue = InitialValues.AnimationDirectionDecl;
1720

1821
public static PropertyFlags Flags = PropertyFlags.None;
1922
}

src/AngleSharp.Css/Declarations/AnimationDurationDeclaration.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
namespace AngleSharp.Css.Declarations
22
{
33
using AngleSharp.Css.Converters;
4+
using AngleSharp.Css.Dom;
45
using System;
56
using static ValueConverters;
67

@@ -13,7 +14,9 @@ static class AnimationDurationDeclaration
1314
PropertyNames.Animation,
1415
};
1516

16-
public static IValueConverter Converter = Or(TimeConverter.FromList(), AssignInitial(InitialValues.AnimationDurationDecl));
17+
public static IValueConverter Converter = TimeConverter.FromList();
18+
19+
public static ICssValue InitialValue = InitialValues.AnimationDurationDecl;
1720

1821
public static PropertyFlags Flags = PropertyFlags.None;
1922
}

src/AngleSharp.Css/Declarations/AnimationFillModeDeclaration.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
namespace AngleSharp.Css.Declarations
22
{
33
using AngleSharp.Css.Converters;
4+
using AngleSharp.Css.Dom;
45
using System;
56
using static ValueConverters;
67

@@ -13,7 +14,9 @@ static class AnimationFillModeDeclaration
1314
PropertyNames.Animation,
1415
};
1516

16-
public static IValueConverter Converter = Or(AnimationFillStyleConverter.FromList(), AssignInitial(InitialValues.AnimationFillModeDecl));
17+
public static IValueConverter Converter = AnimationFillStyleConverter.FromList();
18+
19+
public static ICssValue InitialValue = InitialValues.AnimationFillModeDecl;
1720

1821
public static PropertyFlags Flags = PropertyFlags.None;
1922
}

src/AngleSharp.Css/Declarations/AnimationIterationCountDeclaration.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
namespace AngleSharp.Css.Declarations
22
{
33
using AngleSharp.Css.Converters;
4+
using AngleSharp.Css.Dom;
45
using System;
56
using static ValueConverters;
67

@@ -13,7 +14,9 @@ static class AnimationIterationCountDeclaration
1314
PropertyNames.Animation,
1415
};
1516

16-
public static IValueConverter Converter = Or(PositiveOrInfiniteNumberConverter.FromList(), AssignInitial(InitialValues.AnimationIterationCountDecl));
17+
public static IValueConverter Converter = PositiveOrInfiniteNumberConverter.FromList();
18+
19+
public static ICssValue InitialValue = InitialValues.AnimationIterationCountDecl;
1720

1821
public static PropertyFlags Flags = PropertyFlags.None;
1922
}

src/AngleSharp.Css/Declarations/AnimationNameDeclaration.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
namespace AngleSharp.Css.Declarations
22
{
33
using AngleSharp.Css.Converters;
4+
using AngleSharp.Css.Dom;
45
using System;
56
using static ValueConverters;
67

@@ -13,7 +14,9 @@ static class AnimationNameDeclaration
1314
PropertyNames.Animation,
1415
};
1516

16-
public static IValueConverter Converter = Or(IdentifierConverter.FromList(), None, AssignInitial(InitialValues.AnimationNameDecl));
17+
public static IValueConverter Converter = Or(IdentifierConverter.FromList(), None);
18+
19+
public static ICssValue InitialValue = InitialValues.AnimationNameDecl;
1720

1821
public static PropertyFlags Flags = PropertyFlags.None;
1922
}

0 commit comments

Comments
 (0)