Skip to content

Commit 4236027

Browse files
committed
deprecated metadataProvider's soundNullSafety and associated tests
1 parent 344addd commit 4236027

File tree

4 files changed

+6
-29
lines changed

4 files changed

+6
-29
lines changed

dwds/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
- Replace deprecated JS code `this.__proto__` with `Object.getPrototypeOf(this)`. - [#2500](https://github.com/dart-lang/webdev/pull/2500)
44
- Migrate injected client code to `package:web`. - [#2491](https://github.com/dart-lang/webdev/pull/2491)
5-
- Removed unsound null safety options from classes ModuleMetadata, MetadataProvider & Metadata_test. - [#2427](https://github.com/dart-lang/webdev/issues/2427)
5+
- Deprecated MetadataProvider's soundNullSafety'. - [#2427](https://github.com/dart-lang/webdev/issues/2427)
66

77
## 24.1.0
88

dwds/lib/src/debugging/metadata/provider.dart

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ class MetadataProvider {
6969
/// A sound null safety mode for the whole app.
7070
///
7171
/// All libraries have to agree on null safety mode.
72+
@Deprecated(
73+
'This field is deprecated. Use sound null safety enforcement instead.',
74+
)
7275
Future<bool> get soundNullSafety async {
7376
await _initialize();
7477
return true;

dwds/lib/src/services/chrome_proxy_service.dart

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -204,13 +204,9 @@ class ChromeProxyService implements VmServiceInterface {
204204
final moduleFormat = loadStrategy.moduleFormat;
205205
final canaryFeatures = loadStrategy.buildSettings.canaryFeatures;
206206
final experiments = loadStrategy.buildSettings.experiments;
207+
final soundNullSafety = true;
207208

208-
// TODO(annagrin): Read null safety setting from the build settings.
209-
final metadataProvider = loadStrategy.metadataProviderFor(entrypoint);
210-
final soundNullSafety = await metadataProvider.soundNullSafety;
211-
212-
_logger.info('Initializing expression compiler for $entrypoint '
213-
'with sound null safety: $soundNullSafety');
209+
_logger.info('Initializing expression compiler for $entrypoint');
214210

215211
final compilerOptions = CompilerOptions(
216212
moduleFormat: ModuleFormat.values.byName(moduleFormat),

dwds/test/metadata_test.dart

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,6 @@ const _emptySourceMetadata =
2222
'"fileUri":"org-dartlang-app:///web/main.dart","partUris":[]}]}\n'
2323
'// intentionally empty: package blah has no dart sources';
2424

25-
const _noNullSafetyMetadata =
26-
'{"version":"1.0.0","name":"web/main","closureName":"load__web__main",'
27-
'"sourceMapUri":"foo/web/main.ddc.js.map",'
28-
'"moduleUri":"foo/web/main.ddc.js",'
29-
'"libraries":[{"name":"main",'
30-
'"importUri":"org-dartlang-app:///web/main.dart",'
31-
'"fileUri":"org-dartlang-app:///web/main.dart","partUris":[]}]}\n'
32-
'// intentionally empty: package blah has no dart sources';
33-
3425
const _fileUriMetadata =
3526
'{"version":"1.0.0","name":"web/main","closureName":"load__web__main",'
3627
'"sourceMapUri":"foo/web/main.ddc.js.map",'
@@ -57,19 +48,6 @@ void main() {
5748
await provider.libraries,
5849
contains('org-dartlang-app:///web/main.dart'),
5950
);
60-
expect(await provider.soundNullSafety, isNotNull);
61-
});
62-
63-
test('can parse metadata with no null safety information', () async {
64-
final provider = MetadataProvider(
65-
'foo.bootstrap.js',
66-
FakeAssetReader(metadata: _noNullSafetyMetadata),
67-
);
68-
expect(
69-
await provider.libraries,
70-
contains('org-dartlang-app:///web/main.dart'),
71-
);
72-
expect(await provider.soundNullSafety, true);
7351
});
7452

7553
test('throws on metadata with absolute import uris', () async {

0 commit comments

Comments
 (0)