Skip to content

Commit 2a13742

Browse files
scheglovCommit Queue
authored andcommitted
Fine. Fix using BaseName instead of LookupName for declaredConflicts.
Exposed by https://dart-review.googlesource.com/c/sdk/+/440640 Change-Id: Id49ce4604da5f89bc5acb82118ca62d9721cf8f3 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/440880 Reviewed-by: Brian Wilkerson <[email protected]> Commit-Queue: Konstantin Shcheglov <[email protected]>
1 parent 031c28f commit 2a13742

File tree

1 file changed

+4
-8
lines changed

1 file changed

+4
-8
lines changed

pkg/analyzer/lib/src/fine/manifest_item.dart

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,7 @@ sealed class InstanceItem<E extends InstanceElementImpl>
306306
LookupName lookupName,
307307
InterfaceItemConstructorItem item,
308308
) {
309-
var baseName = lookupName.asBaseName;
310-
if (declaredConflicts.containsKey(baseName)) {
309+
if (declaredConflicts.containsKey(lookupName)) {
311310
return;
312311
}
313312

@@ -331,8 +330,7 @@ sealed class InstanceItem<E extends InstanceElementImpl>
331330
}
332331

333332
void addDeclaredGetter(LookupName lookupName, InstanceItemGetterItem item) {
334-
var baseName = lookupName.asBaseName;
335-
if (declaredConflicts.containsKey(baseName)) {
333+
if (declaredConflicts.containsKey(lookupName)) {
336334
return;
337335
}
338336

@@ -364,8 +362,7 @@ sealed class InstanceItem<E extends InstanceElementImpl>
364362
}
365363

366364
void addDeclaredMethod(LookupName lookupName, InstanceItemMethodItem item) {
367-
var baseName = lookupName.asBaseName;
368-
if (declaredConflicts.containsKey(baseName)) {
365+
if (declaredConflicts.containsKey(lookupName)) {
369366
return;
370367
}
371368

@@ -391,8 +388,7 @@ sealed class InstanceItem<E extends InstanceElementImpl>
391388
}
392389

393390
void addDeclaredSetter(LookupName lookupName, InstanceItemSetterItem item) {
394-
var baseName = lookupName.asBaseName;
395-
if (declaredConflicts.containsKey(baseName)) {
391+
if (declaredConflicts.containsKey(lookupName)) {
396392
return;
397393
}
398394

0 commit comments

Comments
 (0)