Skip to content

feat: support superscope search in later initializer. #43156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions pkg/front_end/lib/src/fasta/kernel/body_builder.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2040,6 +2040,34 @@ class BodyBuilder extends ScopeListener<JumpTarget>
declaration = classBuilder.origin
.findStaticBuilder(name, charOffset, uri, libraryBuilder);
}
if (declaration == null && inFieldInitializer && inLateFieldInitializer) {
TypeBuilder superClassType = classBuilder.supertypeBuilder;
while (superClassType != null) {
ClassBuilder superClass;
if (superClassType is NamedTypeBuilder) {
TypeDeclarationBuilder decl = superClassType.declaration;
TypeAliasBuilder aliasBuilder; // Non-null if a type alias is use.
if (decl is TypeAliasBuilder) {
aliasBuilder = decl;
decl = aliasBuilder.unaliasDeclaration(superClassType.arguments);
}
if (decl is ClassBuilder) {
superClass = decl;
}
}

declaration = superClass?.scope?.lookup(
name,
superClass?.charOffset,
superClass?.fileUri,
);

superClassType = superClass?.supertypeBuilder;
if (declaration != null) {
break;
}
}
}
if (declaration != null &&
declaration.isDeclarationInstanceMember &&
(inFieldInitializer && !inLateFieldInitializer) &&
Expand Down
3 changes: 2 additions & 1 deletion pkg/front_end/lib/src/fasta/kernel/implicit_field_type.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

library fasta.implicit_type;

import 'package:_fe_analyzer_shared/src/scanner/token.dart' show Token;
import 'package:_fe_analyzer_shared/src/scanner/token.dart' show Token, TokenClass;

import 'package:kernel/ast.dart' hide MapEntry;

Expand Down Expand Up @@ -140,6 +140,7 @@ class _ImplicitFieldTypeRoot extends ImplicitFieldType {
bodyBuilder.constantContext = fieldBuilder.isConst
? ConstantContext.inferred
: ConstantContext.none;
bodyBuilder.beginFieldInitializer(initializerToken);
Expression initializer =
bodyBuilder.parseFieldInitializer(initializerToken);
initializerToken = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,18 @@
// 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.

class B {
final int x;

B(this.x);
}

class C extends B {
late final y = x + 1;

C(int x) : super(x);
}

main() {
int? lateLocalInit;
int initLateLocal(int value) {
Expand Down Expand Up @@ -30,6 +42,7 @@ main() {
local<int?>(null);
local<int?>(42);
local<int>(42);
expect(2, C(1).y);
}

expect(expected, actual) {
Expand Down