Version 2.11.0-169.0.dev

Merge commit 'e3fcb1a646f0111f6b7a9a226ec71b63079b0081' into 'dev'

Author: Dart CI

pkg/analyzer/lib/src/dart/resolver/prefix_expression_resolver.dart

@@ -41,8 +41,6 @@ class PrefixExpressionResolver {
 
   ErrorReporter get _errorReporter => _resolver.errorReporter;
 
-  bool get _isNonNullableByDefault => _typeSystem.isNonNullableByDefault;
-
   TypeProvider get _typeProvider => _resolver.typeProvider;
 
   TypeSystemImpl get _typeSystem => _resolver.typeSystem;
@@ -138,17 +136,6 @@ class PrefixExpressionResolver {
     }
   }
 
-  /// Return the non-nullable variant of the [type] if NNBD is enabled, otherwise
-  /// return the type itself.
-  ///
-  /// TODO(scheglov) this is duplicate
-  DartType _nonNullable(DartType type) {
-    if (_isNonNullableByDefault) {
-      return _typeSystem.promoteToNonNull(type);
-    }
-    return type;
-  }
-
   /// Record that the static type of the given node is the given type.
   ///
   /// @param expression the node whose type is to be recorded
@@ -227,7 +214,7 @@ class PrefixExpressionResolver {
         // No special handling for incremental operators.
       } else if (operator.isIncrementOperator) {
         if (node.readType.isDartCoreInt) {
-          staticType = _nonNullable(_typeProvider.intType);
+          staticType = _typeProvider.intType;
         } else {
           _checkForInvalidAssignmentIncDec(node, staticType);
         }
@@ -252,7 +239,7 @@ class PrefixExpressionResolver {
 
     _resolver.boolExpressionVerifier.checkForNonBoolNegationExpression(operand);
 
-    _recordStaticType(node, _nonNullable(_typeProvider.boolType));
+    _recordStaticType(node, _typeProvider.boolType);
 
     _flowAnalysis?.flow?.logicalNot_end(node, operand);
   }

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

@@ -377,8 +377,8 @@ class ResolverVisitor extends ScopedVisitor {
         reportConstEvaluationErrors: reportConstEvaluationErrors,
         migratableAstInfoProvider: _migratableAstInfoProvider);
     inferenceContext = InferenceContext._(this);
-    typeAnalyzer = StaticTypeAnalyzer(
-        this, featureSet, _flowAnalysis, migrationResolutionHooks);
+    typeAnalyzer =
+        StaticTypeAnalyzer(this, _flowAnalysis, migrationResolutionHooks);
   }
 
   /// Return the element representing the function containing the current node,

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

@@ -2,7 +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.
 
-import 'package:analyzer/dart/analysis/features.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/visitor.dart';
 import 'package:analyzer/dart/element/element.dart';
@@ -28,9 +27,6 @@ class StaticTypeAnalyzer extends SimpleAstVisitor<void> {
   /// The resolver driving the resolution and type analysis.
   final ResolverVisitor _resolver;
 
-  /// The feature set that should be used to resolve types.
-  final FeatureSet _featureSet;
-
   final MigrationResolutionHooks _migrationResolutionHooks;
 
   /// The object providing access to the types defined by the language.
@@ -48,17 +44,13 @@ class StaticTypeAnalyzer extends SimpleAstVisitor<void> {
   /// [_resolver] based on the
   ///
   /// @param resolver the resolver driving this participant
-  StaticTypeAnalyzer(this._resolver, this._featureSet, this._flowAnalysis,
-      this._migrationResolutionHooks) {
+  StaticTypeAnalyzer(
+      this._resolver, this._flowAnalysis, this._migrationResolutionHooks) {
     _typeProvider = _resolver.typeProvider;
     _typeSystem = _resolver.typeSystem;
     _dynamicType = _typeProvider.dynamicType;
   }
 
-  /// Is `true` if the library being analyzed is non-nullable by default.
-  bool get _isNonNullableByDefault =>
-      _featureSet.isEnabled(Feature.non_nullable);
-
   /// Given a constructor for a generic type, returns the equivalent generic
   /// function type that we could use to forward to the constructor, or for a
   /// non-generic type simply returns the constructor type.
@@ -111,7 +103,7 @@ class StaticTypeAnalyzer extends SimpleAstVisitor<void> {
   /// `String`.</blockquote>
   @override
   void visitAdjacentStrings(AdjacentStrings node) {
-    recordStaticType(node, _nonNullable(_typeProvider.stringType));
+    recordStaticType(node, _typeProvider.stringType);
   }
 
   /// The Dart Language Specification, 12.32: <blockquote>... the cast expression <i>e as T</i> ...
@@ -140,7 +132,7 @@ class StaticTypeAnalyzer extends SimpleAstVisitor<void> {
   /// bool.</blockquote>
   @override
   void visitBooleanLiteral(BooleanLiteral node) {
-    recordStaticType(node, _nonNullable(_typeProvider.boolType));
+    recordStaticType(node, _typeProvider.boolType);
   }
 
   /// The Dart Language Specification, 12.15.2: <blockquote>A cascaded method invocation expression
@@ -167,7 +159,7 @@ class StaticTypeAnalyzer extends SimpleAstVisitor<void> {
   /// double.</blockquote>
   @override
   void visitDoubleLiteral(DoubleLiteral node) {
-    recordStaticType(node, _nonNullable(_typeProvider.doubleType));
+    recordStaticType(node, _typeProvider.doubleType);
   }
 
   @override
@@ -242,9 +234,9 @@ class StaticTypeAnalyzer extends SimpleAstVisitor<void> {
     if (context == null ||
         _typeSystem.isAssignableTo2(_typeProvider.intType, context) ||
         !_typeSystem.isAssignableTo2(_typeProvider.doubleType, context)) {
-      recordStaticType(node, _nonNullable(_typeProvider.intType));
+      recordStaticType(node, _typeProvider.intType);
     } else {
-      recordStaticType(node, _nonNullable(_typeProvider.doubleType));
+      recordStaticType(node, _typeProvider.doubleType);
     }
   }
 
@@ -254,7 +246,7 @@ class StaticTypeAnalyzer extends SimpleAstVisitor<void> {
   /// The static type of an is-expression is `bool`.</blockquote>
   @override
   void visitIsExpression(IsExpression node) {
-    recordStaticType(node, _nonNullable(_typeProvider.boolType));
+    recordStaticType(node, _typeProvider.boolType);
   }
 
   @override
@@ -292,14 +284,14 @@ class StaticTypeAnalyzer extends SimpleAstVisitor<void> {
   /// `String`.</blockquote>
   @override
   void visitSimpleStringLiteral(SimpleStringLiteral node) {
-    recordStaticType(node, _nonNullable(_typeProvider.stringType));
+    recordStaticType(node, _typeProvider.stringType);
   }
 
   /// The Dart Language Specification, 12.5: <blockquote>The static type of a string literal is
   /// `String`.</blockquote>
   @override
   void visitStringInterpolation(StringInterpolation node) {
-    recordStaticType(node, _nonNullable(_typeProvider.stringType));
+    recordStaticType(node, _typeProvider.stringType);
   }
 
   @override
@@ -316,7 +308,7 @@ class StaticTypeAnalyzer extends SimpleAstVisitor<void> {
 
   @override
   void visitSymbolLiteral(SymbolLiteral node) {
-    recordStaticType(node, _nonNullable(_typeProvider.symbolType));
+    recordStaticType(node, _typeProvider.symbolType);
   }
 
   /// The Dart Language Specification, 12.10: <blockquote>The static type of `this` is the
@@ -461,13 +453,4 @@ class StaticTypeAnalyzer extends SimpleAstVisitor<void> {
       constructor.staticElement = constructorElement;
     }
   }
-
-  /// Return the non-nullable variant of the [type] if NNBD is enabled, otherwise
-  /// return the type itself.
-  DartType _nonNullable(DartType type) {
-    if (_isNonNullableByDefault) {
-      return _typeSystem.promoteToNonNull(type);
-    }
-    return type;
-  }
 }

pkg/analyzer/test/src/diagnostics/if_element_condition_from_deferred_library_test.dart

@@ -20,7 +20,7 @@ class IfElementConditionFromDeferredLibraryTest extends PubPackageResolutionTest
 mixin IfElementConditionFromDeferredLibraryTestCases
     on PubPackageResolutionTest {
   test_inList_deferred() async {
-    newFile(convertPath('$testPackageLibPath/lib1.dart'), content: r'''
+    newFile('$testPackageLibPath/lib1.dart', content: r'''
 const bool c = true;''');
     await assertErrorsInCode(r'''
 import 'lib1.dart' deferred as a;
@@ -33,7 +33,7 @@ f() {
   }
 
   test_inList_nonConst() async {
-    newFile(convertPath('$testPackageLibPath/lib1.dart'), content: r'''
+    newFile('$testPackageLibPath/lib1.dart', content: r'''
 const bool c = true;''');
     await assertNoErrorsInCode(r'''
 import 'lib1.dart' deferred as a;
@@ -43,7 +43,7 @@ f() {
   }
 
   test_inList_notDeferred() async {
-    newFile(convertPath('$testPackageLibPath/lib1.dart'), content: r'''
+    newFile('$testPackageLibPath/lib1.dart', content: r'''
 const bool c = true;''');
     await assertNoErrorsInCode(r'''
 import 'lib1.dart' as a;
@@ -53,7 +53,7 @@ f() {
   }
 
   test_inMap_deferred() async {
-    newFile(convertPath('$testPackageLibPath/lib1.dart'), content: r'''
+    newFile('$testPackageLibPath/lib1.dart', content: r'''
 const bool c = true;''');
     await assertErrorsInCode(r'''
 import 'lib1.dart' deferred as a;
@@ -66,7 +66,7 @@ f() {
   }
 
   test_inMap_notConst() async {
-    newFile(convertPath('$testPackageLibPath/lib1.dart'), content: r'''
+    newFile('$testPackageLibPath/lib1.dart', content: r'''
 const bool c = true;''');
     await assertNoErrorsInCode(r'''
 import 'lib1.dart' deferred as a;
@@ -76,7 +76,7 @@ f() {
   }
 
   test_inMap_notDeferred() async {
-    newFile(convertPath('$testPackageLibPath/lib1.dart'), content: r'''
+    newFile('$testPackageLibPath/lib1.dart', content: r'''
 const bool c = true;''');
     await assertNoErrorsInCode(r'''
 import 'lib1.dart' as a;
@@ -86,7 +86,7 @@ f() {
   }
 
   test_inSet_deferred() async {
-    newFile(convertPath('$testPackageLibPath/lib1.dart'), content: r'''
+    newFile('$testPackageLibPath/lib1.dart', content: r'''
 const bool c = true;''');
     await assertErrorsInCode(r'''
 import 'lib1.dart' deferred as a;
@@ -99,7 +99,7 @@ f() {
   }
 
   test_inSet_notConst() async {
-    newFile(convertPath('$testPackageLibPath/lib1.dart'), content: r'''
+    newFile('$testPackageLibPath/lib1.dart', content: r'''
 const bool c = true;''');
     await assertNoErrorsInCode(r'''
 import 'lib1.dart' deferred as a;
@@ -109,7 +109,7 @@ f() {
   }
 
   test_inSet_notDeferred() async {
-    newFile(convertPath('$testPackageLibPath/lib1.dart'), content: r'''
+    newFile('$testPackageLibPath/lib1.dart', content: r'''
 const bool c = true;''');
     await assertNoErrorsInCode(r'''
 import 'lib1.dart' as a;

pkg/analyzer/test/src/diagnostics/non_constant_list_element_from_deferred_library_test.dart

@@ -23,7 +23,7 @@ mixin NonConstantListElementFromDeferredLibraryTestCases
   @failingTest
   test_const_ifElement_thenTrue_deferredElse() async {
     // reports wrong error code (which is not crucial to fix)
-    newFile(convertPath('$testPackageLibPath/lib1.dart'), content: r'''
+    newFile('$testPackageLibPath/lib1.dart', content: r'''
 const int c = 1;''');
     await assertErrorsInCode(r'''
 import 'lib1.dart' deferred as a;
@@ -38,7 +38,7 @@ var v = const [ if (cond) 'a' else a.c ];
   }
 
   test_const_ifElement_thenTrue_deferredThen() async {
-    newFile(convertPath('$testPackageLibPath/lib1.dart'), content: r'''
+    newFile('$testPackageLibPath/lib1.dart', content: r'''
 const int c = 1;''');
     await assertErrorsInCode(r'''
 import 'lib1.dart' deferred as a;
@@ -53,7 +53,7 @@ var v = const [ if (cond) a.c ];
   }
 
   test_const_topLevel_deferred() async {
-    newFile(convertPath('$testPackageLibPath/lib1.dart'), content: r'''
+    newFile('$testPackageLibPath/lib1.dart', content: r'''
 const int c = 1;''');
     await assertErrorsInCode(r'''
 import 'lib1.dart' deferred as a;
@@ -67,7 +67,7 @@ var v = const [a.c];
   }
 
   test_const_topLevel_deferred_nested() async {
-    newFile(convertPath('$testPackageLibPath/lib1.dart'), content: r'''
+    newFile('$testPackageLibPath/lib1.dart', content: r'''
 const int c = 1;''');
     await assertErrorsInCode(r'''
 import 'lib1.dart' deferred as a;

pkg/analyzer/test/src/diagnostics/non_constant_map_key_from_deferred_library_test.dart

@@ -22,7 +22,7 @@ mixin NonConstantMapKeyFromDeferredLibraryTestCases
   @failingTest
   test_const_ifElement_thenTrue_deferredElse() async {
 // reports wrong error code
-    newFile(convertPath('$testPackageLibPath/lib1.dart'), content: r'''
+    newFile('$testPackageLibPath/lib1.dart', content: r'''
 const int c = 1;''');
     await assertErrorsInCode(r'''
 import 'lib1.dart' deferred as a;
@@ -35,7 +35,7 @@ var v = const { if (cond) 0: 1 else a.c : 0};
   }
 
   test_const_ifElement_thenTrue_deferredThen() async {
-    newFile(convertPath('$testPackageLibPath/lib1.dart'), content: r'''
+    newFile('$testPackageLibPath/lib1.dart', content: r'''
 const int c = 1;''');
     await assertErrorsInCode(r'''
 import 'lib1.dart' deferred as a;
@@ -48,7 +48,7 @@ var v = const { if (cond) a.c : 0};
   }
 
   test_const_topLevel_deferred() async {
-    newFile(convertPath('$testPackageLibPath/lib1.dart'), content: r'''
+    newFile('$testPackageLibPath/lib1.dart', content: r'''
 const int c = 1;''');
     await assertErrorsInCode(r'''
 import 'lib1.dart' deferred as a;
@@ -60,7 +60,7 @@ var v = const {a.c : 0};
   }
 
   test_const_topLevel_deferred_nested() async {
-    newFile(convertPath('$testPackageLibPath/lib1.dart'), content: r'''
+    newFile('$testPackageLibPath/lib1.dart', content: r'''
 const int c = 1;''');
     await assertErrorsInCode(r'''
 import 'lib1.dart' deferred as a;

pkg/analyzer/test/src/diagnostics/non_constant_map_value_from_deferred_library_test.dart

@@ -23,7 +23,7 @@ mixin NonConstantMapValueFromDeferredLibraryTestCases
   @failingTest
   test_const_ifElement_thenTrue_elseDeferred() async {
     // reports wrong error code
-    newFile(convertPath('$testPackageLibPath/lib1.dart'), content: r'''
+    newFile('$testPackageLibPath/lib1.dart', content: r'''
 const int c = 1;''');
     await assertErrorsInCode(r'''
 import 'lib1.dart' deferred as a;
@@ -36,7 +36,7 @@ var v = const { if (cond) 'a': 'b' else 'c' : a.c};
   }
 
   test_const_ifElement_thenTrue_thenDeferred() async {
-    newFile(convertPath('$testPackageLibPath/lib1.dart'), content: r'''
+    newFile('$testPackageLibPath/lib1.dart', content: r'''
 const int c = 1;''');
     await assertErrorsInCode(r'''
 import 'lib1.dart' deferred as a;
@@ -49,7 +49,7 @@ var v = const { if (cond) 'a' : a.c};
   }
 
   test_const_topLevel_deferred() async {
-    newFile(convertPath('$testPackageLibPath/lib1.dart'), content: r'''
+    newFile('$testPackageLibPath/lib1.dart', content: r'''
 const int c = 1;''');
     await assertErrorsInCode(r'''
 import 'lib1.dart' deferred as a;
@@ -61,7 +61,7 @@ var v = const {'a' : a.c};
   }
 
   test_const_topLevel_deferred_nested() async {
-    newFile(convertPath('$testPackageLibPath/lib1.dart'), content: r'''
+    newFile('$testPackageLibPath/lib1.dart', content: r'''
 const int c = 1;''');
     await assertErrorsInCode(r'''
 import 'lib1.dart' deferred as a;