Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion dwds/analysis_options.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# This file contains the analysis options used for code in the webdev
# repository.

include: package:lints/recommended.yaml

analyzer:
exclude:
# Ignore generated files
Expand All @@ -9,4 +11,3 @@ analyzer:
linter:
rules:
- prefer_final_locals

6 changes: 3 additions & 3 deletions dwds/lib/src/handlers/dev_handler.dart
Original file line number Diff line number Diff line change
Expand Up @@ -613,12 +613,12 @@ extension<T> on Stream<T> {
: StreamController<T>(sync: true);

StreamSubscription<T> subscription;
Timer _gapTimer;
Timer gapTimer;
controller.onListen = () {
subscription = listen((e) {
controller.add(e);
_gapTimer?.cancel();
_gapTimer = Timer(gap, () {
gapTimer?.cancel();
gapTimer = Timer(gap, () {
subscription.cancel();
controller.close();
});
Expand Down
10 changes: 5 additions & 5 deletions dwds/lib/src/servers/extension_backend.dart
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ class ExtensionBackend {
Future<void> _closed;

ExtensionBackend._(
SocketHandler _socketHandler, this.hostname, this.port, this._server)
: connections = _socketHandler.connections;
SocketHandler socketHandler, this.hostname, this.port, this._server)
: connections = socketHandler.connections;

// Starts the backend on an open port.
static Future<ExtensionBackend> start(
SocketHandler _socketHandler, String hostname) async {
SocketHandler socketHandler, String hostname) async {
var cascade = Cascade();
cascade = cascade.add((request) {
if (request.url.path == authenticationPath) {
Expand All @@ -52,14 +52,14 @@ class ExtensionBackend {
});
}
return Response.notFound('');
}).add(_socketHandler.handler);
}).add(socketHandler.handler);
final server = await startHttpServer(hostname);
serveHttpRequests(server, cascade.handler, (e, s) {
_logger.warning('Error serving requests', e);
emitEvent(DwdsEvent.httpRequestException('ExtensionBackend', '$e:$s'));
});
return ExtensionBackend._(
_socketHandler, server.address.host, server.port, server);
socketHandler, server.address.host, server.port, server);
}

Future<void> close() => _closed ??= _server.close();
Expand Down
1 change: 1 addition & 0 deletions dwds/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ dev_dependencies:
frontend_server_common:
path: ../frontend_server_common
js: ^0.6.4
lints: ^2.0.0
pubspec_parse: ^1.2.0
stream_channel: ^2.1.0
test: ^1.21.1
Expand Down
4 changes: 2 additions & 2 deletions dwds/test/chrome_proxy_service_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,9 @@ void main() {

test('addBreakpointWithScriptUri absolute file URI', () async {
final current = context.workingDirectory;
final _test = path.join(path.dirname(current), '_test');
final test = path.join(path.dirname(current), '_test');
final scriptPath = Uri.parse(mainScript.uri).path.substring(1);
final fullPath = path.join(_test, scriptPath);
final fullPath = path.join(test, scriptPath);
final fileUri = Uri.file(fullPath);
final line = await context.findBreakpointLine(
'printHelloWorld', isolate.id, mainScript);
Expand Down
4 changes: 2 additions & 2 deletions dwds/test/readers/frontend_server_asset_reader_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ void main() {
File jsonOriginal;
File mapOriginal;

Future<void> _createTempFixtures() async {
Future<void> createTempFixtures() async {
final fixtures = p.join('test', 'fixtures');
tempFixtures = await Directory.systemTemp.createTemp('dwds_test_fixtures');
await tempFixtures.create();
Expand All @@ -37,7 +37,7 @@ void main() {
});

setUp(() async {
await _createTempFixtures();
await createTempFixtures();
assetReader = FrontendServerAssetReader(
p.join(tempFixtures.path, 'main.dart.dill'),
packagesDir,
Expand Down