Version 2.13.0-110.0.dev

Merge commit '3f5694c8277ad181fca994e660bf0c7a7169571a' into 'dev'

Author: Dart CI

pkg/analysis_server/lib/src/computer/computer_signature.dart

@@ -49,17 +49,17 @@ class DartUnitSignatureComputer {
     final args = argsNode;
     String name;
     ExecutableElement execElement;
-    if (args.parent is MethodInvocation) {
-      MethodInvocation method = args.parent;
-      name = method.methodName.name;
-      execElement = ElementLocator.locate(method) as ExecutableElement;
-    } else if (args.parent is InstanceCreationExpression) {
-      InstanceCreationExpression constructor = args.parent;
-      name = constructor.constructorName.type.name.name;
-      if (constructor.constructorName.name != null) {
-        name += '.${constructor.constructorName.name.name}';
+    final parent = args.parent;
+    if (parent is MethodInvocation) {
+      name = parent.methodName.name;
+      var element = ElementLocator.locate(parent);
+      execElement = element is ExecutableElement ? element : null;
+    } else if (parent is InstanceCreationExpression) {
+      name = parent.constructorName.type.name.name;
+      if (parent.constructorName.name != null) {
+        name += '.${parent.constructorName.name.name}';
       }
-      execElement = ElementLocator.locate(constructor) as ExecutableElement;
+      execElement = ElementLocator.locate(parent) as ExecutableElement;
     }
 
     if (execElement == null) {

pkg/analysis_server/lib/src/status/element_writer.dart

@@ -53,7 +53,6 @@ class ElementWriter extends GeneralizingElementVisitor with TreeWriter {
       properties['isStatic'] = element.isStatic;
     }
     if (element is CompilationUnitElement) {
-      properties['hasLoadLibraryFunction'] = element.hasLoadLibraryFunction;
       properties['source'] = element.source;
     }
     if (element is ConstFieldElementImpl) {
@@ -109,7 +108,6 @@ class ElementWriter extends GeneralizingElementVisitor with TreeWriter {
       properties['definingCompilationUnit'] = element.definingCompilationUnit;
       properties['entryPoint'] = element.entryPoint;
       properties['hasExtUri'] = element.hasExtUri;
-      properties['hasLoadLibraryFunction'] = element.hasLoadLibraryFunction;
       properties['isBrowserApplication'] = element.isBrowserApplication;
       properties['isDartAsync'] = element.isDartAsync;
       properties['isDartCore'] = element.isDartCore;

pkg/analysis_server/test/lsp/signature_help_test.dart

@@ -84,6 +84,31 @@ class SignatureHelpTest extends AbstractLspAnalysisServerTest
     );
   }
 
+  Future<void> test_error_methodInvocation_importPrefix() async {
+    final content = '''
+import 'dart:async' as prefix;
+
+void f() {
+  prefix(^);
+}
+''';
+
+    await initialize(
+      textDocumentCapabilities: withSignatureHelpContentFormat(
+        emptyTextDocumentClientCapabilities,
+        [MarkupKind.Markdown],
+      ),
+    );
+    await openFile(mainFileUri, withoutMarkers(content));
+
+    // Expect no result.
+    final res = await getSignatureHelp(
+      mainFileUri,
+      positionFromMarker(content),
+    );
+    expect(res, isNull);
+  }
+
   Future<void> test_formats_markdown() async {
     final content = '''
     /// Does foo.

pkg/analyzer/lib/dart/element/element.dart

@@ -408,6 +408,7 @@ abstract class CompilationUnitElement implements Element, UriReferencedElement {
 
   /// Return `true` if this compilation unit defines a top-level function named
   /// `loadLibrary`.
+  @Deprecated('Not useful for clients')
   bool get hasLoadLibraryFunction;
 
   /// Return the [LineInfo] for the [source], or `null` if not computed yet.
@@ -1328,6 +1329,7 @@ abstract class LibraryElement implements _ExistingElement {
 
   /// Return `true` if this library defines a top-level function named
   /// `loadLibrary`.
+  @Deprecated('Not useful for clients')
   bool get hasLoadLibraryFunction;
 
   /// Return an identifier that uniquely identifies this element among the

pkg/analyzer/lib/src/dart/element/element.dart

@@ -1338,6 +1338,7 @@ class CompilationUnitElementImpl extends UriReferencedElementImpl
   @override
   int get hashCode => source.hashCode;
 
+  @Deprecated('Not useful for clients')
   @override
   bool get hasLoadLibraryFunction {
     List<FunctionElement> functions = this.functions;
@@ -5029,6 +5030,7 @@ class LibraryElementImpl extends _ExistingElementImpl
     setModifier(Modifier.HAS_EXT_URI, hasExtUri);
   }
 
+  @Deprecated('Not useful for clients')
   @override
   bool get hasLoadLibraryFunction {
     for (int i = 0; i < units.length; i++) {

pkg/analyzer/lib/src/error/best_practices_verifier.dart

@@ -1130,11 +1130,15 @@ class BestPracticesVerifier extends RecursiveAstVisitor<void> {
   /// See [CompileTimeErrorCode.IMPORT_DEFERRED_LIBRARY_WITH_LOAD_FUNCTION].
   bool _checkForLoadLibraryFunction(
       ImportDirective node, ImportElement importElement) {
-    LibraryElement? importedLibrary = importElement.importedLibrary;
-    if (importedLibrary == null) {
+    var importedLibrary = importElement.importedLibrary;
+    var prefix = importElement.prefix;
+    if (importedLibrary == null || prefix == null) {
       return false;
     }
-    if (importedLibrary.hasLoadLibraryFunction) {
+    var importNamespace = importElement.namespace;
+    var loadLibraryElement = importNamespace.getPrefixed(
+        prefix.name, FunctionElement.LOAD_LIBRARY_NAME);
+    if (loadLibraryElement != null) {
       _errorReporter.reportErrorForNode(
           HintCode.IMPORT_DEFERRED_LIBRARY_WITH_LOAD_FUNCTION,
           node,

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

@@ -5,7 +5,6 @@
 import 'package:analyzer/src/error/codes.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
-import '../../generated/test_support.dart';
 import '../dart/resolution/context_collection_resolution.dart';
 
 main() {
@@ -18,59 +17,90 @@ main() {
 class ImportDeferredLibraryWithLoadFunctionTest
     extends PubPackageResolutionTest {
   test_deferredImport_withLoadLibraryFunction() async {
-    newFile('$testPackageLibPath/lib1.dart', content: r'''
-library lib1;
-loadLibrary() {}
-f() {}''');
+    newFile('$testPackageLibPath/a.dart', content: r'''
+void loadLibrary() {}
+void f() {}
+''');
 
-    newFile('$testPackageLibPath/lib2.dart', content: r'''
-library root;
-import 'lib1.dart' deferred as lib1;
-main() { lib1.f(); }''');
-
-    await _resolveFile('$testPackageLibPath/lib1.dart');
-    await _resolveFile('$testPackageLibPath/lib2.dart', [
-      error(HintCode.IMPORT_DEFERRED_LIBRARY_WITH_LOAD_FUNCTION, 14, 36),
+    await assertErrorsInCode(r'''
+import 'a.dart' deferred as p;
+void main() {
+  p.f();
+}
+''', [
+      error(HintCode.IMPORT_DEFERRED_LIBRARY_WITH_LOAD_FUNCTION, 0, 30),
     ]);
   }
 
-  test_deferredImport_withoutLoadLibraryFunction() async {
-    newFile('$testPackageLibPath/lib1.dart', content: r'''
-library lib1;
-f() {}''');
+  test_deferredImport_withLoadLibraryFunction_hide() async {
+    newFile('$testPackageLibPath/a.dart', content: r'''
+void loadLibrary() {}
+void f() {}
+''');
 
-    newFile('$testPackageLibPath/lib2.dart', content: r'''
-library root;
-import 'lib1.dart' deferred as lib1;
-main() { lib1.f(); }''');
+    await assertNoErrorsInCode(r'''
+import 'a.dart' deferred as p hide loadLibrary;
+void main() {
+  p.f();
+}
+''');
+  }
 
-    await _resolveFile('$testPackageLibPath/lib1.dart');
-    await _resolveFile('$testPackageLibPath/lib2.dart');
+  test_deferredImport_withLoadLibraryFunction_hide2() async {
+    newFile('$testPackageLibPath/a.dart', content: r'''
+void loadLibrary() {}
+void f() {}
+void f2() {}
+''');
+
+    await assertErrorsInCode(r'''
+import 'a.dart' deferred as p hide f2;
+void main() {
+  p.f();
+}
+''', [
+      error(HintCode.IMPORT_DEFERRED_LIBRARY_WITH_LOAD_FUNCTION, 0, 38),
+    ]);
   }
 
-  test_nonDeferredImport_withLoadLibraryFunction() async {
-    newFile('$testPackageLibPath/lib1.dart', content: r'''
-library lib1;
-loadLibrary() {}
-f() {}''');
+  test_deferredImport_withLoadLibraryFunction_show() async {
+    newFile('$testPackageLibPath/a.dart', content: r'''
+void loadLibrary() {}
+void f() {}
+''');
 
-    newFile('$testPackageLibPath/lib2.dart', content: r'''
-library root;
-import 'lib1.dart' as lib1;
-main() { lib1.f(); }''');
+    await assertNoErrorsInCode(r'''
+import 'a.dart' deferred as p show f;
+void main() {
+  p.f();
+}
+''');
+  }
+
+  test_deferredImport_withoutLoadLibraryFunction() async {
+    newFile('$testPackageLibPath/a.dart', content: r'''
+void f() {}
+''');
 
-    await _resolveFile('$testPackageLibPath/lib1.dart');
-    await _resolveFile('$testPackageLibPath/lib2.dart');
+    await assertNoErrorsInCode(r'''
+import 'a.dart' deferred as p;
+void main() {
+  p.f();
+}
+''');
   }
 
-  /// Resolve the file with the given [path].
-  ///
-  /// Similar to ResolutionTest.resolveTestFile, but a custom path is supported.
-  Future<void> _resolveFile(
-    String path, [
-    List<ExpectedError> expectedErrors = const [],
-  ]) async {
-    result = await resolveFile(convertPath(path));
-    assertErrorsInResolvedUnit(result, expectedErrors);
+  test_nonDeferredImport_withLoadLibraryFunction() async {
+    newFile('$testPackageLibPath/a.dart', content: r'''
+void loadLibrary() {}
+void f() {}
+''');
+
+    await assertNoErrorsInCode(r'''
+import 'a.dart' as p;
+void main() {
+  p.f();
+}
+''');
   }
 }

runtime/vm/isolate.cc

@@ -1716,6 +1716,7 @@ Isolate::Isolate(IsolateGroup* isolate_group,
 #if !defined(DART_PRECOMPILED_RUNTIME)
       native_callback_trampolines_(),
 #endif
+      isolate_flags_(0),
 #if !defined(PRODUCT)
       last_resume_timestamp_(OS::GetCurrentTimeMillis()),
       vm_tag_counters_(),