Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Enable strict null checks #1283

Merged
merged 19 commits into from Apr 15, 2021
Merged

Enable strict null checks #1283

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
247cb3d
Update dependencies to null-safe versions
jathak Mar 9, 2021
3fa2b1d
Fix hints and lints
nex3 Mar 10, 2021
5d0ad69
Split IfClause into ElseClause
nex3 Mar 10, 2021
ca3c6f5
Refactor how style rules interact with at-root
nex3 Mar 13, 2021
21e7ec1
Split Declaration's constructor into two
nex3 Mar 13, 2021
984e76e
Remove type parameters from recursive AST visitors
nex3 Mar 16, 2021
8fdb281
Make the first parameter to ImportCache() named, not mandatory
nex3 Mar 16, 2021
dfbdae0
Prepare for null-safety migration
jathak Mar 10, 2021
81d952d
Automated null-safety migration
nex3 Mar 17, 2021
e85d9a7
Fix automated migrator errors
nex3 Mar 17, 2021
8fd3c1b
Rename Extender to ExtensionStore
nex3 Mar 18, 2021
3ead2e2
Split out an Extender class from Extension
nex3 Mar 18, 2021
de013bf
Make spans universally non-nullable
nex3 Mar 19, 2021
654744f
Fix bogus null assertions
nex3 Mar 19, 2021
102d3ce
Make the IO interface align with the VM API
nex3 Mar 19, 2021
af0f25c
Fix broken tests
Awjin Apr 9, 2021
5535458
Fix broken specs
nex3 Apr 12, 2021
59b9dac
Update the pubspec
nex3 Apr 15, 2021
c2e02a5
Use ?[] instead of .andGet()
nex3 Apr 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
64 changes: 37 additions & 27 deletions lib/src/visitor/async_evaluate.dart
View file
Open in desktop
Expand Up @@ -156,7 +156,10 @@ class _EvaluateVisitor
AsyncEnvironment _environment;

/// The style rule that defines the current parent selector, if any.
ModifiableCssStyleRule _styleRule;
///
/// This doesn't take into consideration any intermediate `@at-root` rules. In
/// the common case where those rules are relevant, use [_styleRule] instead.
ModifiableCssStyleRule _styleRuleIgnoringAtRoot;

/// The current media queries, if any.
List<CssMediaQuery> _mediaQueries;
Expand Down Expand Up @@ -189,8 +192,8 @@ class _EvaluateVisitor
/// Whether we're currently building the output of an unknown at rule.
var _inUnknownAtRule = false;

/// Whether we're currently building the output of a style rule.
bool get _inStyleRule => _styleRule != null && !_atRootExcludingStyleRule;
ModifiableCssStyleRule get _styleRule =>
_atRootExcludingStyleRule ? null : _styleRuleIgnoringAtRoot;

/// Whether we're directly within an `@at-root` rule that excludes style
/// rules.
Expand Down Expand Up @@ -664,7 +667,7 @@ class _EvaluateVisitor
_endOfImports = 0;
_outOfOrderImports = null;
_extender = extender;
_styleRule = null;
_styleRuleIgnoringAtRoot = null;
_mediaQueries = null;
_declarationName = null;
_inUnknownAtRule = false;
Expand All @@ -684,7 +687,7 @@ class _EvaluateVisitor
_endOfImports = oldEndOfImports;
_outOfOrderImports = oldOutOfOrderImports;
_extender = oldExtender;
_styleRule = oldStyleRule;
_styleRuleIgnoringAtRoot = oldStyleRule;
_mediaQueries = oldMediaQueries;
_declarationName = oldDeclarationName;
_inUnknownAtRule = oldInUnknownAtRule;
Expand Down Expand Up @@ -1021,7 +1024,7 @@ class _EvaluateVisitor
}

Future<Value> visitDeclaration(Declaration node) async {
if (!_inStyleRule && !_inUnknownAtRule && !_inKeyframes) {
if (_styleRule == null && !_inUnknownAtRule && !_inKeyframes) {
throw _exception(
"Declarations may only be used within style rules.", node.span);
}
Expand Down Expand Up @@ -1101,7 +1104,8 @@ class _EvaluateVisitor
}

Future<Value> visitExtendRule(ExtendRule node) async {
if (!_inStyleRule || _declarationName != null) {
var styleRule = _styleRule;
if (styleRule == null || _declarationName != null) {
throw _exception(
"@extend may only be used within style rules.", node.span);
}
Expand Down Expand Up @@ -1135,7 +1139,7 @@ class _EvaluateVisitor
}

_extender.addExtension(
_styleRule.selector, compound.components.first, node, _mediaQueries);
styleRule.selector, compound.components.first, node, _mediaQueries);
}

return null;
Expand Down Expand Up @@ -1173,7 +1177,8 @@ class _EvaluateVisitor

await _withParent(ModifiableCssAtRule(name, node.span, value: value),
() async {
if (!_inStyleRule || _inKeyframes) {
var styleRule = _styleRule;
if (styleRule == null || _inKeyframes) {
for (var child in node.children) {
await child.accept(this);
}
Expand All @@ -1182,7 +1187,7 @@ class _EvaluateVisitor
// declarations immediately inside it have somewhere to go.
//
// For example, "a {@foo {b: c}}" should produce "@foo {a {b: c}}".
await _withParent(_styleRule.copyWithoutChildren(), () async {
await _withParent(styleRule.copyWithoutChildren(), () async {
for (var child in node.children) {
await child.accept(this);
}
Expand Down Expand Up @@ -1628,7 +1633,8 @@ class _EvaluateVisitor
await _withParent(
ModifiableCssMediaRule(mergedQueries ?? queries, node.span), () async {
await _withMediaQueries(mergedQueries ?? queries, () async {
if (!_inStyleRule) {
var styleRule = _styleRule;
if (styleRule == null) {
for (var child in node.children) {
await child.accept(this);
}
Expand All @@ -1638,7 +1644,7 @@ class _EvaluateVisitor
//
// For example, "a {@media screen {b: c}}" should produce
// "@media screen {a {b: c}}".
await _withParent(_styleRule.copyWithoutChildren(), () async {
await _withParent(styleRule.copyWithoutChildren(), () async {
for (var child in node.children) {
await child.accept(this);
}
Expand Down Expand Up @@ -1732,7 +1738,7 @@ class _EvaluateVisitor
parsedSelector = _addExceptionSpan(
node.selector,
() => parsedSelector.resolveParentSelectors(
_styleRule?.originalSelector,
_styleRuleIgnoringAtRoot?.originalSelector,
implicitParent: !_atRootExcludingStyleRule));

var selector = _extender.addSelector(
Expand All @@ -1752,7 +1758,7 @@ class _EvaluateVisitor
scopeWhen: node.hasDeclarations);
_atRootExcludingStyleRule = oldAtRootExcludingStyleRule;

if (!_inStyleRule && _parent.children.isNotEmpty) {
if (_styleRule == null && _parent.children.isNotEmpty) {
var lastChild = _parent.children.last;
lastChild.isGroupEnd = true;
}
Expand All @@ -1774,7 +1780,8 @@ class _EvaluateVisitor
await _visitSupportsCondition(node.condition), node.condition.span);
await _withParent(ModifiableCssSupportsRule(condition, node.span),
() async {
if (!_inStyleRule) {
var styleRule = _styleRule;
if (styleRule == null) {
for (var child in node.children) {
await child.accept(this);
}
Expand All @@ -1784,7 +1791,7 @@ class _EvaluateVisitor
//
// For example, "a {@supports (a: b) {b: c}}" should produce "@supports
// (a: b) {a {b: c}}".
await _withParent(_styleRule.copyWithoutChildren(), () async {
await _withParent(styleRule.copyWithoutChildren(), () async {
for (var child in node.children) {
await child.accept(this);
}
Expand Down Expand Up @@ -2487,8 +2494,8 @@ class _EvaluateVisitor
nodeWithSpan, () => arguments.verify(positional, MapKeySet(named)));

Future<Value> visitSelectorExpression(SelectorExpression node) async {
if (_styleRule == null) return sassNull;
return _styleRule.originalSelector.asSassList;
if (_styleRuleIgnoringAtRoot == null) return sassNull;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What determines when _styleRuleIgnoringAtRoot should be used instead of _styleRule?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The spec, mostly—in this case, & as an expression always ignores @at-root so you can interpolate it into selectors. Separating out these variables not only makes it more explicit which references respect @at-root and which don't, it also removes the implicit constraint that _inStyleRule means that _styleRule != null. Instead, we just check _styleRule == null, which is more visible to the type system.

return _styleRuleIgnoringAtRoot.originalSelector.asSassList;
}

Future<SassString> visitStringExpression(StringExpression node) async {
Expand Down Expand Up @@ -2620,7 +2627,8 @@ class _EvaluateVisitor
ModifiableCssMediaRule(mergedQueries ?? node.queries, node.span),
() async {
await _withMediaQueries(mergedQueries ?? node.queries, () async {
if (!_inStyleRule) {
var styleRule = _styleRule;
if (styleRule == null) {
for (var child in node.children) {
await child.accept(this);
}
Expand All @@ -2630,7 +2638,7 @@ class _EvaluateVisitor
//
// For example, "a {@media screen {b: c}}" should produce
// "@media screen {a {b: c}}".
await _withParent(_styleRule.copyWithoutChildren(), () async {
await _withParent(styleRule.copyWithoutChildren(), () async {
for (var child in node.children) {
await child.accept(this);
}
Expand All @@ -2653,8 +2661,9 @@ class _EvaluateVisitor
"Style rules may not be used within nested declarations.", node.span);
}

var styleRule = _styleRule;
var originalSelector = node.selector.value.resolveParentSelectors(
_styleRule?.originalSelector,
styleRule?.originalSelector,
implicitParent: !_atRootExcludingStyleRule);
var selector = _extender.addSelector(
originalSelector, node.selector.span, _mediaQueries);
Expand All @@ -2671,7 +2680,7 @@ class _EvaluateVisitor
}, through: (node) => node is CssStyleRule, scopeWhen: false);
_atRootExcludingStyleRule = oldAtRootExcludingStyleRule;

if (!_inStyleRule && _parent.children.isNotEmpty) {
if (styleRule == null && _parent.children.isNotEmpty) {
var lastChild = _parent.children.last;
lastChild.isGroupEnd = true;
}
Expand All @@ -2695,7 +2704,8 @@ class _EvaluateVisitor

await _withParent(ModifiableCssSupportsRule(node.condition, node.span),
() async {
if (!_inStyleRule) {
var styleRule = _styleRule;
if (styleRule == null) {
for (var child in node.children) {
await child.accept(this);
}
Expand All @@ -2705,7 +2715,7 @@ class _EvaluateVisitor
//
// For example, "a {@supports (a: b) {b: c}}" should produce "@supports
// (a: b) {a {b: c}}".
await _withParent(_styleRule.copyWithoutChildren(), () async {
await _withParent(styleRule.copyWithoutChildren(), () async {
for (var child in node.children) {
await child.accept(this);
}
Expand Down Expand Up @@ -2873,10 +2883,10 @@ class _EvaluateVisitor
/// Runs [callback] with [rule] as the current style rule.
Future<T> _withStyleRule<T>(
ModifiableCssStyleRule rule, Future<T> callback()) async {
var oldRule = _styleRule;
_styleRule = rule;
var oldRule = _styleRuleIgnoringAtRoot;
_styleRuleIgnoringAtRoot = rule;
var result = await callback();
_styleRule = oldRule;
_styleRuleIgnoringAtRoot = oldRule;
return result;
}

Expand Down