Skip to content

Commit 574cc7e

Browse files
authored
Migrate various util and small libraries (#2805)
1 parent ec52392 commit 574cc7e

File tree

5 files changed

+14
-23
lines changed

5 files changed

+14
-23
lines changed

lib/src/generator/resource_loader.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5-
// @dart=2.9
6-
75
/// Make it possible to load resources from the dartdoc code repository.
86
library dartdoc.resource_loader;
97

lib/src/generator/template_data.dart

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5-
// @dart=2.9
6-
5+
import 'package:collection/collection.dart';
76
import 'package:dartdoc/src/model/model.dart';
87

98
typedef ContainerSidebar = String Function(
@@ -31,7 +30,7 @@ abstract class TemplateData<T extends Documentable> {
3130

3231
List<Documentable> get navLinks;
3332
List<Container> get navLinksWithGenerics => [];
34-
Documentable get parent {
33+
Documentable? get parent {
3534
if (navLinksWithGenerics.isEmpty) {
3635
return navLinks.isNotEmpty ? navLinks.last : null;
3736
}
@@ -42,7 +41,7 @@ abstract class TemplateData<T extends Documentable> {
4241

4342
bool get hasHomepage => false;
4443

45-
String get homepage => null;
44+
String? get homepage => null;
4645

4746
String get htmlBase;
4847
T get self;
@@ -212,10 +211,10 @@ class ClassTemplateData extends InheritingContainerTemplateData<Class> {
212211
abstract class InheritingContainerTemplateData<T extends InheritingContainer>
213212
extends TemplateData<T>
214213
implements TemplateDataWithLibrary<T>, TemplateDataWithContainer<T> {
215-
final InheritingContainer clazz;
214+
final T clazz;
216215
@override
217216
final Library library;
218-
Class _objectType;
217+
Class? _objectType;
219218
final LibrarySidebar _sidebarForLibrary;
220219
final ContainerSidebar _sidebarForContainer;
221220

@@ -236,8 +235,7 @@ abstract class InheritingContainerTemplateData<T extends InheritingContainer>
236235

237236
@override
238237
T get self => clazz;
239-
String get linkedObjectType =>
240-
objectType == null ? 'Object' : objectType.linkedName;
238+
String get linkedObjectType => objectType?.linkedName ?? 'Object';
241239
@override
242240
String get title =>
243241
'${clazz.name} ${clazz.kind} - ${library.name} library - Dart API';
@@ -254,13 +252,13 @@ abstract class InheritingContainerTemplateData<T extends InheritingContainer>
254252
@override
255253
String get htmlBase => '../';
256254

257-
Class get objectType {
255+
Class? get objectType {
258256
if (_objectType != null) {
259-
return _objectType;
257+
return _objectType!;
260258
}
261259

262260
var dc = _packageGraph.libraries
263-
.firstWhere((it) => it.name == 'dart:core', orElse: () => null);
261+
.firstWhereOrNull((it) => it.name == 'dart:core');
264262

265263
return _objectType = dc?.getClassByName('Object');
266264
}

lib/src/package_config_provider.dart

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5-
// @dart=2.9
6-
75
import 'dart:io' as io;
86

97
import 'package:analyzer/file_system/file_system.dart';
@@ -14,12 +12,12 @@ import 'package:package_config/package_config.dart' as package_config;
1412
/// This provides an abstraction around package_config, which can only work
1513
/// with the physical file system.
1614
abstract class PackageConfigProvider {
17-
Future<package_config.PackageConfig> findPackageConfig(Folder dir);
15+
Future<package_config.PackageConfig?> findPackageConfig(Folder dir);
1816
}
1917

2018
class PhysicalPackageConfigProvider implements PackageConfigProvider {
2119
@override
22-
Future<package_config.PackageConfig> findPackageConfig(Folder dir) =>
20+
Future<package_config.PackageConfig?> findPackageConfig(Folder dir) =>
2321
package_config.findPackageConfig(io.Directory(dir.path));
2422
}
2523

@@ -35,8 +33,9 @@ class FakePackageConfigProvider implements PackageConfigProvider {
3533

3634
@override
3735
Future<package_config.PackageConfig> findPackageConfig(Folder dir) async {
38-
assert(_packageConfigData[dir.path] != null,
36+
var packageConfig = _packageConfigData[dir.path];
37+
assert(packageConfig != null,
3938
'Package config data at ${dir.path} should not be null');
40-
return package_config.PackageConfig(_packageConfigData[dir.path]);
39+
return package_config.PackageConfig(packageConfig!);
4140
}
4241
}

lib/src/quiver.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5-
// @dart=2.9
6-
75
/// Methods in-lined from package:quiver.
86
97
// From lib/iterables.dart:

lib/src/tuple.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// Copied from source at github.com/kseo/tuple/blob/470ed3aeb/lib/src/tuple.dart
22

3-
// @dart=2.9
4-
53
// Original copyright:
64
// Copyright (c) 2014, the tuple project authors. Please see the AUTHORS
75
// file for details. All rights reserved. Use of this source code is governed

0 commit comments

Comments
 (0)