Skip to content

Commit

Permalink
refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
kevmoo committed May 14, 2015
1 parent be74d46 commit 7a679e2
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 15 deletions.
12 changes: 3 additions & 9 deletions lib/coverage.dart
@@ -1,11 +1,5 @@
library coverage;

import 'dart:async';
import 'dart:convert';
import 'dart:io';
import 'package:path/path.dart';
import 'dart:isolate';

part 'src/formatter.dart';
part 'src/hitmap.dart';
part 'src/resolver.dart';
export 'src/hitmap.dart';
export 'src/formatter.dart';
export 'src/resolver.dart';
6 changes: 5 additions & 1 deletion lib/src/formatter.dart
@@ -1,4 +1,8 @@
part of coverage;
library coverage.formatter;

import 'dart:async';

import 'resolver.dart';

abstract class Formatter {
Future<String> format(Map json);
Expand Down
9 changes: 7 additions & 2 deletions lib/src/hitmap.dart
@@ -1,4 +1,9 @@
part of coverage;
library coverage.hitmap;

import 'dart:async';
import 'dart:convert';
import 'dart:io';
import 'dart:isolate';

/// Creates a single hitmap from a raw json object. Throws away all entries that
/// are not resolvable.
Expand Down Expand Up @@ -72,7 +77,7 @@ Future<Map> parseCoverage(List<File> files, int workers) {
})).then((_) => globalHitmap);
}

Future<Map> _spawnWorker(name, files) {
Future<Map> _spawnWorker(String name, List files) {
RawReceivePort port = new RawReceivePort();
var completer = new Completer();
port.handler = ((Map hitmap) {
Expand Down
12 changes: 9 additions & 3 deletions lib/src/resolver.dart
@@ -1,4 +1,10 @@
part of coverage;
library coverage.resolver;

import 'dart:async';
import 'dart:convert';
import 'dart:io';

import 'package:path/path.dart' as p;

/// [Resolver] resolves imports with respect to a given environment.
class Resolver {
Expand Down Expand Up @@ -52,7 +58,7 @@ class Resolver {
return resolveSymbolicLinks('$pkgRoot/$path');
}
if (uri.startsWith(FILE_PREFIX)) {
return resolveSymbolicLinks(fromUri(Uri.parse(uri)));
return resolveSymbolicLinks(p.fromUri(Uri.parse(uri)));
}
if (uri.startsWith(HTTP_PREFIX)) {
return uri;
Expand All @@ -63,7 +69,7 @@ class Resolver {
}

String resolveSymbolicLinks(String path) {
return new File(normalize(path)).resolveSymbolicLinksSync();
return new File(p.normalize(path)).resolveSymbolicLinksSync();
}
}

Expand Down

0 comments on commit 7a679e2

Please sign in to comment.