Skip to content

Commit 5780cac

Browse files
stereotype441commit-bot@chromium.org
authored andcommitted
Don't pass null to fasta.Parser.
Fixes null safety errors arising from the migration of _fe_analyzer_shared. Change-Id: I7da6b7f2d7c23d5d8f6ed120e03aed754aff5b82 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/176061 Commit-Queue: Paul Berry <[email protected]> Commit-Queue: Ivan Inozemtsev <[email protected]> Auto-Submit: Paul Berry <[email protected]> Reviewed-by: Ivan Inozemtsev <[email protected]>
1 parent e89179d commit 5780cac

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

pkg/_fe_analyzer_shared/lib/src/parser/parser_impl.dart

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,8 @@ class Parser {
297297
return cachedRewriter ??= new TokenStreamRewriterImpl();
298298
}
299299

300-
Parser(this.listener);
300+
Parser(this.listener)
301+
: assert(listener != null); // ignore:unnecessary_null_comparison
301302

302303
bool get inGenerator {
303304
return asyncState == AsyncModifier.AsyncStar ||

pkg/analyzer/lib/src/generated/parser.dart

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,16 +117,15 @@ class Parser {
117117
Token currentToken;
118118

119119
/// The fasta parser being wrapped.
120-
final fasta.Parser fastaParser;
120+
/*late final*/ fasta.Parser fastaParser;
121121

122122
/// The builder which creates the analyzer AST data structures
123123
/// based on the Fasta parser.
124124
final AstBuilder astBuilder;
125125

126126
Parser(Source source, AnalysisErrorListener errorListener,
127127
{@required FeatureSet featureSet, bool allowNativeClause = true})
128-
: fastaParser = fasta.Parser(null),
129-
astBuilder = AstBuilder(
128+
: astBuilder = AstBuilder(
130129
ErrorReporter(
131130
errorListener,
132131
source,
@@ -136,7 +135,7 @@ class Parser {
136135
source.uri,
137136
true,
138137
featureSet) {
139-
fastaParser.listener = astBuilder;
138+
fastaParser = fasta.Parser(astBuilder);
140139
astBuilder.parser = fastaParser;
141140
astBuilder.allowNativeClause = allowNativeClause;
142141
}

pkg/analyzer/test/generated/parser_fasta_test.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2075,10 +2075,9 @@ class FastaParserTestCase
20752075
source,
20762076
isNonNullableByDefault: false,
20772077
);
2078-
fasta.Parser parser = fasta.Parser(null);
20792078
AstBuilder astBuilder =
20802079
AstBuilder(errorReporter, source.uri, true, featureSet);
2081-
parser.listener = astBuilder;
2080+
fasta.Parser parser = fasta.Parser(astBuilder);
20822081
astBuilder.parser = parser;
20832082
astBuilder.allowNativeClause = allowNativeClause;
20842083
parser.parseUnit(_fastaTokens);

0 commit comments

Comments
 (0)