Version 3.9.0-238.0.dev

Merge 8020e36 into dev

Author: Dart CI

DEPS

@@ -84,7 +84,7 @@ vars = {
   "download_reclient": True,
 
   # Update from https://chrome-infra-packages.appspot.com/p/fuchsia/sdk/core
-  "fuchsia_sdk_version": "version:28.20250612.3.1",
+  "fuchsia_sdk_version": "version:28.20250613.3.1",
   "download_fuchsia_deps": False,
 
   # Ninja, runs the build based on files generated by GN.

PRESUBMIT.py

@@ -340,7 +340,8 @@ def _CheckClangFormat(input_api, output_api):
                     f.ChangedContents())):
             is_deps = True
             break
-        if is_cpp_file(path) and os.path.isfile(path):
+        if is_cpp_file(path) and os.path.isfile(
+                path) and not path.startswith('third_party/'):
             files.append(path)
 
     if is_deps:

pkg/analysis_server/lib/src/lsp/handlers/handler_inline_value.dart

@@ -290,6 +290,28 @@ class _InlineValueVisitor extends GeneralizingAstVisitor<void> {
     super.visitBlock(node);
   }
 
+  @override
+  void visitDeclaredIdentifier(DeclaredIdentifier node) {
+    var name = node.name;
+    collector.recordVariableLookup(
+      node.declaredElement2,
+      name.offset,
+      name.length,
+    );
+    super.visitDeclaredIdentifier(node);
+  }
+
+  @override
+  void visitDeclaredVariablePattern(DeclaredVariablePattern node) {
+    var name = node.name;
+    collector.recordVariableLookup(
+      node.declaredElement2,
+      name.offset,
+      name.length,
+    );
+    super.visitDeclaredVariablePattern(node);
+  }
+
   @override
   void visitFormalParameter(FormalParameter node) {
     var name = node.name;

pkg/analysis_server/lib/src/services/completion/dart/declaration_helper.dart

@@ -568,7 +568,7 @@ class DeclarationHelper {
   /// containing the [node] that can be referenced as a super parameter.
   void addParametersFromSuperConstructor(SuperFormalParameter node) {
     var element = node.declaredFragment?.element;
-    if (element is! SuperFormalParameterElementImpl2) {
+    if (element is! SuperFormalParameterElementImpl) {
       return;
     }
 
@@ -578,7 +578,7 @@ class DeclarationHelper {
     }
 
     var constructorElement = constructor.declaredFragment?.element;
-    if (constructorElement is! ConstructorElementImpl2) {
+    if (constructorElement is! ConstructorElementImpl) {
       return;
     }
 

pkg/analysis_server/test/lsp/inline_value_test.dart

@@ -405,6 +405,30 @@ void f() {
     await verify_values(code, ofType: InlineValueVariableLookup);
   }
 
+  Future<void> test_variable_forIn() async {
+    code = TestCode.parse(r'''
+void f(List<int> ints) {
+  for (var /*[0*/i/*0]*/ in /*[1*/ints/*1]*/) {
+    ^
+  }
+}
+''');
+
+    await verify_values(code, ofType: InlineValueVariableLookup);
+  }
+
+  Future<void> test_variable_forIn_destructure() async {
+    code = TestCode.parse(r'''
+void f(List<(int, int)> records) {
+  for (var (/*[0*/x/*0]*/, /*[1*/y/*1]*/) in /*[2*/records/*2]*/) {
+    ^
+  }
+}
+''');
+
+    await verify_values(code, ofType: InlineValueVariableLookup);
+  }
+
   /// Lists are included, iterables are not.
   Future<void> test_variable_iterables() async {
     experimentalInlineValuesProperties = true;

pkg/analysis_server/test/plugin/protocol_dart_test.dart

@@ -131,7 +131,7 @@ class A {
   }
 
   void test_dynamic() {
-    var engineElement = engine.DynamicElementImpl2.instance;
+    var engineElement = engine.DynamicElementImpl.instance;
     // create notification Element
     var element = convertElement(engineElement);
     expect(element.kind, ElementKind.UNKNOWN);

pkg/analysis_server/test/services/refactoring/agnostic/change_method_signature_test.dart

@@ -117,7 +117,7 @@ class AbstractChangeMethodSignatureTest extends AbstractContextTest {
   String _elementToReferenceString(Element element) {
     var enclosingElement = element.enclosingElement;
     var reference = switch (element) {
-      ElementImpl2() =>
+      ElementImpl() =>
         element.reference ?? (element.firstFragment as FragmentImpl).reference,
       _ => null,
     };

pkg/analysis_server/test/support/sdk_paths.dart

@@ -7,10 +7,9 @@ import 'dart:isolate';
 
 import 'package:path/path.dart' as path;
 
-/// A temporary file that the server was compiled to from source by
-/// [getAnalysisServerPath] because `TEST_SERVER_SNAPSHOT` was set to disable
-/// running from the SDK snapshot.
-String? _temporaryCompiledServerPath;
+/// The compiled version of the analysis server snapshot that should be used
+/// for integration tests. Set by [getAnalysisServerPath].
+String? _compiledServerPath;
 
 /// The path of the `pkg/analysis_server` folder, resolved using the active
 /// `package_config.json`.
@@ -41,43 +40,58 @@ String get sdkRootPath {
 /// Gets the path of the analysis server entry point which may be the snapshot
 /// from the current SDK (default) or a compiled version of the source script
 /// depending on the `TEST_SERVER_SNAPSHOT` environment variable.
-///
-/// When running from source, the server will be compiled to disk for the first
-/// request to speed up subsequent tests in the same process.
 Future<String> getAnalysisServerPath(String dartSdkPath) async {
-  // Always use the "real" SDK binary for compilation, not the path provided,
-  // which might be an incomplete SDK that is the target of the test.
-  var dartBinary = Platform.resolvedExecutable;
-  var snapshotPath = path.join(
-    dartSdkPath,
-    'bin',
-    'snapshots',
-    'analysis_server.dart.snapshot',
-  );
-  var sourcePath = path.join(analysisServerPackagePath, 'bin', 'server.dart');
-
-  // Use the SDK snapshot unless this env var is set.
-  var useSnapshot = Platform.environment['TEST_SERVER_SNAPSHOT'] != 'false';
-  if (useSnapshot) {
-    return path.normalize(snapshotPath);
+  // If we have already computed the path once, use that.
+  if (_compiledServerPath case var compiledServerPath?) {
+    return compiledServerPath;
   }
 
-  // If we've already compiled a copy in this process, use that.
-  if (_temporaryCompiledServerPath case var temporaryCompiledServerPath?) {
-    return temporaryCompiledServerPath;
+  // The 'TEST_SERVER_SNAPSHOT' env variable can either be:
+  //
+  //  - Unset, in which case the tests run from the SDK compiled snapshot
+  //  - The string 'false' which will cause the server to compiled from source.
+  //      This is a simple way to run from source using the test_all file that
+  //      runs all tests in a single isolate and will trigger a single
+  //      compilation for all integration tests.
+  //  - An path to a pre-compiled snapshot.
+  //    This allows configuring VS Code to pre-compile the snapshot once and
+  //    then use 'dart test' which will run each sweet in a separate isolate
+  //    without each test/isolate having to compile.
+  var snapshotPath = switch (Platform.environment['TEST_SERVER_SNAPSHOT']) {
+    // Compile on the fly
+    'false' => await _compileTemporaryServerSnapshot(),
+    // Default, use the SDK-bundled snapshot
+    'true' || '' || null => path.join(
+      dartSdkPath,
+      'bin',
+      'snapshots',
+      'analysis_server.dart.snapshot',
+    ),
+    // Custom path in the env variable
+    String snapshotPath => snapshotPath,
+  };
+
+  return _compiledServerPath = path.normalize(snapshotPath);
+}
+
+/// Compiles a temporary snapshot for the analysis server into a temporary file
+/// and returns the full path.
+///
+/// This function can only be called once in a single process/isolate.
+Future<String> _compileTemporaryServerSnapshot() async {
+  if (_compiledServerPath != null) {
+    throw 'Snapshot is already compiled or being compiled';
   }
 
-  // Otherwise, we're running from source. But to avoid having to compile the
-  // server for every test as it spawns the process, pre-compile it once here
-  // into a temp file and then use that for future invocations in this run.
+  var dartBinary = Platform.resolvedExecutable;
   var tempSnapshotDirectory = Directory.systemTemp.createTempSync(
     'dart_analysis_server_tests',
   );
-  var tempSnapshotFilePath =
-      _temporaryCompiledServerPath = path.join(
-        tempSnapshotDirectory.path,
-        'analysis_server.dart.snapshot',
-      );
+  var tempSnapshotFilePath = path.join(
+    tempSnapshotDirectory.path,
+    'analysis_server.dart.snapshot',
+  );
+  var sourcePath = path.join(analysisServerPackagePath, 'bin', 'server.dart');
   var result = await Process.run(dartBinary, [
     'compile',
     'kernel',

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

@@ -67,7 +67,7 @@ import 'package:meta/meta.dart';
 
 /// This function is used to test recording requirements during analysis.
 ///
-/// Some [ElementImpl2] APIs are not trivial, or maybe even impossible, to
+/// Some [ElementImpl] APIs are not trivial, or maybe even impossible, to
 /// trigger. For example because this API is not used during normal resolution
 /// of Dart code, but can be used by a linter rule.
 @visibleForTesting
@@ -110,7 +110,7 @@ testFineAfterLibraryAnalyzerHook;
 // TODO(scheglov): Clean up the list of implicitly analyzed files.
 class AnalysisDriver {
   /// The version of data format, should be incremented on every format change.
-  static const int DATA_VERSION = 472;
+  static const int DATA_VERSION = 475;
 
   /// The number of exception contexts allowed to write. Once this field is
   /// zero, we stop writing any new exception contexts in this process.

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

@@ -374,15 +374,15 @@ class _IndexAssembler {
 
   /// Adds a prefix (or empty string for unprefixed) for an element.
   void addPrefixForElement(Element element, {PrefixElement? prefix}) {
-    if (element is MultiplyDefinedElementImpl2 ||
+    if (element is MultiplyDefinedElementImpl ||
         // TODO(brianwilkerson): The last two conditions are here because the
         //  elements for `dynamic` and `Never` are singletons and hence don't have
         //  a parent element for which we can find an `_ElementInfo`. This means
         //  that any reference to either type via a prefix can't be stored in the
         //  index. The solution is to make those elements be normal (not unique)
         //  elements.
-        element is DynamicElementImpl2 ||
-        element is NeverElementImpl2) {
+        element is DynamicElementImpl ||
+        element is NeverElementImpl) {
       return;
     }
 
@@ -734,7 +734,7 @@ class _IndexContributor extends GeneralizingAstVisitor {
     // implicitly invokes the default super constructor. Associate the
     // invocation with the name of the class.
     var defaultConstructor = declaredElement.constructors.singleOrNull;
-    if (defaultConstructor is ConstructorElementImpl2 &&
+    if (defaultConstructor is ConstructorElementImpl &&
         defaultConstructor.isSynthetic) {
       defaultConstructor.isDefaultConstructor;
       var superConstructor = defaultConstructor.superConstructor2;
@@ -1260,7 +1260,7 @@ class _IndexContributor extends GeneralizingAstVisitor {
   @override
   visitSuperFormalParameter(SuperFormalParameter node) {
     var element = node.declaredFragment!.element;
-    if (element is SuperFormalParameterElementImpl2) {
+    if (element is SuperFormalParameterElementImpl) {
       var superParameter = element.superConstructorParameter2;
       if (superParameter != null) {
         recordRelation(
@@ -1377,9 +1377,9 @@ class _IndexContributor extends GeneralizingAstVisitor {
     ConstructorElement? constructor,
   ) {
     var seenConstructors = <ConstructorElement?>{};
-    while (constructor is ConstructorElementImpl2 && constructor.isSynthetic) {
+    while (constructor is ConstructorElementImpl && constructor.isSynthetic) {
       var enclosing = constructor.enclosingElement;
-      if (enclosing is ClassElementImpl2 && enclosing.isMixinApplication) {
+      if (enclosing is ClassElementImpl && enclosing.isMixinApplication) {
         var superInvocation =
             constructor.firstFragment.constantInitializers
                 .whereType<SuperConstructorInvocation>()