Skip to content

Migrate mustachio to null safety #2801

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

Merged
merged 4 commits into from
Sep 22, 2021
Merged

Migrate mustachio to null safety #2801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
846871c
Migrat mustachio to null safety
srawlins Sep 20, 2021
a81cf82
Comments
srawlins Sep 20, 2021
de40a9e
Merge branch 'nnbd' into null-safety-mustachio
srawlins Sep 22, 2021
6d7ee73
cool-fix
srawlins Sep 22, 2021
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
8 changes: 3 additions & 5 deletions lib/src/mustachio/annotations.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

// @dart=2.9

// See the Mustachio README at tool/mustachio/README.md for high-level
// documentation.

Expand Down Expand Up @@ -95,7 +93,7 @@ class RendererSpec {

final String standardMdTemplate;

final Map<TemplateFormat, Uri> standardTemplateUris;
final Map<TemplateFormat, Uri?> standardTemplateUris;

RendererSpec(
this.name,
Expand All @@ -111,8 +109,8 @@ class RendererSpec {
/// Parses a URI from a String which comes from a const annotation object.
///
/// The String value may be the literal value, 'null'.
static Uri _parseUriFromAnnotation(String unparsed) =>
unparsed == 'null' || unparsed == null ? null : Uri.parse(unparsed);
static Uri? _parseUriFromAnnotation(String unparsed) =>
unparsed == 'null' ? null : Uri.parse(unparsed);

ClassElement get contextElement => contextType.element;
}
Expand Down
37 changes: 18 additions & 19 deletions lib/src/mustachio/parser.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

// @dart=2.9

// See the Mustachio README at tool/mustachio/README.md for high-level
// documentation.

Expand Down Expand Up @@ -50,7 +48,7 @@ class MustachioParser {
/// [sectionKey], the end tag is treated as plain text, not a tag.
/// * if [sectionKey] is null, the end tag is treated as plain text, not a
/// tag.
List<MustachioNode> _parseBlock({String /*?*/ sectionKey}) {
List<MustachioNode> _parseBlock({String? sectionKey}) {
var children = <MustachioNode>[];
var textStartIndex = _index;
var textEndIndex = _index;
Expand Down Expand Up @@ -128,7 +126,7 @@ class MustachioParser {
trimTextRight();
}
addTextNode(textStartIndex, textEndIndex);
children.add(result.node);
children.add(result.node!);
textStartIndex = _index;
continue;
}
Expand Down Expand Up @@ -193,7 +191,7 @@ class MustachioParser {
///
/// [_index] should be at the character immediately following the `>`
/// character which opens a possible partial tag.
_TagParseResult _parsePartial({@required int tagStartIndex}) {
_TagParseResult _parsePartial({required int tagStartIndex}) {
var startIndex = _index;
int endIndex;
while (true) {
Expand Down Expand Up @@ -229,7 +227,7 @@ class MustachioParser {
/// [_index] should be at the character immediately following the `#`
/// character which opens a possible section tag.
_TagParseResult _parseSection(
{@required bool invert, @required int tagStartIndex}) {
{required bool invert, required int tagStartIndex}) {
var parsedKey = _parseKey();
if (parsedKey.type == _KeyParseResultType.notKey) {
return _TagParseResult.notTag;
Expand All @@ -239,6 +237,7 @@ class MustachioParser {

var children = _parseBlock(sectionKey: parsedKey.joinedNames);
var span = _sourceFile.span(tagStartIndex, _index);
var parsedKeySpan = parsedKey.span!;

if (parsedKey.names.length > 1) {
// Desugar section with dots into nested sections.
Expand All @@ -252,7 +251,7 @@ class MustachioParser {
// [three] section is the singular child node of the [two] section, and
// the [two] section is the singular child of the [one] section.
var lastName = parsedKey.names.last;
var keySpanEndOffset = parsedKey.span.end.offset;
var keySpanEndOffset = parsedKeySpan.end.offset;
var lastNameSpan = _sourceFile.span(
keySpanEndOffset - lastName.length, keySpanEndOffset);
var section = Section([lastName], children,
Expand All @@ -262,7 +261,7 @@ class MustachioParser {
// To find the start offset of the ith name, take the length of all of
// the names 0 through `i - 1` re-joined with '.', and a final '.' at
// the end.
var sectionKeyStartOffset = parsedKey.span.start.offset +
var sectionKeyStartOffset = parsedKeySpan.start.offset +
(i == 0 ? 0 : parsedKey.names.take(i).join('.').length + 1);
var keySpan = _sourceFile.span(
sectionKeyStartOffset, sectionKeyStartOffset + sectionKey.length);
Expand All @@ -273,7 +272,7 @@ class MustachioParser {
}

return _TagParseResult.ok(Section(parsedKey.names, children,
invert: invert, span: span, keySpan: parsedKey.span));
invert: invert, span: span, keySpan: parsedKeySpan));
}

/// Tries to parse an end tag at [_index].
Expand All @@ -295,7 +294,7 @@ class MustachioParser {
///
/// [_index] should be at the character immediately following the `{{`
/// characters which open a possible variable tag.
_TagParseResult _parseVariable({@required int tagStartIndex}) {
_TagParseResult _parseVariable({required int tagStartIndex}) {
var escape = true;
if (_thisChar == $lbrace) {
escape = false;
Expand All @@ -311,7 +310,7 @@ class MustachioParser {

var span = _sourceFile.span(tagStartIndex, _index);
return _TagParseResult.ok(Variable(parsedKey.names,
escape: escape, span: span, keySpan: parsedKey.span));
escape: escape, span: span, keySpan: parsedKey.span!));
}

/// Tries to parse a key at [_index].
Expand Down Expand Up @@ -436,7 +435,7 @@ class Text implements MustachioNode {
@override
final SourceSpan span;

Text(this.content, {@required this.span});
Text(this.content, {required this.span});

@override
String toString() => 'Text["$content"]';
Expand All @@ -457,7 +456,7 @@ class Variable with HasMultiNamedKey implements MustachioNode {
final SourceSpan keySpan;

Variable(this.key,
{@required this.escape, @required this.span, @required this.keySpan});
{required this.escape, required this.span, required this.keySpan});

@override
String toString() => 'Variable[$key, escape=$escape]';
Expand All @@ -481,7 +480,7 @@ class Section with HasMultiNamedKey implements MustachioNode {
final SourceSpan keySpan;

Section(this.key, this.children,
{@required this.invert, @required this.span, @required this.keySpan});
{required this.invert, required this.span, required this.keySpan});

@override
String toString() => 'Section[$key, invert=$invert]';
Expand All @@ -497,7 +496,7 @@ class Partial implements MustachioNode {

final SourceSpan keySpan;

Partial(this.key, {@required this.span, @required this.keySpan});
Partial(this.key, {required this.span, required this.keySpan});
}

/// An enumeration of types of tag parse results.
Expand All @@ -519,10 +518,10 @@ class _TagParseResult {
/// This field is `null` if EOF was reached, or if a tag was not parsed
/// (perhaps it started out like a tag, but was malformed, and so is read as
/// text).
final MustachioNode /*?*/ node;
final MustachioNode? node;

/// The key of an end tag, if an end tag was parsed.
final String /*?*/ endTagKey;
final String? endTagKey;

_TagParseResult(this.type, this.node, this.endTagKey);

Expand Down Expand Up @@ -564,12 +563,12 @@ class _KeyParseResult {

/// The source span from where this key was parsed, if this represents a
/// parsed key, othwerwise `null`.
final SourceSpan /*?*/ span;
final SourceSpan? span;

const _KeyParseResult._(this.type, this.names, {this.span});

factory _KeyParseResult(_KeyParseResultType type, String key,
{@required SourceSpan span}) {
{required SourceSpan span}) {
if (key == '.') {
return _KeyParseResult._(type, [key], span: span);
} else {
Expand Down
Loading