Skip to content

Commit 7cac7c5

Browse files
author
Tim Blasi
committed
refactor(dart/transform): Correct Dart analyzer warnings
- Fix numerous Dart analyzer warnings we had been ignoring. - Delete unused `in_progress` dir
1 parent aba61f2 commit 7cac7c5

File tree

28 files changed

+123
-1254
lines changed

28 files changed

+123
-1254
lines changed

modules/angular2/pubspec.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ dependencies:
1414
code_transformers: '^0.2.5'
1515
dart_style: '^0.1.3'
1616
html: '^0.12.0'
17+
source_span: '^1.0.0'
1718
stack_trace: '^1.1.1'
1819
transformers:
1920
- angular2

modules/angular2/src/dom/html_adapter.dart

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,36 @@ class Html5LibDomAdapter implements DomAdapter {
1616
'tabindex': 'tabIndex',
1717
};
1818

19+
@override
20+
getGlobalEventTarget(String target) {
21+
throw 'not implemented';
22+
}
23+
24+
@override
25+
getTitle() {
26+
throw 'not implemented';
27+
}
28+
29+
@override
30+
setTitle(String newTitle) {
31+
throw 'not implemented';
32+
}
33+
34+
@override
35+
String getEventKey(event) {
36+
throw 'not implemented';
37+
}
38+
39+
@override
40+
void replaceChild(el, newNode, oldNode) {
41+
throw 'not implemented';
42+
}
43+
44+
@override
45+
dynamic getBoundingClientRect(el) {
46+
throw 'not implemented';
47+
}
48+
1949
Element parse(String templateHtml) => parser.parse(templateHtml).firstChild;
2050
query(selector) {
2151
throw 'not implemented';
@@ -54,7 +84,7 @@ class Html5LibDomAdapter implements DomAdapter {
5484
String type(node) {
5585
throw 'not implemented';
5686
}
57-
content(TemplateElement node) {
87+
content(node) {
5888
throw 'not implemented';
5989
}
6090

modules/angular2/src/transform/common/logging.dart

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
library angular2.transform.common.logging;
22

3+
import 'dart:async';
34
import 'package:barback/barback.dart';
45
import 'package:code_transformers/messages/build_logger.dart';
6+
import 'package:source_span/source_span.dart';
57

68
BuildLogger _logger;
79

@@ -24,6 +26,11 @@ BuildLogger get logger {
2426
}
2527

2628
class PrintLogger implements BuildLogger {
29+
@override
30+
final String detailsUri = '';
31+
@override
32+
final bool convertErrorsToWarnings = false;
33+
2734
void _printWithPrefix(prefix, msg) => print('$prefix: $msg');
2835
void info(msg, {AssetId asset, SourceSpan span}) =>
2936
_printWithPrefix('INFO', msg);
@@ -43,7 +50,7 @@ class PrintLoggerError extends Error {
4350
final AssetId asset;
4451
final SourceSpan span;
4552

46-
PrintLoggerError(message, asset, span);
53+
PrintLoggerError(this.message, this.asset, this.span);
4754

4855
@override
4956
String toString() {

modules/angular2/src/transform/common/names.dart

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ library angular2.transform.common.names;
33
const SETUP_METHOD_NAME = 'initReflector';
44
const REFLECTOR_VAR_NAME = 'reflector';
55
const DEPS_EXTENSION = '.ng_deps.dart';
6+
const REFLECTION_CAPABILITIES_NAME = 'ReflectionCapabilities';
67
const REGISTER_TYPE_METHOD_NAME = 'registerType';
78
const REGISTER_GETTERS_METHOD_NAME = 'registerGetters';
89
const REGISTER_SETTERS_METHOD_NAME = 'registerSetters';

modules/angular2/src/transform/common/options_reader.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
library angular2.transform.common.options;
1+
library angular2.transform.common.options_reader;
22

33
import 'package:barback/barback.dart';
44
import 'options.dart';

modules/angular2/src/transform/common/parser.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class Parser {
4343
Future<List<NgDeps>> _recurse(AssetId id,
4444
[List<NgDeps> allDeps, Set<AssetId> seen]) async {
4545
if (seen == null) seen = new Set<AssetId>();
46-
if (seen.contains(id)) return;
46+
if (seen.contains(id)) return null;
4747
seen.add(id);
4848

4949
if (allDeps == null) allDeps = [];
@@ -75,7 +75,6 @@ class NgDeps {
7575

7676
class _ParseNgDepsVisitor extends Object with RecursiveAstVisitor<Object> {
7777
NgDeps ngDeps = null;
78-
_RegisteredTypeBuilder current = null;
7978

8079
@override
8180
Object visitImportDirective(ImportDirective node) {

modules/angular2/src/transform/common/visitor_mixin.dart

Lines changed: 0 additions & 111 deletions
This file was deleted.

modules/angular2/src/transform/di_transformer.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@ import 'package:dart_style/dart_style.dart';
55

66
import 'directive_linker/transformer.dart';
77
import 'directive_processor/transformer.dart';
8-
import 'bind_generator/transformer.dart';
98
import 'reflection_remover/transformer.dart';
109
import 'common/formatter.dart' as formatter;
11-
import 'common/names.dart';
1210
import 'common/options.dart';
1311
import 'common/options_reader.dart';
1412

modules/angular2/src/transform/directive_linker/linker.dart

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ Future<String> linkNgDeps(AssetReader reader, AssetId entryPoint) async {
1717
if (ngDeps == null) return null;
1818
if (ngDeps.imports.isEmpty) return ngDeps.code;
1919

20-
var allDeps = ngDeps.imports.toList()..addAll(ngDeps.exports);
21-
var depList = await _processNgImports(
22-
reader, entryPoint, allDeps.map((node) => node.uri.stringValue));
20+
var depUris = <String>[]
21+
..addAll(ngDeps.imports.map((i) => i.uri.stringValue))
22+
..addAll(ngDeps.exports.map((i) => i.uri.stringValue));
23+
var depList = await _processNgImports(reader, entryPoint, depUris);
2324

2425
if (depList.isEmpty) return ngDeps.code;
2526

modules/angular2/src/transform/directive_linker/transformer.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import 'package:angular2/src/transform/common/asset_reader.dart';
66
import 'package:angular2/src/transform/common/formatter.dart';
77
import 'package:angular2/src/transform/common/logging.dart' as log;
88
import 'package:angular2/src/transform/common/names.dart';
9-
import 'package:angular2/src/transform/common/options.dart';
109
import 'package:barback/barback.dart';
1110

1211
import 'linker.dart';

0 commit comments

Comments
 (0)