Use package:lints instead of pedantic (#4)
diff --git a/analysis_options.yaml b/analysis_options.yaml
index 108d105..572dd23 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -1 +1 @@
-include: package:pedantic/analysis_options.yaml
+include: package:lints/recommended.yaml
diff --git a/lib/src/source_edit.dart b/lib/src/source_edit.dart
index c1aecf7..1772397 100644
--- a/lib/src/source_edit.dart
+++ b/lib/src/source_edit.dart
@@ -64,15 +64,14 @@
/// final sourceEdit = SourceEdit.fromJson(edit);
/// ```
factory SourceEdit.fromJson(Map<String, dynamic> json) {
- if (json is Map) {
- final offset = json['offset'];
- final length = json['length'];
- final replacement = json['replacement'];
+ final offset = json['offset'];
+ final length = json['length'];
+ final replacement = json['replacement'];
- if (offset is int && length is int && replacement is String) {
- return SourceEdit(offset, length, replacement);
- }
+ if (offset is int && length is int && replacement is String) {
+ return SourceEdit(offset, length, replacement);
}
+
throw FormatException('Invalid JSON passed to SourceEdit');
}
diff --git a/pubspec.yaml b/pubspec.yaml
index 8a98560..f010d9f 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -2,16 +2,17 @@
version: 2.0.0
description: A library for YAML manipulation with comment and whitespace preservation.
homepage: https://github.com/google/dart-neats/tree/master/yaml_edit
-repository: https://github.com/google/dart-neats.git
+repository: https://github.com/dart-lang/yaml_edit.git
issue_tracker: https://github.com/google/dart-neats/labels/pkg:yaml_edit
dependencies:
- collection: ^1.14.11
- meta: ^1.1.8
- source_span: ^1.7.0
+ collection: ^1.15.0
+ meta: ^1.7.0
+ source_span: ^1.8.1
yaml: ^3.1.0
dev_dependencies:
- path: ^1.6.2
- pedantic: ^1.9.0
- test: ^1.14.4
+ lints: ^1.0.1
+ path: ^1.8.0
+ pedantic: ^1.11.1
+ test: ^1.17.12
environment:
sdk: ">=2.12.0 <3.0.0"
diff --git a/test/problem_strings.dart b/test/problem_strings.dart
index a46d29f..43c2070 100644
--- a/test/problem_strings.dart
+++ b/test/problem_strings.dart
@@ -62,7 +62,7 @@
"1'000,00",
'1.000.000,00',
",./;'[]\\-=",
- '<>?:\"{}|_+',
+ '<>?:"{}|_+',
'!@#\$%^&*()`~',
'\u0001\u0002\u0003\u0004\u0005\u0006\u0007\b\u000e\u000f\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001a\u001b\u001c\u001d\u001e\u001f',
'\t\u000b\f
',
@@ -70,8 +70,8 @@
"'",
'"',
"''",
- '\'\"',
- "'\"\'",
+ '\'"',
+ "'\"'",
'社會科學院語學研究所',
'Ⱥ',
'ヽ༼ຈل͜ຈ༽ﾉ ヽ༼ຈل͜ຈ༽ﾉ',
diff --git a/test/random_test.dart b/test/random_test.dart
index b9928ea..1b2f9e9 100644
--- a/test/random_test.dart
+++ b/test/random_test.dart
@@ -7,7 +7,6 @@
import 'package:test/test.dart';
import 'package:yaml/yaml.dart';
-import 'package:yaml_edit/src/wrap.dart';
import 'package:yaml_edit/yaml_edit.dart';
import 'problem_strings.dart';
diff --git a/test/utils_test.dart b/test/utils_test.dart
index 183717c..8d9aef5 100644
--- a/test/utils_test.dart
+++ b/test/utils_test.dart
@@ -5,7 +5,6 @@
import 'package:test/test.dart';
import 'package:yaml/yaml.dart';
import 'package:yaml_edit/src/utils.dart';
-import 'package:yaml_edit/src/wrap.dart';
import 'package:yaml_edit/yaml_edit.dart';
import 'test_utils.dart';
