Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit abbff01

Browse files
scheglovcommit-bot@chromium.org
authored andcommitted
Deprecate LinkInputLibrary/LinkInputUnit.tmp1(), use unnamed instead.
This is the next step to rename these constructors. After updating google3 to unnamed constructors we will remove `tmp1`. Change-Id: Ib010ad6c2de6918dc9daceaa7d27449618ebd9b5 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/202200 Reviewed-by: Samuel Rawlins <srawlins@google.com> Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
1 parent df8ad69 commit abbff01

File tree

5 files changed

+23
-19
lines changed

5 files changed

+23
-19
lines changed

pkg/analyzer/lib/dart/sdk/build_sdk_summary.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ class _Builder {
135135

136136
CompilationUnit definingUnit = _parse(source);
137137
inputUnits.add(
138-
LinkInputUnit.tmp1(
138+
LinkInputUnit(
139139
partDirectiveIndex: null,
140140
source: source,
141141
isSynthetic: false,
@@ -154,7 +154,7 @@ class _Builder {
154154
Source partSource = context.sourceFactory.resolveUri(source, partUri)!;
155155
CompilationUnit partUnit = _parse(partSource);
156156
inputUnits.add(
157-
LinkInputUnit.tmp1(
157+
LinkInputUnit(
158158
partUriStr: partUri,
159159
partDirectiveIndex: partDirectiveIndex++,
160160
source: partSource,
@@ -166,7 +166,7 @@ class _Builder {
166166
}
167167

168168
inputLibraries.add(
169-
LinkInputLibrary.tmp1(
169+
LinkInputLibrary(
170170
source: source,
171171
units: inputUnits,
172172
),

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ class LibraryContext {
145145
partIndex++;
146146

147147
inputUnits.add(
148-
link2.LinkInputUnit.tmp1(
148+
link2.LinkInputUnit(
149149
// TODO(scheglov) bad, group part data
150150
partDirectiveIndex: partIndex - 1,
151151
partUriStr: partUriStr,
@@ -157,7 +157,7 @@ class LibraryContext {
157157
}
158158

159159
inputLibraries.add(
160-
link2.LinkInputLibrary.tmp1(
160+
link2.LinkInputLibrary(
161161
source: librarySource,
162162
units: inputUnits,
163163
),

pkg/analyzer/lib/src/dart/micro/resolve_file.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -875,7 +875,7 @@ class _LibraryContext {
875875
partIndex++;
876876

877877
inputUnits.add(
878-
link2.LinkInputUnit.tmp1(
878+
link2.LinkInputUnit(
879879
// TODO(scheglov) bad, group part data
880880
partDirectiveIndex: partIndex - 1,
881881
partUriStr: partUriStr,
@@ -887,7 +887,7 @@ class _LibraryContext {
887887
}
888888

889889
inputLibraries.add(
890-
link2.LinkInputLibrary.tmp1(
890+
link2.LinkInputLibrary(
891891
source: librarySource,
892892
units: inputUnits,
893893
),

pkg/analyzer/lib/src/summary2/link.dart

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -246,9 +246,12 @@ class LinkInputLibrary {
246246
final Source source;
247247
final List<LinkInputUnit> units;
248248

249-
@Deprecated('Use LinkInputLibrary.tmp1() with instead')
250-
LinkInputLibrary(this.source, this.units);
249+
LinkInputLibrary({
250+
required this.source,
251+
required this.units,
252+
});
251253

254+
@Deprecated('Use LinkInputLibrary() with instead')
252255
LinkInputLibrary.tmp1({
253256
required this.source,
254257
required this.units,
@@ -266,14 +269,15 @@ class LinkInputUnit {
266269
final bool isSynthetic;
267270
final ast.CompilationUnit unit;
268271

269-
@Deprecated('Use LinkInputUnit.tmp1() with instead')
270-
LinkInputUnit(
272+
LinkInputUnit({
273+
required this.partDirectiveIndex,
271274
this.partUriStr,
272-
this.source,
273-
this.isSynthetic,
274-
this.unit,
275-
) : partDirectiveIndex = null;
275+
required this.source,
276+
required this.isSynthetic,
277+
required this.unit,
278+
});
276279

280+
@Deprecated('Use LinkInputUnit() with instead')
277281
LinkInputUnit.tmp1({
278282
required this.partDirectiveIndex,
279283
this.partUriStr,

pkg/analyzer/test/src/summary/resynthesize_ast2_test.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class ResynthesizeAst2Test extends AbstractResynthesizeTest
5959
var inputUnits = <LinkInputUnit>[];
6060
_addLibraryUnits(source, unit, inputUnits, featureSet);
6161
inputLibraries.add(
62-
LinkInputLibrary.tmp1(
62+
LinkInputLibrary(
6363
source: source,
6464
units: inputUnits,
6565
),
@@ -147,7 +147,7 @@ class ResynthesizeAst2Test extends AbstractResynthesizeTest
147147
FeatureSet featureSet,
148148
) {
149149
units.add(
150-
LinkInputUnit.tmp1(
150+
LinkInputUnit(
151151
partDirectiveIndex: null,
152152
source: definingSource,
153153
isSynthetic: false,
@@ -170,7 +170,7 @@ class ResynthesizeAst2Test extends AbstractResynthesizeTest
170170
var text = _readSafely(partSource.fullName);
171171
var unit = parseText(text, featureSet);
172172
units.add(
173-
LinkInputUnit.tmp1(
173+
LinkInputUnit(
174174
partDirectiveIndex: partDirectiveIndex,
175175
partUriStr: relativeUriStr,
176176
source: partSource,
@@ -200,7 +200,7 @@ class ResynthesizeAst2Test extends AbstractResynthesizeTest
200200
var units = <LinkInputUnit>[];
201201
_addLibraryUnits(source, unit, units, featureSet);
202202
libraries.add(
203-
LinkInputLibrary.tmp1(
203+
LinkInputLibrary(
204204
source: source,
205205
units: units,
206206
),

0 commit comments

Comments
 (0)