Move pkg/dds to package:lints.
Change-Id: I614a826569fee248b72f973a863e758949c04932
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/241146
Reviewed-by: Ben Konyi <bkonyi@google.com>
Commit-Queue: Devon Carew <devoncarew@google.com>
diff --git a/pkg/dds/analysis_options.yaml b/pkg/dds/analysis_options.yaml
index 6b1919a..8f7435b 100644
--- a/pkg/dds/analysis_options.yaml
+++ b/pkg/dds/analysis_options.yaml
@@ -1,4 +1,4 @@
-include: package:pedantic/analysis_options.1.8.0.yaml
+include: package:lints/core.yaml
linter:
rules:
diff --git a/pkg/dds/lib/src/dap/adapters/dart_cli_adapter.dart b/pkg/dds/lib/src/dap/adapters/dart_cli_adapter.dart
index 1c8be40..eecc025 100644
--- a/pkg/dds/lib/src/dap/adapters/dart_cli_adapter.dart
+++ b/pkg/dds/lib/src/dap/adapters/dart_cli_adapter.dart
@@ -8,7 +8,6 @@
import 'dart:math' as math;
import 'package:path/path.dart' as path;
-import 'package:pedantic/pedantic.dart';
import 'package:vm_service/vm_service.dart' as vm;
import '../logging.dart';
diff --git a/pkg/dds/lib/src/dap/adapters/dart_test_adapter.dart b/pkg/dds/lib/src/dap/adapters/dart_test_adapter.dart
index 0a2b63c..468ea09 100644
--- a/pkg/dds/lib/src/dap/adapters/dart_test_adapter.dart
+++ b/pkg/dds/lib/src/dap/adapters/dart_test_adapter.dart
@@ -7,7 +7,6 @@
import 'dart:io';
import 'dart:math' as math;
-import 'package:pedantic/pedantic.dart';
import 'package:vm_service/vm_service.dart' as vm;
import '../logging.dart';
diff --git a/pkg/dds/lib/src/dap/adapters/mixins.dart b/pkg/dds/lib/src/dap/adapters/mixins.dart
index 53de6fc..8ecf1eb 100644
--- a/pkg/dds/lib/src/dap/adapters/mixins.dart
+++ b/pkg/dds/lib/src/dap/adapters/mixins.dart
@@ -7,7 +7,6 @@
import 'dart:io';
import 'package:path/path.dart' as path;
-import 'package:pedantic/pedantic.dart';
import '../logging.dart';
import '../protocol_common.dart';
diff --git a/pkg/dds/lib/src/dds_impl.dart b/pkg/dds/lib/src/dds_impl.dart
index 8de53ff..a52fd13 100644
--- a/pkg/dds/lib/src/dds_impl.dart
+++ b/pkg/dds/lib/src/dds_impl.dart
@@ -11,7 +11,6 @@
import 'package:json_rpc_2/json_rpc_2.dart' as json_rpc;
import 'package:meta/meta.dart';
-import 'package:pedantic/pedantic.dart';
import 'package:shelf/shelf.dart';
import 'package:shelf/shelf_io.dart' as io;
import 'package:shelf_proxy/shelf_proxy.dart';
diff --git a/pkg/dds/lib/src/utils/mutex.dart b/pkg/dds/lib/src/utils/mutex.dart
index 9aff468..dcbbf59 100644
--- a/pkg/dds/lib/src/utils/mutex.dart
+++ b/pkg/dds/lib/src/utils/mutex.dart
@@ -36,7 +36,7 @@
// Reinitialize if this is the only weakly guarded scope.
_outstandingReadersCompleter = Completer<void>();
}
- final result;
+ final T result;
try {
await _acquireLock(strong: false);
result = await criticalSection();
diff --git a/pkg/dds/pubspec.yaml b/pkg/dds/pubspec.yaml
index 1430222..bfb5a961 100644
--- a/pkg/dds/pubspec.yaml
+++ b/pkg/dds/pubspec.yaml
@@ -8,7 +8,7 @@
homepage: https://github.com/dart-lang/sdk/tree/master/pkg/dds
environment:
- sdk: '>=2.13.0 <3.0.0'
+ sdk: '>=2.14.0 <3.0.0'
dependencies:
args: ^2.0.0
@@ -21,7 +21,6 @@
json_rpc_2: ^3.0.0
meta: ^1.1.8
path: ^1.8.0
- pedantic: ^1.7.0
shelf: ^1.0.0
shelf_proxy: ^1.0.0
shelf_static: ^1.0.0
@@ -34,5 +33,6 @@
dev_dependencies:
http: ^0.13.0
+ lints: any
test: ^1.0.0
webdriver: ^3.0.0
diff --git a/pkg/dds/test/dap/integration/debug_eval_test.dart b/pkg/dds/test/dap/integration/debug_eval_test.dart
index 9d6ff1b..a21b5cb 100644
--- a/pkg/dds/test/dap/integration/debug_eval_test.dart
+++ b/pkg/dds/test/dap/integration/debug_eval_test.dart
@@ -19,7 +19,7 @@
group('debug mode evaluation', () {
test('evaluates expressions with simple results', () async {
final client = dap.client;
- final testFile = await dap.createTestFile('''
+ final testFile = dap.createTestFile('''
void main(List<String> args) {
var a = 1;
var b = 2;
@@ -37,7 +37,7 @@
test('evaluates expressions with complex results', () async {
final client = dap.client;
- final testFile = await dap.createTestFile(simpleBreakpointProgram);
+ final testFile = dap.createTestFile(simpleBreakpointProgram);
final breakpointLine = lineWith(testFile, breakpointMarker);
final stop = await client.hitBreakpoint(testFile, breakpointLine);
@@ -60,7 +60,7 @@
test('evaluates expressions ending with semicolons', () async {
final client = dap.client;
- final testFile = await dap.createTestFile('''
+ final testFile = dap.createTestFile('''
void main(List<String> args) {
var a = 1;
var b = 2;
@@ -77,7 +77,7 @@
'evaluates complex expressions expressions with evaluateToStringInDebugViews=true',
() async {
final client = dap.client;
- final testFile = await dap.createTestFile(simpleBreakpointProgram);
+ final testFile = dap.createTestFile(simpleBreakpointProgram);
final breakpointLine = lineWith(testFile, breakpointMarker);
final stop = await client.hitBreakpoint(
@@ -99,7 +99,7 @@
'evaluates $threadExceptionExpression to the threads exception (simple type)',
() async {
final client = dap.client;
- final testFile = await dap.createTestFile(r'''
+ final testFile = dap.createTestFile(r'''
void main(List<String> args) {
throw 'my error';
}''');
@@ -118,7 +118,7 @@
'evaluates $threadExceptionExpression to the threads exception (complex type)',
() async {
final client = dap.client;
- final testFile = await dap.createTestFile(r'''
+ final testFile = dap.createTestFile(r'''
void main(List<String> args) {
throw Exception('my error');
}''');
@@ -137,7 +137,7 @@
'evaluates $threadExceptionExpression.x.y to x.y on the threads exception',
() async {
final client = dap.client;
- final testFile = await dap.createTestFile(r'''
+ final testFile = dap.createTestFile(r'''
void main(List<String> args) {
throw Exception('12345');
}
@@ -154,7 +154,7 @@
test('can evaluate expressions in non-top frames', () async {
final client = dap.client;
- final testFile = await dap.createTestFile('''
+ final testFile = dap.createTestFile('''
void main(List<String> args) {
var a = 999;
foo();
@@ -175,7 +175,7 @@
test('returns the full message for evaluation errors', () async {
final client = dap.client;
- final testFile = await dap.createTestFile(simpleBreakpointProgram);
+ final testFile = dap.createTestFile(simpleBreakpointProgram);
final breakpointLine = lineWith(testFile, breakpointMarker);
final stop = await client.hitBreakpoint(testFile, breakpointLine);
@@ -198,7 +198,7 @@
test('returns short errors for evaluation in "watch" context', () async {
final client = dap.client;
- final testFile = await dap.createTestFile(simpleBreakpointProgram);
+ final testFile = dap.createTestFile(simpleBreakpointProgram);
final breakpointLine = lineWith(testFile, breakpointMarker);
final stop = await client.hitBreakpoint(testFile, breakpointLine);
diff --git a/pkg/dds/test/dap/integration/debug_services_test.dart b/pkg/dds/test/dap/integration/debug_services_test.dart
index 98f698e..99dd7f6 100644
--- a/pkg/dds/test/dap/integration/debug_services_test.dart
+++ b/pkg/dds/test/dap/integration/debug_services_test.dart
@@ -19,7 +19,7 @@
group('debug mode', () {
test('reports the VM Service URI to the client', () async {
final client = dap.client;
- final testFile = await dap.createTestFile(simpleBreakpointProgram);
+ final testFile = dap.createTestFile(simpleBreakpointProgram);
final breakpointLine = lineWith(testFile, breakpointMarker);
await client.hitBreakpoint(testFile, breakpointLine);
@@ -31,7 +31,7 @@
test('exposes VM services to the client', () async {
final client = dap.client;
- final testFile = await dap.createTestFile(simpleBreakpointProgram);
+ final testFile = dap.createTestFile(simpleBreakpointProgram);
final breakpointLine = lineWith(testFile, breakpointMarker);
// Capture our test service registration.
@@ -68,7 +68,7 @@
test('exposes VM service extensions to the client', () async {
final client = dap.client;
- final testFile = await dap.createTestFile(serviceExtensionProgram);
+ final testFile = dap.createTestFile(serviceExtensionProgram);
// Capture our test service registration.
final serviceExtensionAddedFuture = client.serviceExtensionAddedEvents
diff --git a/pkg/dds/test/dap/integration/debug_stack_test.dart b/pkg/dds/test/dap/integration/debug_stack_test.dart
index 72f2cb5..e14458f 100644
--- a/pkg/dds/test/dap/integration/debug_stack_test.dart
+++ b/pkg/dds/test/dap/integration/debug_stack_test.dart
@@ -18,7 +18,7 @@
group('debug mode stack trace', () {
test('includes expected names and async boundaries', () async {
final client = dap.client;
- final testFile = await dap.createTestFile(simpleAsyncProgram);
+ final testFile = dap.createTestFile(simpleAsyncProgram);
final breakpointLine = lineWith(testFile, breakpointMarker);
final stop = await client.hitBreakpoint(testFile, breakpointLine);
@@ -60,7 +60,7 @@
test('only sets canRestart where VM can rewind', () async {
final client = dap.client;
- final testFile = await dap.createTestFile(simpleAsyncProgram);
+ final testFile = dap.createTestFile(simpleAsyncProgram);
final breakpointLine = lineWith(testFile, breakpointMarker);
final stop = await client.hitBreakpoint(testFile, breakpointLine);
@@ -91,7 +91,7 @@
test('deemphasizes SDK frames when debugSdk=false', () async {
final client = dap.client;
- final testFile = await dap.createTestFile(sdkStackFrameProgram);
+ final testFile = dap.createTestFile(sdkStackFrameProgram);
final breakpointLine = lineWith(testFile, breakpointMarker);
final stop = await client.hitBreakpoint(
@@ -123,7 +123,7 @@
test('does not deemphasize SDK frames when debugSdk=true', () async {
final client = dap.client;
- final testFile = await dap.createTestFile(sdkStackFrameProgram);
+ final testFile = dap.createTestFile(sdkStackFrameProgram);
final breakpointLine = lineWith(testFile, breakpointMarker);
final stop = await client.hitBreakpoint(
diff --git a/pkg/dds/test/dap/integration/debug_test.dart b/pkg/dds/test/dap/integration/debug_test.dart
index 974692f..9044657 100644
--- a/pkg/dds/test/dap/integration/debug_test.dart
+++ b/pkg/dds/test/dap/integration/debug_test.dart
@@ -114,7 +114,7 @@
], eagerError: true);
// Resume and expect termination.
- await await Future.wait([
+ await Future.wait([
dap.client.event('terminated'),
dap.client.continue_((await stop).threadId!),
], eagerError: true);
diff --git a/pkg/dds/test/dap/integration/debug_variables_test.dart b/pkg/dds/test/dap/integration/debug_variables_test.dart
index 86f4412..e78ecd0 100644
--- a/pkg/dds/test/dap/integration/debug_variables_test.dart
+++ b/pkg/dds/test/dap/integration/debug_variables_test.dart
@@ -18,7 +18,7 @@
group('debug mode variables', () {
test('provides variable list for frames', () async {
final client = dap.client;
- final testFile = await dap.createTestFile('''
+ final testFile = dap.createTestFile('''
void main(List<String> args) {
final myVariable = 1;
foo();
@@ -58,7 +58,7 @@
test('provides simple exception types for frames', () async {
final client = dap.client;
- final testFile = await dap.createTestFile(r'''
+ final testFile = dap.createTestFile(r'''
void main(List<String> args) {
throw 'my error';
}
@@ -80,7 +80,7 @@
test('provides complex exception types for frames', () async {
final client = dap.client;
- final testFile = await dap.createTestFile(r'''
+ final testFile = dap.createTestFile(r'''
void main(List<String> args) {
throw ArgumentError.notNull('args');
}
@@ -104,7 +104,7 @@
test('includes simple variable fields', () async {
final client = dap.client;
- final testFile = await dap.createTestFile('''
+ final testFile = dap.createTestFile('''
void main(List<String> args) {
final myVariable = DateTime(2000, 1, 1);
print('Hello!'); $breakpointMarker
@@ -126,7 +126,7 @@
test('includes variable getters when evaluateGettersInDebugViews=true',
() async {
final client = dap.client;
- final testFile = await dap.createTestFile('''
+ final testFile = dap.createTestFile('''
void main(List<String> args) {
final myVariable = DateTime(2000, 1, 1);
print('Hello!'); $breakpointMarker
@@ -172,7 +172,7 @@
test('renders a simple list', () async {
final client = dap.client;
- final testFile = await dap.createTestFile('''
+ final testFile = dap.createTestFile('''
void main(List<String> args) {
final myVariable = ["first", "second", "third"];
print('Hello!'); $breakpointMarker
@@ -195,7 +195,7 @@
test('renders a simple list subset', () async {
final client = dap.client;
- final testFile = await dap.createTestFile('''
+ final testFile = dap.createTestFile('''
void main(List<String> args) {
final myVariable = ["first", "second", "third"];
print('Hello!'); $breakpointMarker
@@ -218,7 +218,7 @@
test('renders a simple map with keys/values', () async {
final client = dap.client;
- final testFile = await dap.createTestFile('''
+ final testFile = dap.createTestFile('''
void main(List<String> args) {
final myVariable = {
'zero': 0,
@@ -261,7 +261,7 @@
test('renders a simple map subset', () async {
final client = dap.client;
- final testFile = await dap.createTestFile('''
+ final testFile = dap.createTestFile('''
void main(List<String> args) {
final myVariable = {
'zero': 0,
@@ -291,7 +291,7 @@
test('renders a complex map with keys/values', () async {
final client = dap.client;
- final testFile = await dap.createTestFile('''
+ final testFile = dap.createTestFile('''
void main(List<String> args) {
final myVariable = {
DateTime(2000, 1, 1): Exception("my error")
@@ -349,7 +349,7 @@
test('calls toString() on custom classes', () async {
final client = dap.client;
- final testFile = await dap.createTestFile('''
+ final testFile = dap.createTestFile('''
class Foo {
toString() => 'Bar!';
}
@@ -386,7 +386,7 @@
//
// myVariable: Foo (Instance of Foo)
final client = dap.client;
- final testFile = await dap.createTestFile('''
+ final testFile = dap.createTestFile('''
class Foo {}
void main() {
@@ -416,7 +416,7 @@
test('handles errors in getters', () async {
final client = dap.client;
- final testFile = await dap.createTestFile('''
+ final testFile = dap.createTestFile('''
class Foo {
String get doesNotThrow => "success";
String get throws => throw Exception('err');
diff --git a/pkg/dds/test/dap/integration/test_server.dart b/pkg/dds/test/dap/integration/test_server.dart
index ccb4c1d..519f5e1 100644
--- a/pkg/dds/test/dap/integration/test_server.dart
+++ b/pkg/dds/test/dap/integration/test_server.dart
@@ -10,7 +10,6 @@
import 'package:dds/src/dap/logging.dart';
import 'package:dds/src/dap/server.dart';
import 'package:path/path.dart' as path;
-import 'package:pedantic/pedantic.dart';
/// Enable to run from local source (useful in development).
const runFromSource = false;
@@ -94,7 +93,7 @@
@override
Future<void> stop() async {
_isShuttingDown = true;
- await _process.kill();
+ _process.kill();
await _process.exitCode;
}
diff --git a/pkg/dds/test/handles_client_disconnect_state_error_test.dart b/pkg/dds/test/handles_client_disconnect_state_error_test.dart
index c9d35fa..9359389 100644
--- a/pkg/dds/test/handles_client_disconnect_state_error_test.dart
+++ b/pkg/dds/test/handles_client_disconnect_state_error_test.dart
@@ -8,7 +8,6 @@
import 'package:dds/src/dds_impl.dart';
import 'package:dds/src/rpc_error_codes.dart';
import 'package:json_rpc_2/json_rpc_2.dart' as json_rpc;
-import 'package:pedantic/pedantic.dart';
import 'package:test/test.dart';
import 'package:web_socket_channel/web_socket_channel.dart';
@@ -49,7 +48,7 @@
test('StateError handled by _StreamManager.clientDisconnect', () async {
final dds = await DartDevelopmentService.startDartDevelopmentService(
Uri(scheme: 'http'));
- final ws = await WebSocketChannel.connect(dds.uri!.replace(scheme: 'ws'));
+ final ws = WebSocketChannel.connect(dds.uri!.replace(scheme: 'ws'));
// Create a VM service client that connects to DDS.
final client = json_rpc.Client(ws.cast<String>());
@@ -76,7 +75,7 @@
() async {
final dds = await DartDevelopmentService.startDartDevelopmentService(
Uri(scheme: 'http'));
- final ws = await WebSocketChannel.connect(dds.uri!.replace(scheme: 'ws'));
+ final ws = WebSocketChannel.connect(dds.uri!.replace(scheme: 'ws'));
// Create a VM service client that connects to DDS.
final client = json_rpc.Client(ws.cast<String>());
