Version 1.12.0-dev.3.0

Merge commit '10b7db100ffec216aa09d1d7816f1c59677eb70b' into dev

Author: whesse

CHANGELOG.md

@@ -12,6 +12,8 @@
   * Added two new file modes, `WRITE_ONLY` and `WRITE_ONLY_APPEND` for
     opening a file write only.
     [eaeecf2](https://github.com/dart-lang/sdk/commit/eaeecf2ed13ba6c7fbfd653c3c592974a7120960)
+  * Change stdout/stderr to binary mode on Windows.
+    [4205b29](https://github.com/dart-lang/sdk/commit/4205b2997e01f2cea8e2f44c6f46ed6259ab7277)
 
 ### Tool changes
 
@@ -27,6 +29,15 @@
   * `pub run` starts up faster for executables that don't import transformed
     code.
 
+  * An issue where HTTP requests were sometimes made even though `--offline` was
+    passed to `pub get` or `pub upgrade` has been fixed.
+
+  * A bug with `--offline` that caused an unhelpful error message has been
+    fixed.
+
+  * A crashing bug involving transformers that only apply to non-public code has
+    been fixed.
+
 [package spec proposal]: https://github.com/lrhn/dep-pkgspec
 
 ## 1.11.1

DEPS

@@ -38,7 +38,7 @@ vars = {
 
   # Revisions of /third_party/* dependencies.
   "7zip_rev" : "@19997",
-  "analyzer_cli_rev" : "@8bf3516dd645ca289d7ebc641f7c228d5b3d37c4",
+  "analyzer_cli_rev" : "@5069b75f6ccef59b2ba4e2c382bc000037290125",
   "args_tag": "@0.13.0",
   "async_tag": "@1.2.0",
   "barback_rev" : "@29ee90dbcf77cfd64632fa2797a4c8a4f29a4b51",
@@ -49,7 +49,7 @@ vars = {
   "collection_rev": "@1da9a07f32efa2ba0c391b289e2037391e31da0e",
   "crypto_rev" : "@2df57a1e26dd88e8d0614207d4b062c73209917d",
   "csslib_tag" : "@0.12.0",
-  "dartdoc_rev" : "@9f677ec40f9beeb8933374885ef3af4c63d35d25",
+  "dartdoc_tag" : "@v0.0.3",
   "dart_services_rev" : "@7aea2574e6f3924bf409a80afb8ad52aa2be4f97",
   "dart_style_tag": "@0.1.8+1",
   "dev_compiler_rev": "@0.1.1",
@@ -79,12 +79,12 @@ vars = {
   "observe_rev": "@eee2b8ec34236fa46982575fbccff84f61202ac6",
   "observatory_pub_packages_rev": "@45565",
   "package_config_tag": "@0.1.1",
-  "path_rev": "@93b3e2aa1db0ac0c8bab9d341588d77acda60320",
+  "path_tag": "@1.3.6",
   "petitparser_rev" : "@37878",
   "ply_rev": "@604b32590ffad5cbb82e4afef1d305512d06ae93",
   "plugin_tag": "@0.1.0",
   "pool_rev": "@e454b4b54d2987e8d2f0fbd3ac519641ada9bd0f",
-  "pub_rev": "@e05cfca67574acfdbce55a8422c6bc458be93d10",
+  "pub_rev": "@072c5d85f4741bd4eede3eb8d309669b887e3c54",
   "pub_cache_tag": "@v0.0.1+2",
   "pub_semver_tag": "@1.2.1",
   "quiver_tag": "@0.21.4",
@@ -199,7 +199,7 @@ deps = {
   Var("dart_root") + "/third_party/pkg_tested/dart_style":
       (Var("github_mirror") % "dart_style") + Var("dart_style_tag"),
   Var("dart_root") + "/third_party/pkg/dartdoc":  
-      "https://github.com/dart-lang/dartdoc.git" + Var("dartdoc_rev"),
+      "https://github.com/dart-lang/dartdoc.git" + Var("dartdoc_tag"),
   Var("dart_root") + "/third_party/pkg/dev_compiler":
       "https://github.com/dart-lang/dev_compiler.git" + Var("dev_compiler_rev"),
   Var("dart_root") + "/third_party/pkg/glob":
@@ -245,7 +245,7 @@ deps = {
       (Var("github_mirror") % "package_config") +
       Var("package_config_tag"),
   Var("dart_root") + "/third_party/pkg/path":
-      (Var("github_mirror") % "path") + Var("path_rev"),
+      (Var("github_mirror") % "path") + Var("path_tag"),
   Var("dart_root") + "/third_party/pkg/plugin":
       (Var("github_mirror") % "plugin") + Var("plugin_tag"),
   Var("dart_root") + "/third_party/pkg/pool":

pkg/analysis_server/doc/api.html

@@ -555,6 +555,13 @@ <h4>Returns</h4><dl><dt class="field"><b><i>libraries ( List&lt;<a href="#type_F
           always choosing a region that starts at the beginning of a line and
           ends at the end of a (possibly different) line in the file.
         </p>
+        <p>
+          If a request is made for a file which does not exist, or
+          which is not currently subject to analysis (e.g. because it
+          is not associated with any analysis root specified to
+          analysis.setAnalysisRoots), an error of type
+          <tt>GET_NAVIGATION_INVALID_FILE</tt> will be generated.
+        </p>
 
 
       <h4>Parameters</h4><dl><dt class="field"><b><i>file ( <a href="#type_FilePath">FilePath</a> )</i></b></dt><dd>
@@ -3156,6 +3163,13 @@ <h2 class="domain"><a name="types">Types</a></h2>
             </p>
           </dd><dt class="value">GET_ERRORS_INVALID_FILE</dt><dd>
 
+            <p>
+              An "analysis.getErrors" request specified a FilePath
+              which does not match a file currently subject to
+              analysis.
+            </p>
+          </dd><dt class="value">GET_NAVIGATION_INVALID_FILE</dt><dd>
+            
             <p>
               An "analysis.getErrors" request specified a FilePath
               which does not match a file currently subject to

pkg/analysis_server/lib/src/analysis_server.dart

@@ -25,6 +25,8 @@ import 'package:analysis_server/src/source/optimizing_pub_package_map_provider.d
 import 'package:analysis_server/uri/resolver_provider.dart';
 import 'package:analyzer/file_system/file_system.dart';
 import 'package:analyzer/instrumentation/instrumentation.dart';
+import 'package:analyzer/source/package_map_resolver.dart';
+import 'package:analyzer/source/sdk_ext.dart';
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/engine.dart';
@@ -1429,9 +1431,17 @@ class ServerContextManager extends ContextManager {
   SourceFactory _createSourceFactory(UriResolver packageUriResolver) {
     UriResolver dartResolver = new DartUriResolver(analysisServer.defaultSdk);
     UriResolver resourceResolver = new ResourceUriResolver(resourceProvider);
-    List<UriResolver> resolvers = packageUriResolver != null
-        ? <UriResolver>[dartResolver, packageUriResolver, resourceResolver]
-        : <UriResolver>[dartResolver, resourceResolver];
+    List<UriResolver> resolvers = [];
+    resolvers.add(dartResolver);
+    if (packageUriResolver is PackageMapUriResolver) {
+      UriResolver sdkExtResolver =
+          new SdkExtUriResolver(packageUriResolver.packageMap);
+      resolvers.add(sdkExtResolver);
+    }
+    if (packageUriResolver != null) {
+      resolvers.add(packageUriResolver);
+    }
+    resolvers.add(resourceResolver);
     return new SourceFactory(resolvers);
   }
 }

pkg/analysis_server/lib/src/computer/computer_navigation.dart

@@ -16,21 +16,17 @@ import 'package:analyzer/src/generated/source.dart';
  * A computer for navigation regions in a Dart [CompilationUnit].
  */
 class DartUnitNavigationComputer {
-  final CompilationUnit _unit;
-
   final List<String> files = <String>[];
   final Map<String, int> fileMap = new HashMap<String, int>();
   final List<protocol.NavigationTarget> targets = <protocol.NavigationTarget>[];
   final Map<Element, int> targetMap = new HashMap<Element, int>();
   final List<protocol.NavigationRegion> regions = <protocol.NavigationRegion>[];
 
-  DartUnitNavigationComputer(this._unit);
-
   /**
    * Computes [regions], [targets] and [files].
    */
-  void compute() {
-    _unit.accept(new _DartUnitNavigationComputerVisitor(this));
+  void compute(AstNode node) {
+    node.accept(new _DartUnitNavigationComputerVisitor(this));
   }
 
   int _addFile(String file) {

pkg/analysis_server/lib/src/constants.dart

@@ -25,6 +25,7 @@ const String ANALYSIS_GET_ERRORS = 'analysis.getErrors';
 const String ANALYSIS_GET_HOVER = 'analysis.getHover';
 const String ANALYSIS_GET_LIBRARY_DEPENDENCIES =
     'analysis.getLibraryDependencies';
+const String ANALYSIS_GET_NAVIGATION = 'analysis.getNavigation';
 const String ANALYSIS_REANALYZE = 'analysis.reanalyze';
 const String ANALYSIS_SET_ANALYSIS_ROOTS = 'analysis.setAnalysisRoots';
 const String ANALYSIS_SET_PRIORITY_FILES = 'analysis.setPriorityFiles';

pkg/analysis_server/lib/src/domain_analysis.dart

@@ -9,6 +9,7 @@ import 'dart:core' hide Resource;
 
 import 'package:analysis_server/src/analysis_server.dart';
 import 'package:analysis_server/src/computer/computer_hover.dart';
+import 'package:analysis_server/src/computer/computer_navigation.dart';
 import 'package:analysis_server/src/constants.dart';
 import 'package:analysis_server/src/protocol_server.dart';
 import 'package:analysis_server/src/services/dependencies/library_dependencies.dart';
@@ -105,6 +106,52 @@ class AnalysisDomainHandler implements RequestHandler {
     return Response.DELAYED_RESPONSE;
   }
 
+  /**
+   * Implement the `analysis.getNavigation` request.
+   */
+  Response getNavigation(Request request) {
+    var params = new AnalysisGetNavigationParams.fromRequest(request);
+    String file = params.file;
+    int offset = params.offset;
+    Future<AnalysisDoneReason> completionFuture =
+        server.onFileAnalysisComplete(file);
+    if (completionFuture == null) {
+      return new Response.getNavigationInvalidFile(request);
+    }
+    completionFuture.then((AnalysisDoneReason reason) {
+      switch (reason) {
+        case AnalysisDoneReason.COMPLETE:
+          List<CompilationUnit> units =
+              server.getResolvedCompilationUnits(file);
+          if (units.isEmpty) {
+            server.sendResponse(new Response.getNavigationInvalidFile(request));
+          } else {
+            DartUnitNavigationComputer computer =
+                new DartUnitNavigationComputer();
+            for (CompilationUnit unit in units) {
+              AstNode node = new NodeLocator(offset).searchWithin(unit);
+              if (node != null) {
+                computer.compute(node);
+              }
+            }
+            server.sendResponse(new AnalysisGetNavigationResult(
+                    computer.files, computer.targets, computer.regions)
+                .toResponse(request.id));
+          }
+          break;
+        case AnalysisDoneReason.CONTEXT_REMOVED:
+          // The active contexts have changed, so try again.
+          Response response = getNavigation(request);
+          if (response != Response.DELAYED_RESPONSE) {
+            server.sendResponse(response);
+          }
+          break;
+      }
+    });
+    // delay response
+    return Response.DELAYED_RESPONSE;
+  }
+
   @override
   Response handleRequest(Request request) {
     try {
@@ -115,6 +162,8 @@ class AnalysisDomainHandler implements RequestHandler {
         return getHover(request);
       } else if (requestName == ANALYSIS_GET_LIBRARY_DEPENDENCIES) {
         return getLibraryDependencies(request);
+      } else if (requestName == ANALYSIS_GET_NAVIGATION) {
+        return getNavigation(request);
       } else if (requestName == ANALYSIS_REANALYZE) {
         return reanalyze(request);
       } else if (requestName == ANALYSIS_SET_ANALYSIS_ROOTS) {

pkg/analysis_server/lib/src/generated_protocol.dart

@@ -12121,6 +12121,7 @@ class RequestError implements HasToJson {
  *   FORMAT_INVALID_FILE
  *   FORMAT_WITH_ERRORS
  *   GET_ERRORS_INVALID_FILE
+ *   GET_NAVIGATION_INVALID_FILE
  *   INVALID_ANALYSIS_ROOT
  *   INVALID_EXECUTION_CONTEXT
  *   INVALID_OVERLAY_CHANGE
@@ -12163,6 +12164,12 @@ class RequestErrorCode implements Enum {
    */
   static const GET_ERRORS_INVALID_FILE = const RequestErrorCode._("GET_ERRORS_INVALID_FILE");
 
+  /**
+   * An "analysis.getErrors" request specified a FilePath which does not match
+   * a file currently subject to analysis.
+   */
+  static const GET_NAVIGATION_INVALID_FILE = const RequestErrorCode._("GET_NAVIGATION_INVALID_FILE");
+
   /**
    * A path passed as an argument to a request (such as analysis.reanalyze) is
    * required to be an analysis root, but isn't.
@@ -12263,7 +12270,7 @@ class RequestErrorCode implements Enum {
   /**
    * A list containing all of the enum values that are defined.
    */
-  static const List<RequestErrorCode> VALUES = const <RequestErrorCode>[CONTENT_MODIFIED, FORMAT_INVALID_FILE, FORMAT_WITH_ERRORS, GET_ERRORS_INVALID_FILE, INVALID_ANALYSIS_ROOT, INVALID_EXECUTION_CONTEXT, INVALID_OVERLAY_CHANGE, INVALID_PARAMETER, INVALID_REQUEST, NO_INDEX_GENERATED, REFACTORING_REQUEST_CANCELLED, SERVER_ALREADY_STARTED, SERVER_ERROR, SORT_MEMBERS_INVALID_FILE, SORT_MEMBERS_PARSE_ERRORS, UNANALYZED_PRIORITY_FILES, UNKNOWN_REQUEST, UNKNOWN_SOURCE, UNSUPPORTED_FEATURE];
+  static const List<RequestErrorCode> VALUES = const <RequestErrorCode>[CONTENT_MODIFIED, FORMAT_INVALID_FILE, FORMAT_WITH_ERRORS, GET_ERRORS_INVALID_FILE, GET_NAVIGATION_INVALID_FILE, INVALID_ANALYSIS_ROOT, INVALID_EXECUTION_CONTEXT, INVALID_OVERLAY_CHANGE, INVALID_PARAMETER, INVALID_REQUEST, NO_INDEX_GENERATED, REFACTORING_REQUEST_CANCELLED, SERVER_ALREADY_STARTED, SERVER_ERROR, SORT_MEMBERS_INVALID_FILE, SORT_MEMBERS_PARSE_ERRORS, UNANALYZED_PRIORITY_FILES, UNKNOWN_REQUEST, UNKNOWN_SOURCE, UNSUPPORTED_FEATURE];
 
   final String name;
 
@@ -12279,6 +12286,8 @@ class RequestErrorCode implements Enum {
         return FORMAT_WITH_ERRORS;
       case "GET_ERRORS_INVALID_FILE":
         return GET_ERRORS_INVALID_FILE;
+      case "GET_NAVIGATION_INVALID_FILE":
+        return GET_NAVIGATION_INVALID_FILE;
       case "INVALID_ANALYSIS_ROOT":
         return INVALID_ANALYSIS_ROOT;
       case "INVALID_EXECUTION_CONTEXT":

pkg/analysis_server/lib/src/operation/operation_analysis.dart

@@ -133,8 +133,8 @@ void sendAnalysisNotificationHighlights(
 void sendAnalysisNotificationNavigation(
     AnalysisServer server, String file, CompilationUnit dartUnit) {
   _sendNotification(server, () {
-    var computer = new DartUnitNavigationComputer(dartUnit);
-    computer.compute();
+    var computer = new DartUnitNavigationComputer();
+    computer.compute(dartUnit);
     var params = new protocol.AnalysisNavigationParams(
         file, computer.regions, computer.targets, computer.files);
     server.sendNotification(params.toNotification());

pkg/analysis_server/lib/src/protocol.dart

@@ -513,7 +513,7 @@ class Request {
       : _params = params != null ? params : new HashMap<String, Object>();
 
   /**
-   * Return a request parsed from the given [data], or `null` if the [data] is
+   * Return a request parsed from the given json, or `null` if the [data] is
    * not a valid json representation of a request. The [data] is expected to
    * have the following format:
    *
@@ -531,20 +531,26 @@ class Request {
    * The clientRequestTime must be an int representing the time at which
    * the client issued the request (milliseconds since epoch).
    */
-  factory Request.fromString(String data) {
-    try {
-      var result = JSON.decode(data);
-      if (result is Map) {
-        return new Request.fromJson(result);
-      }
+  factory Request.fromJson(Map<String, dynamic> result) {
+    var id = result[Request.ID];
+    var method = result[Request.METHOD];
+    if (id is! String || method is! String) {
       return null;
-    } catch (exception) {
+    }
+    var time = result[Request.CLIENT_REQUEST_TIME];
+    if (time != null && time is! int) {
+      return null;
+    }
+    var params = result[Request.PARAMS];
+    if (params is Map || params == null) {
+      return new Request(id, method, params, time);
+    } else {
       return null;
     }
   }
 
   /**
-   * Return a request parsed from the given json, or `null` if the [data] is
+   * Return a request parsed from the given [data], or `null` if the [data] is
    * not a valid json representation of a request. The [data] is expected to
    * have the following format:
    *
@@ -562,20 +568,14 @@ class Request {
    * The clientRequestTime must be an int representing the time at which
    * the client issued the request (milliseconds since epoch).
    */
-  factory Request.fromJson(Map<String, dynamic> result) {
-    var id = result[Request.ID];
-    var method = result[Request.METHOD];
-    if (id is! String || method is! String) {
-      return null;
-    }
-    var time = result[Request.CLIENT_REQUEST_TIME];
-    if (time != null && time is! int) {
+  factory Request.fromString(String data) {
+    try {
+      var result = JSON.decode(data);
+      if (result is Map) {
+        return new Request.fromJson(result);
+      }
       return null;
-    }
-    var params = result[Request.PARAMS];
-    if (params is Map || params == null) {
-      return new Request(id, method, params, time);
-    } else {
+    } catch (exception) {
       return null;
     }
   }
@@ -762,6 +762,14 @@ class Response {
           error: new RequestError(RequestErrorCode.GET_ERRORS_INVALID_FILE,
               'Error during `analysis.getErrors`: invalid file.'));
 
+  /**
+   * Initialize a newly created instance to represent the
+   * GET_NAVIGATION_INVALID_FILE error condition.
+   */
+  Response.getNavigationInvalidFile(Request request) : this(request.id,
+          error: new RequestError(RequestErrorCode.GET_NAVIGATION_INVALID_FILE,
+              'Error during `analysis.getNavigation`: invalid file.'));
+
   /**
    * Initialize a newly created instance to represent an error condition caused
    * by an analysis.reanalyze [request] that specifies an analysis root that is