danog/dart-sass
1
0
Fork 0
mirror of https://github.com/danog/dart-sass.git synced 2024-11-30 04:39:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Code review changes

Browse Source
This commit is contained in:
Natalie Weizenbaum 2018-06-13 12:28:36 -07:00
parent 1ddc7c0e3e
commit 1942466924
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/src/executable/watch.dart
View File

@ -21,7 +21,7 @@ import 'options.dart';
Future watch(ExecutableOptions options, StylesheetGraph graph) async {
var directoriesToWatch = <String>[]
..addAll(options.sourceDirectoriesToDestinations.keys)
..addAll(options.sourcesToDestinations.keys.map((path) => p.dirname(path)))
..addAll(options.sourcesToDestinations.keys.map(p.dirname))
..addAll(options.loadPaths);
var dirWatcher = new MultiDirWatcher();
@ -64,8 +64,8 @@ class _Watcher {
await compileStylesheet(_options, _graph, source, destination,
ifModified: ifModified);
} on SassException catch (error, stackTrace) {
_printError(error.toString(color: _options.color), stackTrace);
_delete(destination);
_printError(error.toString(color: _options.color), stackTrace);
} on FileSystemException catch (error, stackTrace) {
_printError("Error reading ${p.relative(error.path)}: ${error.message}.",
stackTrace);
@ -113,8 +113,12 @@ class _Watcher {
case ChangeType.MODIFY:
if (!_graph.nodes.containsKey(url)) continue loop;
// Access the node ahead-of-time because it's possible that
// `_graph.reload()` notices the file has been deleted and removes it
// from the graph.
var node = _graph.nodes[url];
_graph.reload(url);
await _recompileDownstream([_graph.nodes[url]]);
await _recompileDownstream([node]);
break;
case ChangeType.ADD:
@ -136,8 +140,9 @@ class _Watcher {
var destination = _destinationFor(event.path);
if (destination != null) _delete(destination);
var node = _graph.nodes[url];
_graph.remove(url);
await _recompileDownstream([_graph.nodes[url]]);
await _recompileDownstream([node]);
break;
}
}

2
lib/src/stylesheet_graph.dart
View File

@ -142,7 +142,7 @@ class StylesheetGraph {
///
/// Throws a [StateError] if [canonicalUrl] isn't already in the dependency graph.
void remove(Uri canonicalUrl) {
var node = _nodes[canonicalUrl];
var node = _nodes.remove(canonicalUrl);
if (node == null) {
throw new StateError("$canonicalUrl is not in the dependency graph.");
}