commit 26362db2bc6c9ce2afd5d56bca53735954d698fe
author Konstantin Shcheglov <scheglov@google.com> Tue Sep 24 17:37:22 2024 +0000
committer Commit Queue <dart-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Sep 24 17:37:22 2024 +0000
tree cb547ecb5419f617da1ba2d7bc4a2f67be4c2b21
parent fb1cb0a0d4094ba2a2f6313e53242460faccb668

Elements. Make ScopeLookupResultImpl constructor use named formal parameters.

Change-Id: Ib408b88e3adc0917a9af66f6f1c839dbaca135bb
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/386600
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>

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

diff --git a/pkg/analyzer/lib/src/dart/element/scope.dart b/pkg/analyzer/lib/src/dart/element/scope.dart
index 310d092..c47fde9 100644
--- a/pkg/analyzer/lib/src/dart/element/scope.dart
+++ b/pkg/analyzer/lib/src/dart/element/scope.dart
@@ -58,7 +58,10 @@
   ScopeLookupResult lookup(String id) {
     var result = innerScope.lookup(id);
     if (result.getter != null || result.setter != null) return result;
-    return ScopeLookupResultImpl(_getters[id], _setters[id]);
+    return ScopeLookupResultImpl(
+      getter: _getters[id],
+      setter: _setters[id],
+    );
   }
 }
 
@@ -75,7 +78,10 @@
     var getter = _getters[id];
     var setter = _setters[id];
     if (getter != null || setter != null) {
-      return ScopeLookupResultImpl(getter, setter);
+      return ScopeLookupResultImpl(
+        getter: getter,
+        setter: setter,
+      );
     }
 
     return _parent.lookup(id);
@@ -423,7 +429,10 @@
     }
 
     // No result.
-    return ScopeLookupResultImpl(null, null);
+    return ScopeLookupResultImpl(
+      getter: null,
+      setter: null,
+    );
   }
 
   void notifyExtensionUsed(ExtensionElement element) {
@@ -451,7 +460,10 @@
     // Try prefix elements.
     if (_shouldTryPrefixElement(id)) {
       if (_prefixElements[id] case var prefixElement?) {
-        return ScopeLookupResultImpl(prefixElement, null);
+        return ScopeLookupResultImpl(
+          getter: prefixElement,
+          setter: null,
+        );
       }
     }
 
@@ -471,8 +483,8 @@
     var librarySetter = libraryDeclarations._setters[id];
     if (libraryGetter != null || librarySetter != null) {
       return ScopeLookupResultImpl(
-        libraryGetter,
-        librarySetter,
+        getter: libraryGetter,
+        setter: librarySetter,
       );
     }
     return null;
@@ -559,7 +571,10 @@
   ScopeLookupResult lookup(String id) {
     var deferredLibrary = _deferredLibrary;
     if (deferredLibrary != null && id == FunctionElement.LOAD_LIBRARY_NAME) {
-      return ScopeLookupResultImpl(deferredLibrary.loadLibraryFunction, null);
+      return ScopeLookupResultImpl(
+        getter: deferredLibrary.loadLibraryFunction,
+        setter: null,
+      );
     }
 
     var getter = _getters[id];
@@ -568,10 +583,12 @@
       _importsTracking?.lookupResult(getter);
       _importsTracking?.lookupResult(setter);
       return PrefixScopeLookupResult(
-        getter,
-        setter,
-        _gettersFromDeprecatedExport?.contains(id) ?? false,
-        _settersFromDeprecatedExport?.contains(id) ?? false,
+        getter: getter,
+        setter: setter,
+        getterIsFromDeprecatedExport:
+            _gettersFromDeprecatedExport?.contains(id) ?? false,
+        setterIsFromDeprecatedExport:
+            _settersFromDeprecatedExport?.contains(id) ?? false,
       );
     }
 
@@ -579,7 +596,10 @@
       return parent.lookup(id);
     }
 
-    return ScopeLookupResultImpl(null, null);
+    return ScopeLookupResultImpl(
+      getter: null,
+      setter: null,
+    );
   }
 
   /// Usually this is an error, but we allow it in comment references.
@@ -710,12 +730,12 @@
 
   final int _deprecatedBits;
 
-  PrefixScopeLookupResult(
-    super.importedGetter,
-    super.importedSetter,
-    bool getterIsFromDeprecatedExport,
-    bool setterIsFromDeprecatedExport,
-  ) : _deprecatedBits = (getterIsFromDeprecatedExport
+  PrefixScopeLookupResult({
+    required super.getter,
+    required super.setter,
+    required bool getterIsFromDeprecatedExport,
+    required bool setterIsFromDeprecatedExport,
+  }) : _deprecatedBits = (getterIsFromDeprecatedExport
                 ? getterIsFromDeprecatedExportBit
                 : 0) |
             (setterIsFromDeprecatedExport
@@ -742,7 +762,10 @@
   @override
   final Element? setter;
 
-  ScopeLookupResultImpl(this.getter, this.setter);
+  ScopeLookupResultImpl({
+    required this.getter,
+    required this.setter,
+  });
 }
 
 class TypeParameterScope extends EnclosedScope {