Skip to content

Commit fcbadcd

Browse files
authored
Remove null safety badge (#3295)
1 parent 263ea61 commit fcbadcd

6 files changed

+4
-50
lines changed

lib/src/element_type.dart

+1-1
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ class GenericTypeAliasElementType extends TypeParameterElementType {
423423
extension on DartType {
424424
/// The dartdoc nullability suffix for this type in [library].
425425
String nullabilitySuffixWithin(Library library) {
426-
if (library.isNullSafety && !isVoid && !isBottom) {
426+
if (!isVoid && !isBottom) {
427427
/// If a legacy type appears inside the public interface of a Null
428428
/// safety library, we pretend it is nullable for the purpose of
429429
/// documentation (since star-types are not supposed to be public).

lib/src/generator/templates.runtime_renderers.dart

-14
Original file line numberDiff line numberDiff line change
@@ -5261,13 +5261,6 @@ class _Renderer_FeatureSet extends RendererBase<FeatureSet> {
52615261
self.renderSimpleVariable(c, remainingNames, 'bool'),
52625262
getBool: (CT_ c) => c.hasFeatureSet == true,
52635263
),
5264-
'isNullSafety': Property(
5265-
getValue: (CT_ c) => c.isNullSafety,
5266-
renderVariable: (CT_ c, Property<CT_> self,
5267-
List<String> remainingNames) =>
5268-
self.renderSimpleVariable(c, remainingNames, 'bool'),
5269-
getBool: (CT_ c) => c.isNullSafety == true,
5270-
),
52715264
'library': Property(
52725265
getValue: (CT_ c) => c.library,
52735266
renderVariable:
@@ -7826,13 +7819,6 @@ class _Renderer_Library extends RendererBase<Library> {
78267819
self.renderSimpleVariable(c, remainingNames, 'bool'),
78277820
getBool: (CT_ c) => c.isInSdk == true,
78287821
),
7829-
'isNullSafety': Property(
7830-
getValue: (CT_ c) => c.isNullSafety,
7831-
renderVariable: (CT_ c, Property<CT_> self,
7832-
List<String> remainingNames) =>
7833-
self.renderSimpleVariable(c, remainingNames, 'bool'),
7834-
getBool: (CT_ c) => c.isNullSafety == true,
7835-
),
78367822
'isPublic': Property(
78377823
getValue: (CT_ c) => c.isPublic,
78387824
renderVariable: (CT_ c, Property<CT_> self,

lib/src/model/feature_set.dart

+1-12
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,7 @@ mixin FeatureSet {
1313

1414
/// A list of language features that both apply to this [ModelElement] and
1515
/// make sense to display in context.
16-
Iterable<LanguageFeature> get displayedLanguageFeatures sync* {
17-
// TODO(jcollins-g): Implement mixed-mode handling and the tagging of
18-
// legacy interfaces.
19-
if (isNullSafety) {
20-
yield LanguageFeature(
21-
'Null safety', packageGraph.rendererFactory.languageFeatureRenderer);
22-
}
23-
}
16+
Iterable<LanguageFeature> get displayedLanguageFeatures => const [];
2417

2518
bool get hasFeatureSet => displayedLanguageFeatures.isNotEmpty;
26-
27-
// TODO(jcollins-g): This is an approximation and not strictly true for
28-
// inheritance/reexports.
29-
bool get isNullSafety => library.isNullSafety;
3019
}

lib/src/model/language_feature.dart

+2-6
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,9 @@
44

55
import 'package:dartdoc/src/render/language_feature_renderer.dart';
66

7-
const Map<String, String> _featureDescriptions = {
8-
'Null safety': 'Supports the null safety language feature.',
9-
};
7+
const Map<String, String> _featureDescriptions = {};
108

11-
const Map<String, String> _featureUrls = {
12-
'Null safety': 'https://dart.dev/null-safety',
13-
};
9+
const Map<String, String> _featureUrls = {};
1410

1511
/// An abstraction for a language feature; used to render tags to notify
1612
/// the user that the documentation should be specially interpreted.

lib/src/model/library.dart

-11
Original file line numberDiff line numberDiff line change
@@ -208,17 +208,6 @@ class Library extends ModelElement with Categorization, TopLevelContainer {
208208
@override
209209
Scope get scope => element.scope;
210210

211-
/// Whether this library is in a package configured to be treated as using
212-
/// null safety and itself uses null safety.
213-
bool get _allowsNullSafety => element.isNonNullableByDefault;
214-
215-
/// Whether this library should be documented as using null safety.
216-
///
217-
/// A library may use null safety but not be documented that way.
218-
@override
219-
bool get isNullSafety =>
220-
config.enableExperiment.contains('non-nullable') && _allowsNullSafety;
221-
222211
bool get isInSdk => element.isInSdk;
223212

224213
/// [allModelElements] resolved to their original names.

test/end2end/model_test.dart

-6
Original file line numberDiff line numberDiff line change
@@ -314,10 +314,6 @@ void main() {
314314
equals(''));
315315
});
316316

317-
test('isNullSafety is set correctly for libraries', () {
318-
expect(lateFinalWithoutInitializer.isNullSafety, isTrue);
319-
});
320-
321317
test('method parameters with required', () {
322318
var m1 = b.instanceMethods.firstWhere((m) => m.name == 'm1');
323319
var p1 = m1.parameters.firstWhere((p) => p.name == 'p1');
@@ -416,7 +412,6 @@ void main() {
416412
test('complex nullable elements are detected and rendered correctly', () {
417413
var complexNullableMembers = nullableElements.allClasses
418414
.firstWhere((c) => c.name == 'ComplexNullableMembers');
419-
expect(complexNullableMembers.isNullSafety, isTrue);
420415
expect(
421416
complexNullableMembers.nameWithGenerics,
422417
equals(
@@ -430,7 +425,6 @@ void main() {
430425
.firstWhere((f) => f.name == 'methodWithNullables');
431426
var operatorStar = nullableMembers.publicInstanceOperators
432427
.firstWhere((f) => f.name == 'operator *');
433-
expect(nullableMembers.isNullSafety, isTrue);
434428
expect(
435429
methodWithNullables.linkedParams,
436430
equals(

0 commit comments

Comments
 (0)