Skip to content

Commit cd17fe1

Browse files
author
Dart CI
committed
Version 2.19.0-27.0.dev
Merge commit '218cbeea01916a6a922f5ce992bab5e05c65e77f' into 'dev'
2 parents 5480081 + 218cbee commit cd17fe1

18 files changed

+169
-167
lines changed

‎pkg/analyzer/test/dart/analysis/analysis_context_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import 'a.dart';
2424

2525
var c = newFile('$testPackageLibPath/c.dart', '');
2626

27-
var analysisContext = contextFor(a.path);
27+
var analysisContext = contextFor(a);
2828

2929
// Ask for files, so that they are known.
3030
var analysisSession = analysisContext.currentSession;
@@ -55,7 +55,7 @@ import 'a.dart';
5555

5656
var d = newFile('$testPackageLibPath/d.dart', '');
5757

58-
var analysisContext = contextFor(a.path);
58+
var analysisContext = contextFor(a);
5959

6060
// Ask for files, so that they are known.
6161
var analysisSession = analysisContext.currentSession;

‎pkg/analyzer/test/src/dart/analysis/driver_caching_test.dart

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class AnalysisDriverCachingTest extends PubPackageResolutionTest {
2929
bool get retainDataForTesting => true;
3030

3131
List<Set<String>> get _linkedCycles {
32-
var driver = driverFor(testFile.path);
32+
var driver = driverFor(testFile);
3333
return driver.testView!.libraryContext.linkedCycles;
3434
}
3535

@@ -82,7 +82,7 @@ class A {
8282
}
8383
''');
8484

85-
var analysisDriver = driverFor(testFile.path);
85+
var analysisDriver = driverFor(testFile);
8686
analysisDriver.changeFile(testFile.path);
8787
await analysisDriver.applyPendingFileChanges();
8888

@@ -101,7 +101,7 @@ class A {
101101
}
102102
''');
103103

104-
var analysisDriver = driverFor(testFile.path);
104+
var analysisDriver = driverFor(testFile);
105105
analysisDriver.changeFile(testFile.path);
106106
await analysisDriver.applyPendingFileChanges();
107107

@@ -120,7 +120,7 @@ class A {
120120
}
121121
''');
122122

123-
var analysisDriver = driverFor(testFile.path);
123+
var analysisDriver = driverFor(testFile);
124124
analysisDriver.changeFile(testFile.path);
125125
await analysisDriver.applyPendingFileChanges();
126126

@@ -214,7 +214,7 @@ void f() {
214214
import 'a.dart';
215215
''');
216216

217-
var driver = driverFor(testFile.path);
217+
var driver = driverFor(testFile);
218218

219219
// Link both libraries, keep them.
220220
await driver.getLibraryByUri('package:test/a.dart');
@@ -370,7 +370,7 @@ class A {}
370370
export 'a.dart';
371371
''');
372372

373-
final analysisContext = contextFor(macroFile.path);
373+
final analysisContext = contextFor(macroFile);
374374

375375
Future<LibraryElement> getLibrary(String uriStr) async {
376376
final result = await analysisContext.currentSession
@@ -445,8 +445,8 @@ class A {}
445445
void f(MacroA a) {}
446446
''');
447447

448-
var analysisContext = contextFor(a.path);
449-
var analysisDriver = driverFor(a.path);
448+
var analysisContext = contextFor(a);
449+
var analysisDriver = driverFor(a);
450450

451451
var userErrors = analysisDriver.results
452452
.whereType<ErrorsResult>()
@@ -503,8 +503,8 @@ class A {}
503503
void f(MacroA a) {}
504504
''');
505505

506-
var analysisContext = contextFor(a.path);
507-
var analysisDriver = driverFor(a.path);
506+
var analysisContext = contextFor(a);
507+
var analysisDriver = driverFor(a);
508508

509509
var userErrors = analysisDriver.results
510510
.whereType<ErrorsResult>()
@@ -542,8 +542,8 @@ class A {}
542542
void f(MacroA a) {}
543543
''');
544544

545-
var analysisContext = contextFor(user.path);
546-
var analysisDriver = driverFor(user.path);
545+
var analysisContext = contextFor(user);
546+
var analysisDriver = driverFor(user);
547547

548548
var userErrors = analysisDriver.results
549549
.whereType<ErrorsResult>()
@@ -605,7 +605,7 @@ String getClassName() => 'MacroB';
605605
''');
606606

607607
// Notify about changes.
608-
var analysisContext = contextFor(a.path);
608+
var analysisContext = contextFor(a);
609609
analysisContext.changeFile(a.path);
610610
await analysisContext.applyPendingFileChanges();
611611

@@ -645,7 +645,7 @@ String getClassName() => 'MacroB';
645645
/// But this method is used to check returning errors from the cache, or
646646
/// recomputing when the cache key is expected to be different.
647647
Future<List<AnalysisError>> _computeTestFileErrors() async {
648-
var errorsResult = await contextFor(testFile.path)
648+
var errorsResult = await contextFor(testFile)
649649
.currentSession
650650
.getErrors(testFile.path) as ErrorsResult;
651651
return errorsResult.errors;

‎pkg/analyzer/test/src/dart/analysis/driver_resolution_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ const a = 1;
282282
''');
283283

284284
// Make sure that the part knows its library.
285-
contextFor(a.path).currentSession.getParsedUnit(a.path);
285+
contextFor(a).currentSession.getParsedUnit(a.path);
286286

287287
await resolveTestFile();
288288

‎pkg/analyzer/test/src/dart/analysis/driver_test.dart

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,14 @@ class AnalysisDriver_BazelWorkspaceTest extends BazelWorkspaceResolutionTest {
5858
void test_nestedLib_notCanonicalUri() async {
5959
var outerLibPath = '$workspaceRootPath/my/outer/lib';
6060

61-
var innerPath = convertPath('$outerLibPath/inner/lib/b.dart');
61+
var innerFile = newFile('$outerLibPath/inner/lib/b.dart', 'class B {}');
6262
var innerUri = Uri.parse('package:my.outer.lib.inner/b.dart');
63-
newFile(innerPath, 'class B {}');
6463

65-
var analysisSession = contextFor(innerPath).currentSession;
64+
var analysisSession = contextFor(innerFile).currentSession;
6665

6766
void assertInnerUri(ResolvedUnitResult result) {
6867
var innerLibrary = result.libraryElement.importedLibraries
69-
.where((e) => e.source.fullName == innerPath)
68+
.where((e) => e.source.fullName == innerFile.path)
7069
.single;
7170
expect(innerLibrary.source.uri, innerUri);
7271
}
@@ -112,7 +111,7 @@ class AnalysisDriver_PubPackageTest extends PubPackageResolutionTest {
112111
}
113112

114113
test_getLibraryByUri_cannotResolveUri() async {
115-
final driver = driverFor(testFile.path);
114+
final driver = driverFor(testFile);
116115
expect(
117116
await driver.getLibraryByUri('foo:bar'),
118117
isA<CannotResolveUriResult>(),
@@ -124,7 +123,7 @@ class AnalysisDriver_PubPackageTest extends PubPackageResolutionTest {
124123
library augment 'b.dart';
125124
''');
126125

127-
final driver = driverFor(a.path);
126+
final driver = driverFor(a);
128127
expect(
129128
await driver.getLibraryByUri('package:test/a.dart'),
130129
isA<NotLibraryButAugmentationResult>(),
@@ -136,15 +135,15 @@ library augment 'b.dart';
136135
part of 'b.dart';
137136
''');
138137

139-
final driver = driverFor(a.path);
138+
final driver = driverFor(a);
140139
expect(
141140
await driver.getLibraryByUri('package:test/a.dart'),
142141
isA<NotLibraryButPartResult>(),
143142
);
144143
}
145144

146145
test_getParsedLibraryByUri_cannotResolveUri() async {
147-
final driver = driverFor(testFile.path);
146+
final driver = driverFor(testFile);
148147
final uri = Uri.parse('foo:bar');
149148
expect(
150149
driver.getParsedLibraryByUri(uri),
@@ -157,7 +156,7 @@ part of 'b.dart';
157156
library augment 'b.dart';
158157
''');
159158

160-
final driver = driverFor(a.path);
159+
final driver = driverFor(a);
161160
final uri = Uri.parse('package:test/a.dart');
162161
expect(
163162
driver.getParsedLibraryByUri(uri),
@@ -170,7 +169,7 @@ library augment 'b.dart';
170169
part of 'b.dart';
171170
''');
172171

173-
final driver = driverFor(a.path);
172+
final driver = driverFor(a);
174173
final uri = Uri.parse('package:test/a.dart');
175174
expect(
176175
driver.getParsedLibraryByUri(uri),
@@ -183,7 +182,7 @@ part of 'b.dart';
183182
library augment 'b.dart';
184183
''');
185184

186-
final driver = driverFor(a.path);
185+
final driver = driverFor(a);
187186
expect(
188187
await driver.getResolvedLibrary(a.path),
189188
isA<NotLibraryButAugmentationResult>(),
@@ -195,15 +194,15 @@ library augment 'b.dart';
195194
part of 'b.dart';
196195
''');
197196

198-
final driver = driverFor(a.path);
197+
final driver = driverFor(a);
199198
expect(
200199
await driver.getResolvedLibrary(a.path),
201200
isA<NotLibraryButPartResult>(),
202201
);
203202
}
204203

205204
test_getResolvedLibraryByUri_cannotResolveUri() async {
206-
final driver = driverFor(testFile.path);
205+
final driver = driverFor(testFile);
207206
final uri = Uri.parse('foo:bar');
208207
expect(
209208
await driver.getResolvedLibraryByUri(uri),
@@ -216,7 +215,7 @@ part of 'b.dart';
216215
library augment 'b.dart';
217216
''');
218217

219-
final driver = driverFor(a.path);
218+
final driver = driverFor(a);
220219
final uri = Uri.parse('package:test/a.dart');
221220
expect(
222221
await driver.getResolvedLibraryByUri(uri),
@@ -229,7 +228,7 @@ library augment 'b.dart';
229228
part of 'b.dart';
230229
''');
231230

232-
final driver = driverFor(a.path);
231+
final driver = driverFor(a);
233232
final uri = Uri.parse('package:test/a.dart');
234233
expect(
235234
await driver.getResolvedLibraryByUri(uri),

‎pkg/analyzer/test/src/dart/analysis/file_state_test.dart

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class FileSystemState_BazelWorkspaceTest extends BazelWorkspaceResolutionTest {
4747
// This generated file should be used instead of the writable.
4848
newFile(generatedPath, '');
4949

50-
var analysisDriver = driverFor(testFile.path);
50+
var analysisDriver = driverFor(testFile);
5151

5252
var fsState = analysisDriver.fsState;
5353

@@ -75,7 +75,7 @@ class FileSystemState_BazelWorkspaceTest extends BazelWorkspaceResolutionTest {
7575
// This generated file should be used instead of the writable.
7676
newFile(generatedPath, '');
7777

78-
var analysisDriver = driverFor(testFile.path);
78+
var analysisDriver = driverFor(testFile);
7979

8080
var fsState = analysisDriver.fsState;
8181

@@ -96,13 +96,13 @@ class FileSystemState_BazelWorkspaceTest extends BazelWorkspaceResolutionTest {
9696
}
9797

9898
void test_getFileForUri_nestedLib_notCanonicalUri() async {
99-
var outerPath = convertPath('$workspaceRootPath/my/outer/lib/a.dart');
99+
var outer = getFile('$workspaceRootPath/my/outer/lib/a.dart');
100100
var outerUri = Uri.parse('package:my.outer/a.dart');
101101

102-
var innerPath = convertPath('/workspace/my/outer/lib/inner/lib/b.dart');
102+
var inner = getFile('/workspace/my/outer/lib/inner/lib/b.dart');
103103
var innerUri = Uri.parse('package:my.outer.lib.inner/b.dart');
104104

105-
var analysisDriver = driverFor(outerPath);
105+
var analysisDriver = driverFor(outer);
106106
var fsState = analysisDriver.fsState;
107107

108108
// User code might use such relative URI.
@@ -111,7 +111,7 @@ class FileSystemState_BazelWorkspaceTest extends BazelWorkspaceResolutionTest {
111111

112112
// However the returned file must use the canonical URI.
113113
var innerFile = fsState.getFileForUri(innerUri2).t1!;
114-
expect(innerFile.path, innerPath);
114+
expect(innerFile.path, inner.path);
115115
expect(innerFile.uri, innerUri);
116116
}
117117
}
@@ -135,7 +135,7 @@ class FileSystemState_PubPackageTest extends PubPackageResolutionTest {
135135
}
136136

137137
FileSystemState fsStateFor(File file) {
138-
return driverFor(file.path).fsState;
138+
return driverFor(file).fsState;
139139
}
140140

141141
test_libraryCycle() {
@@ -1850,8 +1850,7 @@ elementFactory
18501850
final librarySummaryFiles = <File>[];
18511851
{
18521852
final fooRoot = getFolder('$workspaceRootPath/foo');
1853-
1854-
newFile('${fooRoot.path}/lib/foo.dart', 'class F {}');
1853+
final foo = newFile('${fooRoot.path}/lib/foo.dart', 'class F {}');
18551854

18561855
final fooPackageConfigFile = getFile(
18571856
'${fooRoot.path}/.dart_tool/package_config.json',
@@ -1862,7 +1861,7 @@ elementFactory
18621861
PackageConfigFileBuilder()..add(name: 'foo', rootPath: fooRoot.path),
18631862
);
18641863

1865-
final analysisDriver = driverFor(fooRoot.path);
1864+
final analysisDriver = driverFor(foo);
18661865
final bundleBytes = await analysisDriver.buildPackageBundle(
18671866
uriList: [
18681867
Uri.parse('package:foo/foo.dart'),
@@ -1938,7 +1937,7 @@ elementFactory
19381937
{
19391938
final fooRoot = getFolder('$workspaceRootPath/foo');
19401939

1941-
newFile('${fooRoot.path}/lib/foo.dart', r'''
1940+
final foo = newFile('${fooRoot.path}/lib/foo.dart', r'''
19421941
part 'foo2.dart';
19431942
''');
19441943

@@ -1955,7 +1954,7 @@ part of 'foo.dart';
19551954
PackageConfigFileBuilder()..add(name: 'foo', rootPath: fooRoot.path),
19561955
);
19571956

1958-
final analysisDriver = driverFor(fooRoot.path);
1957+
final analysisDriver = driverFor(foo);
19591958
final bundleBytes = await analysisDriver.buildPackageBundle(
19601959
uriList: [
19611960
Uri.parse('package:foo/foo.dart'),
@@ -2349,7 +2348,7 @@ elementFactory
23492348
{
23502349
final fooRoot = getFolder('$workspaceRootPath/foo');
23512350

2352-
newFile('${fooRoot.path}/lib/foo.dart', 'class F {}');
2351+
final foo = newFile('${fooRoot.path}/lib/foo.dart', 'class F {}');
23532352

23542353
final fooPackageConfigFile = getFile(
23552354
'${fooRoot.path}/.dart_tool/package_config.json',
@@ -2360,7 +2359,7 @@ elementFactory
23602359
PackageConfigFileBuilder()..add(name: 'foo', rootPath: fooRoot.path),
23612360
);
23622361

2363-
final analysisDriver = driverFor(fooRoot.path);
2362+
final analysisDriver = driverFor(foo);
23642363
final bundleBytes = await analysisDriver.buildPackageBundle(
23652364
uriList: [
23662365
Uri.parse('package:foo/foo.dart'),
@@ -2435,7 +2434,7 @@ elementFactory
24352434
{
24362435
final fooRoot = getFolder('$workspaceRootPath/foo');
24372436

2438-
newFile('${fooRoot.path}/lib/foo.dart', r'''
2437+
final foo = newFile('${fooRoot.path}/lib/foo.dart', r'''
24392438
part 'foo2.dart';
24402439
''');
24412440

@@ -2452,7 +2451,7 @@ part of 'foo.dart';
24522451
PackageConfigFileBuilder()..add(name: 'foo', rootPath: fooRoot.path),
24532452
);
24542453

2455-
final analysisDriver = driverFor(fooRoot.path);
2454+
final analysisDriver = driverFor(foo);
24562455
final bundleBytes = await analysisDriver.buildPackageBundle(
24572456
uriList: [
24582457
Uri.parse('package:foo/foo.dart'),

‎pkg/analyzer/test/src/dart/analysis/resolve_for_completion_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ main() {
1919
@reflectiveTest
2020
class ResolveForCompletionTest extends PubPackageResolutionTest {
2121
AnalysisDriver get testDriver {
22-
return driverFor(testFile.path);
22+
return driverFor(testFile);
2323
}
2424

2525
test_class__fieldDeclaration_type_namedType_name() async {

0 commit comments

Comments
 (0)