Merge pull request #333 from dart-lang/self_references

normalize lib/ self-refs to path references

pkg/dev_compiler/lib/src/analysis_context.dart

@@ -10,7 +10,7 @@ import 'package:analyzer/src/generated/sdk_io.dart' show DirectoryBasedDartSdk;
 import 'package:analyzer/src/generated/source.dart' show DartUriResolver;
 import 'package:analyzer/src/generated/source_io.dart';
 
-import 'package:dev_compiler/strong_mode.dart' show StrongModeOptions;
+import '../strong_mode.dart' show StrongModeOptions;
 
 import 'checker/resolver.dart';
 import 'dart_sdk.dart';

pkg/dev_compiler/lib/src/checker/checker.dart

@@ -9,9 +9,9 @@ import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/scanner.dart' show Token, TokenType;
 
-import 'package:dev_compiler/src/info.dart';
-import 'package:dev_compiler/src/utils.dart' show getMemberType;
-import 'package:dev_compiler/strong_mode.dart' show StrongModeOptions;
+import '../../strong_mode.dart' show StrongModeOptions;
+import '../info.dart';
+import '../utils.dart' show getMemberType;
 import 'rules.dart';
 
 /// Checks for overriding declarations of fields and methods. This is used to

pkg/dev_compiler/lib/src/checker/resolver.dart

@@ -17,8 +17,8 @@ import 'package:analyzer/src/generated/utilities_collection.dart'
     show DirectedGraph;
 import 'package:logging/logging.dart' as logger;
 
-import 'package:dev_compiler/src/utils.dart';
-import 'package:dev_compiler/strong_mode.dart' show StrongModeOptions;
+import '../../strong_mode.dart' show StrongModeOptions;
+import '../utils.dart';
 
 final _log = new logger.Logger('dev_compiler.src.resolver');
 

pkg/dev_compiler/lib/src/checker/rules.dart

@@ -8,9 +8,9 @@ import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/resolver.dart';
 
-import 'package:dev_compiler/src/info.dart';
-import 'package:dev_compiler/src/utils.dart' as utils;
-import 'package:dev_compiler/strong_mode.dart' show StrongModeOptions;
+import '../../strong_mode.dart' show StrongModeOptions;
+import '../info.dart';
+import '../utils.dart' as utils;
 
 abstract class TypeRules {
   final TypeProvider provider;

pkg/dev_compiler/lib/src/closure/closure_annotator.dart

@@ -6,10 +6,10 @@ library dev_compiler.src.closure.closure_codegen;
 
 import 'package:analyzer/analyzer.dart' show ParameterKind;
 import 'package:analyzer/src/generated/element.dart';
+import 'package:analyzer/src/generated/resolver.dart' show TypeProvider;
 
 import 'closure_annotation.dart';
 import 'closure_type.dart';
-import 'package:analyzer/src/generated/resolver.dart' show TypeProvider;
 
 /// Mixin that can generate [ClosureAnnotation]s for Dart elements and types.
 abstract class ClosureAnnotator {

pkg/dev_compiler/lib/src/codegen/code_generator.dart

@@ -9,11 +9,11 @@ import 'package:analyzer/src/generated/element.dart'
 import 'package:analyzer/src/generated/engine.dart' show AnalysisContext;
 import 'package:path/path.dart' as path;
 
-import 'package:dev_compiler/src/compiler.dart' show AbstractCompiler;
-import 'package:dev_compiler/src/info.dart';
-import 'package:dev_compiler/src/utils.dart' show canonicalLibraryName;
-import 'package:dev_compiler/src/checker/rules.dart';
-import 'package:dev_compiler/src/options.dart' show CodegenOptions;
+import '../compiler.dart' show AbstractCompiler;
+import '../info.dart';
+import '../utils.dart' show canonicalLibraryName;
+import '../checker/rules.dart';
+import '../options.dart' show CodegenOptions;
 
 abstract class CodeGenerator {
   final AbstractCompiler compiler;

pkg/dev_compiler/lib/src/codegen/html_codegen.dart

@@ -9,9 +9,9 @@ import 'package:html/parser.dart' show parseFragment;
 import 'package:logging/logging.dart' show Logger;
 import 'package:path/path.dart' as path;
 
-import 'package:dev_compiler/src/compiler.dart' show AbstractCompiler;
-import 'package:dev_compiler/src/server/dependency_graph.dart';
-import 'package:dev_compiler/src/utils.dart' show colorOf, resourceOutputPath;
+import '../compiler.dart' show AbstractCompiler;
+import '../server/dependency_graph.dart';
+import '../utils.dart' show colorOf, resourceOutputPath;
 
 /// Emits an entry point HTML file corresponding to [inputFile] that can load
 /// the code generated by the dev compiler.

pkg/dev_compiler/lib/src/codegen/js_codegen.dart

@@ -15,21 +15,19 @@ import 'package:analyzer/src/generated/scanner.dart'
     show StringToken, Token, TokenType;
 import 'package:analyzer/src/task/dart.dart' show PublicNamespaceBuilder;
 
-import 'package:dev_compiler/src/codegen/ast_builder.dart' show AstBuilder;
-import 'package:dev_compiler/src/codegen/reify_coercions.dart'
-    show CoercionReifier;
+import 'ast_builder.dart' show AstBuilder;
+import 'reify_coercions.dart' show CoercionReifier;
 
 // TODO(jmesserly): import from its own package
-import 'package:dev_compiler/src/js/js_ast.dart' as JS;
-import 'package:dev_compiler/src/js/js_ast.dart' show js;
+import '../js/js_ast.dart' as JS;
+import '../js/js_ast.dart' show js;
 
-import 'package:dev_compiler/src/closure/closure_annotator.dart'
-    show ClosureAnnotator;
-import 'package:dev_compiler/src/compiler.dart' show AbstractCompiler;
-import 'package:dev_compiler/src/checker/rules.dart';
-import 'package:dev_compiler/src/info.dart';
-import 'package:dev_compiler/src/options.dart' show CodegenOptions;
-import 'package:dev_compiler/src/utils.dart';
+import '../closure/closure_annotator.dart' show ClosureAnnotator;
+import '../compiler.dart' show AbstractCompiler;
+import '../checker/rules.dart';
+import '../info.dart';
+import '../options.dart' show CodegenOptions;
+import '../utils.dart';
 
 import 'code_generator.dart';
 import 'js_field_storage.dart';

pkg/dev_compiler/lib/src/codegen/js_field_storage.dart

@@ -8,7 +8,7 @@ import 'dart:collection' show HashMap, HashSet;
 import 'package:analyzer/src/generated/ast.dart' show Identifier;
 import 'package:analyzer/src/generated/element.dart';
 
-import 'package:dev_compiler/src/info.dart' show LibraryUnit;
+import '../info.dart' show LibraryUnit;
 
 /// We use a storage slot for fields that override or can be overridden by
 /// getter/setter pairs.

pkg/dev_compiler/lib/src/codegen/js_metalet.dart

@@ -5,8 +5,8 @@
 library dev_compiler.src.codegen.js_metalet;
 
 // TODO(jmesserly): import from its own package
-import 'package:dev_compiler/src/js/js_ast.dart';
-import 'package:dev_compiler/src/js/precedence.dart';
+import '../js/js_ast.dart';
+import '../js/precedence.dart';
 
 import 'js_names.dart' show TemporaryId;
 

pkg/dev_compiler/lib/src/codegen/js_module_item_order.dart

@@ -3,9 +3,11 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'dart:collection' show HashMap;
+
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/element.dart';
-import 'package:dev_compiler/src/compiler.dart' show corelibOrder;
+
+import '../compiler.dart' show corelibOrder;
 
 typedef void ModuleItemEmitter(AstNode item);
 

pkg/dev_compiler/lib/src/codegen/js_names.dart

@@ -5,7 +5,8 @@
 library dev_compiler.src.codegen.js_names;
 
 import 'dart:collection';
-import 'package:dev_compiler/src/js/js_ast.dart';
+
+import '../js/js_ast.dart';
 
 /// Unique instance for temporary variables. Will be renamed consistently
 /// across the entire file. Different instances will be named differently

pkg/dev_compiler/lib/src/codegen/js_printer.dart

@@ -5,15 +5,15 @@
 library dev_compiler.src.codegen.js_printer;
 
 import 'dart:io' show Directory, File, Platform, Process;
+
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:path/path.dart' as path;
 import 'package:source_maps/source_maps.dart' as srcmaps show Printer;
 import 'package:source_maps/source_maps.dart' show SourceMapSpan;
 import 'package:source_span/source_span.dart' show SourceLocation;
 
-import 'package:dev_compiler/src/js/js_ast.dart' as JS;
-import 'package:dev_compiler/src/utils.dart'
-    show computeHash, locationForOffset;
+import '../js/js_ast.dart' as JS;
+import '../utils.dart' show computeHash, locationForOffset;
 
 import 'js_names.dart' show TemporaryNamer;
 

pkg/dev_compiler/lib/src/codegen/reify_coercions.dart

@@ -9,9 +9,9 @@ import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/element.dart';
 import 'package:logging/logging.dart' as logger;
 
-import 'package:dev_compiler/src/compiler.dart' show AbstractCompiler;
-import 'package:dev_compiler/src/checker/rules.dart';
-import 'package:dev_compiler/src/info.dart';
+import '../compiler.dart' show AbstractCompiler;
+import '../checker/rules.dart';
+import '../info.dart';
 
 import 'ast_builder.dart';
 

pkg/dev_compiler/lib/src/compiler.dart

@@ -25,7 +25,7 @@ import 'package:html/parser.dart' as html;
 import 'package:logging/logging.dart' show Level, Logger, LogRecord;
 import 'package:path/path.dart' as path;
 
-import 'package:dev_compiler/strong_mode.dart' show StrongModeOptions;
+import '../strong_mode.dart' show StrongModeOptions;
 
 import 'analysis_context.dart';
 import 'checker/checker.dart';

pkg/dev_compiler/lib/src/info.dart

@@ -11,8 +11,8 @@ import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/error.dart';
 import 'package:analyzer/src/generated/parser.dart';
 
-import 'package:dev_compiler/src/checker/rules.dart';
-import 'package:dev_compiler/src/utils.dart' as utils;
+import 'checker/rules.dart';
+import 'utils.dart' as utils;
 
 /// Represents a summary of the results collected by running the program
 /// checker.

pkg/dev_compiler/lib/src/js/js_ast.dart

@@ -4,7 +4,7 @@
 
 library js_ast;
 
-import 'package:dev_compiler/src/closure/closure_annotation.dart';
+import '../closure/closure_annotation.dart';
 
 import 'precedence.dart';
 import 'characters.dart' as charCodes;

pkg/dev_compiler/lib/src/options.dart

@@ -13,7 +13,7 @@ import 'package:logging/logging.dart' show Level;
 import 'package:path/path.dart' as path;
 import 'package:yaml/yaml.dart';
 
-import 'package:dev_compiler/strong_mode.dart' show StrongModeOptions;
+import '../strong_mode.dart' show StrongModeOptions;
 
 const bool _CLOSURE_DEFAULT = false;
 

pkg/dev_compiler/lib/src/runner/runtime_utils.dart

@@ -8,10 +8,10 @@ library dev_compiler.src.runner.runtime_utils;
 import 'dart:async';
 import 'dart:io';
 
-import 'package:dev_compiler/src/compiler.dart' show defaultRuntimeFiles;
-import 'package:dev_compiler/src/options.dart';
 import 'package:path/path.dart';
 
+import '../compiler.dart' show defaultRuntimeFiles;
+import '../options.dart';
 import 'file_utils.dart';
 
 /// In node.js / io.js, these modules need to be aliased globally

pkg/dev_compiler/lib/src/runner/v8_runner.dart

@@ -5,12 +5,13 @@
 /// V8 runner support used by dartdevrun.
 library dev_compiler.src.runner.v8_utils;
 
-import 'dart:io';
 import 'dart:async';
+import 'dart:io';
+
 import 'package:path/path.dart';
 import 'package:pub_semver/pub_semver.dart' show Version;
-import '../../src/options.dart' show CompilerOptions;
 
+import '../options.dart' show CompilerOptions;
 import 'runtime_utils.dart' show getRuntimeFileAlias;
 
 _parseV8Version(String version) =>

pkg/dev_compiler/lib/src/server/dependency_graph.dart

@@ -28,10 +28,10 @@ import 'package:html/parser.dart' as html;
 import 'package:logging/logging.dart' show Logger, Level;
 import 'package:path/path.dart' as path;
 
-import 'package:dev_compiler/src/compiler.dart' show defaultRuntimeFiles;
-import 'package:dev_compiler/src/info.dart';
-import 'package:dev_compiler/src/options.dart';
-import 'package:dev_compiler/src/report.dart';
+import '../compiler.dart' show defaultRuntimeFiles;
+import '../info.dart';
+import '../options.dart';
+import '../report.dart';
 
 /// Holds references to all source nodes in the import graph. This is mainly
 /// used as a level of indirection to ensure that each source has a canonical

pkg/dev_compiler/lib/src/server/server.dart

@@ -21,18 +21,16 @@ import 'package:shelf/shelf.dart' as shelf;
 import 'package:shelf/shelf_io.dart' as shelf;
 import 'package:shelf_static/shelf_static.dart' as shelf_static;
 
-import 'package:dev_compiler/src/codegen/code_generator.dart'
-    show CodeGenerator;
-import 'package:dev_compiler/src/codegen/html_codegen.dart'
-    show generateEntryHtml;
-import 'package:dev_compiler/src/codegen/js_codegen.dart';
-import 'package:dev_compiler/src/analysis_context.dart';
-import 'package:dev_compiler/src/compiler.dart' show AbstractCompiler;
-import 'package:dev_compiler/src/info.dart'
+import '../codegen/code_generator.dart' show CodeGenerator;
+import '../codegen/html_codegen.dart' show generateEntryHtml;
+import '../codegen/js_codegen.dart';
+import '../analysis_context.dart';
+import '../compiler.dart' show AbstractCompiler;
+import '../info.dart'
     show AnalyzerMessage, CheckerResults, LibraryInfo, LibraryUnit;
-import 'package:dev_compiler/src/options.dart';
-import 'package:dev_compiler/src/report.dart';
-import 'package:dev_compiler/src/utils.dart';
+import '../options.dart';
+import '../report.dart';
+import '../utils.dart';
 
 import 'dependency_graph.dart';
 

pkg/dev_compiler/lib/src/summary.dart

@@ -6,6 +6,7 @@
 library dev_compiler.src.summary;
 
 import 'dart:collection' show HashSet;
+
 import 'package:analyzer/src/generated/engine.dart' show AnalysisContext;
 import 'package:analyzer/src/generated/source.dart' show Source;
 import 'package:source_span/source_span.dart';