Add languageVersion to CompilationUnit and make non-null

Change-Id: Ice6f866929f1f028d9b4e64685c2e815a08279f6
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/392000
Reviewed-by: Konstantin Shcheglov <[email protected]>
Reviewed-by: Johnni Winther <[email protected]>
Reviewed-by: Bob Nystrom <[email protected]>
Commit-Queue: Brian Wilkerson <[email protected]>

Author: DanTup

pkg/analysis_server/lib/src/g3/utilities.dart

@@ -6,6 +6,7 @@ import 'package:analysis_server/src/services/correction/organize_imports.dart';
 import 'package:analyzer/dart/analysis/features.dart';
 import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/ast/ast.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/error/error.dart';
 import 'package:analyzer/error/listener.dart';
 import 'package:analyzer/source/line_info.dart';
@@ -61,12 +62,17 @@ ParseStringResult sortDirectives(String contents, {String? fileName}) {
     );
   var token = scanner.tokenize(reportScannerErrors: false);
   var lineInfo = LineInfo(scanner.lineStarts);
+  var languageVersion = LibraryLanguageVersion(
+    package: ExperimentStatus.currentVersion,
+    override: scanner.overrideVersion,
+  );
 
   var parser = p.Parser(
     source,
     errorListener,
     featureSet: scanner.featureSet,
     lineInfo: lineInfo,
+    languageVersion: languageVersion,
   );
 
   var unit = parser.parseCompilationUnit(token);

pkg/analyzer/lib/dart/analysis/utilities.dart

@@ -9,10 +9,12 @@ import 'package:analyzer/dart/analysis/analysis_context.dart';
 import 'package:analyzer/dart/analysis/analysis_context_collection.dart';
 import 'package:analyzer/dart/analysis/features.dart';
 import 'package:analyzer/dart/analysis/results.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/error/listener.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/file_system/physical_file_system.dart';
 import 'package:analyzer/source/line_info.dart';
+import 'package:analyzer/src/dart/analysis/experiments.dart';
 import 'package:analyzer/src/dart/analysis/results.dart';
 import 'package:analyzer/src/dart/scanner/reader.dart';
 import 'package:analyzer/src/dart/scanner/scanner.dart';
@@ -85,11 +87,15 @@ ParseStringResult parseString(
       featureSet: featureSet,
     );
   var token = scanner.tokenize();
+  var languageVersion = LibraryLanguageVersion(
+      package: ExperimentStatus.currentVersion,
+      override: scanner.overrideVersion);
   var lineInfo = LineInfo(scanner.lineStarts);
   var parser = Parser(
     source,
     errorCollector,
     featureSet: scanner.featureSet,
+    languageVersion: languageVersion,
     lineInfo: lineInfo,
   );
   var unit = parser.parseCompilationUnit(token);

pkg/analyzer/lib/src/dart/analysis/file_state.dart

@@ -674,19 +674,20 @@ class FileState {
         );
       Token token = scanner.tokenize(reportScannerErrors: false);
       LineInfo lineInfo = LineInfo(scanner.lineStarts);
+      var languageVersion = LibraryLanguageVersion(
+        package: packageLanguageVersion,
+        override: scanner.overrideVersion,
+      );
 
       Parser parser = Parser(
         source,
         errorListener,
         featureSet: scanner.featureSet,
         lineInfo: lineInfo,
+        languageVersion: languageVersion,
       );
 
       var unit = parser.parseCompilationUnit(token);
-      unit.languageVersion = LibraryLanguageVersion(
-        package: packageLanguageVersion,
-        override: scanner.overrideVersion,
-      );
 
       // Ensure the string canonicalization cache size is reasonable.
       pruneStringCanonicalizationCache();

pkg/analyzer/lib/src/dart/ast/ast.dart

@@ -3394,6 +3394,9 @@ abstract final class CompilationUnit implements AstNode {
   /// `@dart` directive in a comment at the top of the file.
   FeatureSet get featureSet;
 
+  /// The language version information.
+  LibraryLanguageVersion get languageVersion;
+
   /// The language version override specified for this compilation unit using a
   /// token like '// @dart = 2.7', or `null` if no override is specified.
   LanguageVersionToken? get languageVersionToken;
@@ -3432,8 +3435,8 @@ final class CompilationUnitImpl extends AstNodeImpl
   @override
   final LineInfo lineInfo;
 
-  /// The language version information.
-  LibraryLanguageVersion? languageVersion;
+  @override
+  final LibraryLanguageVersion languageVersion;
 
   @override
   final FeatureSet featureSet;
@@ -3465,6 +3468,7 @@ final class CompilationUnitImpl extends AstNodeImpl
     required this.featureSet,
     required this.lineInfo,
     required this.invalidNodes,
+    required this.languageVersion,
   }) : _scriptTag = scriptTag {
     _becomeParentOf(_scriptTag);
     _directives._initialize(this, directives);

pkg/analyzer/lib/src/fasta/ast_builder.dart

@@ -58,6 +58,7 @@ import 'package:_fe_analyzer_shared/src/scanner/token_constants.dart';
 import 'package:_fe_analyzer_shared/src/util/null_value.dart';
 import 'package:analyzer/dart/analysis/features.dart';
 import 'package:analyzer/dart/ast/token.dart' show Token, TokenType;
+import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/error/error.dart';
 import 'package:analyzer/error/listener.dart';
 import 'package:analyzer/source/line_info.dart';
@@ -164,12 +165,14 @@ class AstBuilder extends StackListener {
 
   final FeatureSet _featureSet;
 
+  final LibraryLanguageVersion _languageVersion;
+
   final LineInfo _lineInfo;
 
   Token? _enclosingDeclarationAugmentToken;
 
   AstBuilder(ErrorReporter? errorReporter, this.fileUri, this.isFullAst,
-      this._featureSet, this._lineInfo,
+      this._featureSet, this._languageVersion, this._lineInfo,
       [Uri? uri])
       : errorReporter = FastaErrorReporter(errorReporter),
         enableAugmentations = _featureSet.isEnabled(Feature.augmentations),
@@ -1412,6 +1415,7 @@ class AstBuilder extends StackListener {
       endToken: endToken,
       featureSet: _featureSet,
       lineInfo: _lineInfo,
+      languageVersion: _languageVersion,
       invalidNodes: invalidNodes,
     );
     push(unit);
@@ -5791,6 +5795,7 @@ class AstBuilder extends StackListener {
       errorReporter.errorReporter,
       uri,
       _featureSet,
+      _languageVersion,
       _lineInfo,
       dartdoc,
     ).build();

pkg/analyzer/lib/src/fasta/doc_comment_builder.dart

@@ -12,6 +12,7 @@ import 'package:_fe_analyzer_shared/src/scanner/token_constants.dart';
 import 'package:analyzer/dart/analysis/features.dart';
 import 'package:analyzer/dart/ast/doc_comment.dart';
 import 'package:analyzer/dart/ast/token.dart' show Token, TokenType;
+import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/error/listener.dart';
 import 'package:analyzer/source/line_info.dart';
 import 'package:analyzer/src/dart/ast/ast.dart';
@@ -112,6 +113,7 @@ final class DocCommentBuilder {
   final ErrorReporter? _errorReporter;
   final Uri _uri;
   final FeatureSet _featureSet;
+  final LibraryLanguageVersion _languageVersion;
   final LineInfo _lineInfo;
   final List<CommentReferenceImpl> _references = [];
   final List<MdCodeBlock> _codeBlocks = [];
@@ -128,6 +130,7 @@ final class DocCommentBuilder {
     this._errorReporter,
     this._uri,
     this._featureSet,
+    this._languageVersion,
     this._lineInfo,
     this._startToken,
   ) : _characterSequence = _CharacterSequence(_startToken);
@@ -432,6 +435,7 @@ final class DocCommentBuilder {
       _uri,
       true /* isFullAst */,
       _featureSet,
+      _languageVersion,
       _lineInfo,
     );
     var parser = Parser(docImportListener);

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

@@ -6,6 +6,7 @@ import 'package:_fe_analyzer_shared/src/parser/parser.dart' as fasta;
 import 'package:_fe_analyzer_shared/src/parser/type_info.dart' as fasta;
 import 'package:analyzer/dart/analysis/features.dart';
 import 'package:analyzer/dart/ast/token.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/error/listener.dart';
 import 'package:analyzer/source/line_info.dart';
 import 'package:analyzer/source/source.dart';
@@ -30,12 +31,14 @@ class Parser {
   Parser(Source source, AnalysisErrorListener errorListener,
       {required FeatureSet featureSet,
       bool allowNativeClause = true,
+      required LibraryLanguageVersion languageVersion,
       required LineInfo lineInfo})
       : astBuilder = AstBuilder(
           ErrorReporter(errorListener, source),
           source.uri,
           true,
           featureSet,
+          languageVersion,
           lineInfo,
         ) {
     fastaParser = fasta.Parser(

pkg/analyzer/lib/src/summary2/library_builder.dart

@@ -1321,7 +1321,7 @@ class LibraryBuilder with MacroApplicationsContainer {
       libraryUnitNode.featureSet,
     );
     libraryElement.isSynthetic = !libraryFile.exists;
-    libraryElement.languageVersion = libraryUnitNode.languageVersion!;
+    libraryElement.languageVersion = libraryUnitNode.languageVersion;
     _bindReference(libraryReference, libraryElement);
     elementFactory.setLibraryTypeSystem(libraryElement);