DAS plugins: Bump language version to 3.9

Change-Id: I880e53634c570cc25f4ff22dd01397b088b9bd07
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/447441
Reviewed-by: Brian Wilkerson <[email protected]>
Commit-Queue: Samuel Rawlins <[email protected]>

Author: srawlins

pkg/analysis_server_plugin/CHANGELOG.md

@@ -1,6 +1,7 @@
 ## 0.2.3-dev
 
 - Require version `8.2.0` of the `analyzer` package.
+- Require Dart SDK `^3.9.0`.
 - Add support for automatic re-analysis of files changed on-disk (as opposed to
   file contents changed in the IDE, which is already supported).
 

pkg/analysis_server_plugin/analysis_options.yaml

@@ -30,4 +30,5 @@ linter:
     - unnecessary_library_directive
     - unnecessary_parenthesis
     - unreachable_from_main
+    - use_null_aware_elements
 

pkg/analysis_server_plugin/lib/edit/correction_utils.dart

@@ -31,8 +31,8 @@ final class CorrectionUtils {
   String? _endOfLine;
 
   CorrectionUtils(ParsedUnitResult result)
-      : _unit = result.unit,
-        _buffer = result.content;
+    : _unit = result.unit,
+      _buffer = result.content;
 
   /// The EOL sequence to use for this [CompilationUnit].
   String get endOfLine {
@@ -131,8 +131,10 @@ final class CorrectionUtils {
 
   /// Returns a [SourceRange] that covers [sourceRange] and extends (if
   /// possible) to cover whole lines.
-  SourceRange getLinesRange(SourceRange sourceRange,
-      {bool skipLeadingEmptyLines = false}) {
+  SourceRange getLinesRange(
+    SourceRange sourceRange, {
+    bool skipLeadingEmptyLines = false,
+  }) {
     // Calculate the start:
     var startOffset = sourceRange.offset;
     var startLineOffset = getLineContentStart(startOffset);
@@ -143,8 +145,9 @@ final class CorrectionUtils {
     var endOffset = sourceRange.end;
     var afterEndLineOffset = endOffset;
     var lineInfo = _unit.lineInfo;
-    var lineStart = lineInfo
-        .getOffsetOfLine(lineInfo.getLocation(startLineOffset).lineNumber - 1);
+    var lineStart = lineInfo.getOffsetOfLine(
+      lineInfo.getLocation(startLineOffset).lineNumber - 1,
+    );
     if (lineStart == startLineOffset) {
       // Only consume line endings after the end of the range if there is
       // nothing else on the line containing the beginning of the range.
@@ -184,10 +187,7 @@ final class CorrectionUtils {
 
   /// Returns the text of the given [AstNode] in the unit, including preceding
   /// comments.
-  String getNodeText(
-    AstNode node, {
-    bool withLeadingComments = false,
-  }) {
+  String getNodeText(AstNode node, {bool withLeadingComments = false}) {
     var firstToken = withLeadingComments
         ? node.beginToken.precedingComments ?? node.beginToken
         : node.beginToken;
@@ -252,8 +252,13 @@ final class CorrectionUtils {
   /// Usually [includeLeading] and [ensureTrailingNewline] are set together,
   /// when indenting a set of statements to go inside a block (as opposed to
   /// just wrapping a nested expression that might span multiple lines).
-  String replaceSourceIndent(String source, String oldIndent, String newIndent,
-      {bool includeLeading = false, bool ensureTrailingNewline = false}) {
+  String replaceSourceIndent(
+    String source,
+    String oldIndent,
+    String newIndent, {
+    bool includeLeading = false,
+    bool ensureTrailingNewline = false,
+  }) {
     // Prepare token ranges.
     var lineRanges = <SourceRange>[];
     {
@@ -323,12 +328,20 @@ final class CorrectionUtils {
   /// when indenting a set of statements to go inside a block (as opposed to
   /// just wrapping a nested expression that might span multiple lines).
   String replaceSourceRangeIndent(
-      SourceRange range, String oldIndent, String newIndent,
-      {bool includeLeading = false, bool ensureTrailingNewline = false}) {
+    SourceRange range,
+    String oldIndent,
+    String newIndent, {
+    bool includeLeading = false,
+    bool ensureTrailingNewline = false,
+  }) {
     var oldSource = getRangeText(range);
-    return replaceSourceIndent(oldSource, oldIndent, newIndent,
-        includeLeading: includeLeading,
-        ensureTrailingNewline: ensureTrailingNewline);
+    return replaceSourceIndent(
+      oldSource,
+      oldIndent,
+      newIndent,
+      includeLeading: includeLeading,
+      ensureTrailingNewline: ensureTrailingNewline,
+    );
   }
 
   /// Returns the [_InvertedCondition] for the given logical expression.
@@ -367,13 +380,21 @@ final class CorrectionUtils {
         ls = _invertCondition0(le);
         rs = _invertCondition0(re);
         return _InvertedCondition._binary(
-            TokenType.BAR_BAR.precedence, ls, ' || ', rs);
+          TokenType.BAR_BAR.precedence,
+          ls,
+          ' || ',
+          rs,
+        );
       }
       if (operator == TokenType.BAR_BAR) {
         ls = _invertCondition0(le);
         rs = _invertCondition0(re);
         return _InvertedCondition._binary(
-            TokenType.AMPERSAND_AMPERSAND.precedence, ls, ' && ', rs);
+          TokenType.AMPERSAND_AMPERSAND.precedence,
+          ls,
+          ' && ',
+          rs,
+        );
       }
     } else if (expression is IsExpression) {
       var expressionSource = getNodeText(expression.expression);
@@ -432,14 +453,15 @@ class TokenUtils {
   static List<Token> getTokens(String s, FeatureSet featureSet) {
     try {
       var tokens = <Token>[];
-      var scanner = Scanner(
-        _SourceMock(),
-        CharSequenceReader(s),
-        DiagnosticListener.nullListener,
-      )..configureFeatures(
-          featureSetForOverriding: featureSet,
-          featureSet: featureSet,
-        );
+      var scanner =
+          Scanner(
+            _SourceMock(),
+            CharSequenceReader(s),
+            DiagnosticListener.nullListener,
+          )..configureFeatures(
+            featureSetForOverriding: featureSet,
+            featureSet: featureSet,
+          );
       var token = scanner.tokenize();
       while (!token.isEof) {
         tokens.add(token);
@@ -460,25 +482,37 @@ class _InvertedCondition {
 
   _InvertedCondition(this._precedence, this._source);
 
-  static _InvertedCondition _binary(int precedence, _InvertedCondition left,
-      String operation, _InvertedCondition right) {
-    var src = _parenthesizeIfRequired(left, precedence) +
+  static _InvertedCondition _binary(
+    int precedence,
+    _InvertedCondition left,
+    String operation,
+    _InvertedCondition right,
+  ) {
+    var src =
+        _parenthesizeIfRequired(left, precedence) +
         operation +
         _parenthesizeIfRequired(right, precedence);
     return _InvertedCondition(precedence, src);
   }
 
   static _InvertedCondition _binary2(
-      _InvertedCondition left, String operation, _InvertedCondition right) {
+    _InvertedCondition left,
+    String operation,
+    _InvertedCondition right,
+  ) {
     // TODO(scheglov): consider merging with "_binary()" after testing
     return _InvertedCondition(
-        1 << 20, '${left._source}$operation${right._source}');
+      1 << 20,
+      '${left._source}$operation${right._source}',
+    );
   }
 
   /// Adds enclosing parenthesis if the precedence of the [_InvertedCondition]
   /// if less than the precedence of the expression we are going it to use in.
   static String _parenthesizeIfRequired(
-      _InvertedCondition expr, int newOperatorPrecedence) {
+    _InvertedCondition expr,
+    int newOperatorPrecedence,
+  ) {
     if (expr._precedence < newOperatorPrecedence) {
       return '(${expr._source})';
     }

pkg/analysis_server_plugin/lib/edit/dart/correction_producer.dart

@@ -168,8 +168,10 @@ sealed class CorrectionProducer<T extends ParsedUnitResult>
     }
     var diagnosticOffset = diagnostic.problemMessage.offset;
     var diagnosticLength = diagnostic.problemMessage.length;
-    return _coveringNode =
-        unit.nodeCovering(offset: diagnosticOffset, length: diagnosticLength);
+    return _coveringNode = unit.nodeCovering(
+      offset: diagnosticOffset,
+      length: diagnosticLength,
+    );
   }
 
   /// The length of the source range associated with the diagnostic being
@@ -242,15 +244,15 @@ final class CorrectionProducerContext {
     required Token token,
     required int selectionOffset,
     required int selectionLength,
-  })  : _libraryResult = libraryResult,
-        _unitResult = unitResult,
-        _sessionHelper = AnalysisSessionHelper(unitResult.session),
-        _utils = dartFixContext?.correctionUtils ?? CorrectionUtils(unitResult),
-        _applyingBulkFixes = applyingBulkFixes,
-        _diagnostic = diagnostic,
-        _token = token,
-        _selectionOffset = selectionOffset,
-        _selectionLength = selectionLength;
+  }) : _libraryResult = libraryResult,
+       _unitResult = unitResult,
+       _sessionHelper = AnalysisSessionHelper(unitResult.session),
+       _utils = dartFixContext?.correctionUtils ?? CorrectionUtils(unitResult),
+       _applyingBulkFixes = applyingBulkFixes,
+       _diagnostic = diagnostic,
+       _token = token,
+       _selectionOffset = selectionOffset,
+       _selectionLength = selectionLength;
 
   String get path => _unitResult.path;
 
@@ -296,8 +298,10 @@ final class CorrectionProducerContext {
     int selectionOffset = -1,
     int selectionLength = 0,
   }) {
-    var node = unitResult.unit
-        .nodeCovering(offset: selectionOffset, length: selectionLength);
+    var node = unitResult.unit.nodeCovering(
+      offset: selectionOffset,
+      length: selectionLength,
+    );
     node ??= unitResult.unit;
 
     var token = _tokenAt(node, selectionOffset) ?? node.beginToken;
@@ -445,7 +449,8 @@ abstract class ResolvedCorrectionProducer
   /// Returns the extension declaration for the given [fragment], or `null` if
   /// there is no such extension.
   Future<ExtensionDeclaration?> getExtensionDeclaration(
-      ExtensionFragment fragment) async {
+    ExtensionFragment fragment,
+  ) async {
     var result = await sessionHelper.getFragmentDeclaration(fragment);
     var node = result?.node;
     if (node is ExtensionDeclaration) {
@@ -457,7 +462,8 @@ abstract class ResolvedCorrectionProducer
   /// Returns the extension type for the given [fragment], or `null` if there
   /// is no such extension type.
   Future<ExtensionTypeDeclaration?> getExtensionTypeDeclaration(
-      ExtensionTypeFragment fragment) async {
+    ExtensionTypeFragment fragment,
+  ) async {
     var result = await sessionHelper.getFragmentDeclaration(fragment);
     var node = result?.node;
     if (node is ExtensionTypeDeclaration) {
@@ -588,11 +594,10 @@ abstract class ResolvedCorrectionProducer
         } else if (assignment.writeType case var expectedType?) {
           // `v += myFunction();`.
           var method = assignment.element;
-          if (method
-              case MethodElement(
-                :var returnType,
-                formalParameters: List(length: 1, :var first),
-              )) {
+          if (method case MethodElement(
+            :var returnType,
+            formalParameters: List(length: 1, :var first),
+          )) {
             if (typeSystem.isAssignableTo(returnType, expectedType)) {
               // The return type is assignable to the expected type, then use
               // the expected parameter type.
@@ -708,10 +713,13 @@ abstract class ResolvedCorrectionProducer
   /// Looks if the [expression] is directly inside a closure and returns the
   /// return type of the closure.
   DartType? _closureReturnType(Expression expression) {
-    if (expression.enclosingClosure
-        case FunctionExpression(:var correspondingParameter, :var staticType)) {
-      if (correspondingParameter?.type ?? staticType
-          case FunctionType(:var returnType)) {
+    if (expression.enclosingClosure case FunctionExpression(
+      :var correspondingParameter,
+      :var staticType,
+    )) {
+      if (correspondingParameter?.type ?? staticType case FunctionType(
+        :var returnType,
+      )) {
         return returnType;
       }
     }
@@ -757,7 +765,7 @@ sealed class _AbstractCorrectionProducer<T extends ParsedUnitResult> {
   final CorrectionProducerContext _context;
 
   _AbstractCorrectionProducer({required CorrectionProducerContext context})
-      : _context = context;
+    : _context = context;
 
   /// Whether the fixes are being built for the bulk-fix request.
   bool get applyingBulkFixes => _context._applyingBulkFixes;
@@ -796,10 +804,11 @@ sealed class _AbstractCorrectionProducer<T extends ParsedUnitResult> {
 
   CorrectionUtils get utils => _context._utils;
 
-  CodeStyleOptions getCodeStyleOptions(File file) =>
-      sessionHelper.session.analysisContext
-          .getAnalysisOptionsForFile(file)
-          .codeStyleOptions;
+  CodeStyleOptions getCodeStyleOptions(File file) => sessionHelper
+      .session
+      .analysisContext
+      .getAnalysisOptionsForFile(file)
+      .codeStyleOptions;
 
   /// Returns the function body of the most deeply nested method or function
   /// that encloses the [node], or `null` if the node is not in a method or

pkg/analysis_server_plugin/lib/edit/fix/dart_fix_context.dart

@@ -50,7 +50,7 @@ class DartFixContext implements FixContext {
   /// least some getFixes requsts. Caching the response can speed up such
   /// requests.
   final Map<String, Future<Map<LibraryElement, Element>>>
-      _cachedTopLevelDeclarations = {};
+  _cachedTopLevelDeclarations = {};
 
   @override
   final Diagnostic diagnostic;
@@ -64,8 +64,8 @@ class DartFixContext implements FixContext {
     required Diagnostic error,
     this.autoTriggered = false,
     CorrectionUtils? correctionUtils,
-  })  : diagnostic = error,
-        correctionUtils = correctionUtils ?? CorrectionUtils(unitResult);
+  }) : diagnostic = error,
+       correctionUtils = correctionUtils ?? CorrectionUtils(unitResult);
 
   @override
   Diagnostic get error => diagnostic;
@@ -95,9 +95,7 @@ class DartFixContext implements FixContext {
     await analysisDriver.discoverAvailableFiles();
 
     var fsState = analysisDriver.fsState;
-    var filter = FileStateFilter(
-      fsState.getFileForPath(unitResult.path),
-    );
+    var filter = FileStateFilter(fsState.getFileForPath(unitResult.path));
 
     for (var file in fsState.knownFiles.toList()) {
       if (!filter.shouldInclude(file)) {

pkg/analysis_server_plugin/lib/src/correction/assist_generators.dart

@@ -24,13 +24,13 @@ class _RegisteredAssistGenerators {
   /// A mapping from registered _assist_ producer generators to the [LintCode]s
   /// for which they may also act as a _fix_ producer generator.
   Map<ProducerGenerator, Set<LintCode>> get lintRuleMap => _lintRuleMap ??= {
-        for (var generator in producerGenerators)
-          generator: {
-            for (var MapEntry(key: lintName, value: generators)
-                in registeredFixGenerators.lintProducers.entries)
-              if (generators.contains(generator)) lintName,
-          },
-      };
+    for (var generator in producerGenerators)
+      generator: {
+        for (var MapEntry(key: lintName, value: generators)
+            in registeredFixGenerators.lintProducers.entries)
+          if (generators.contains(generator)) lintName,
+      },
+  };
 
   void registerGenerator(ProducerGenerator generator) {
     producerGenerators.add(generator);