Version 1.21.0-dev.2.0

Merge 057b9ce into dev

Author: whesse

.travis.yml

@@ -80,6 +80,7 @@ env:
 matrix:
   allow_failures:
     - env: TEST=node
+    - env: ANALYZER=master DDC_BROWSERS=ChromeCanaryTravis
     - env: ANALYZER=master DDC_BROWSERS=Firefox
     - env: ANALYZER=master CXX=g++
 notifications:

BUILD.gn

@@ -57,6 +57,7 @@ action("create_sdk") {
     "runtime/bin:dart",
     "utils/analysis_server",
     "utils/compiler:dart2js",
+    "utils/compiler:utils_wrapper",
     "utils/dartanalyzer:generate_dartanalyzer_snapshot",
     "utils/dartanalyzer:generate_summary_spec",
     "utils/dartanalyzer:generate_summary_strong",

CHANGELOG.md

@@ -1,4 +1,7 @@
 ## 1.21.0
+### Core library changes
+
+* `dart:core`: `Set.difference` now takes a `Set<Object>` as argument.
 
 ### Language
 

DEPS

@@ -56,7 +56,7 @@ vars = {
   "csslib_tag" : "@0.13.2",
   "dart2js_info_tag" : "@0.5.0",
   "dart_services_rev" : "@7aea2574e6f3924bf409a80afb8ad52aa2be4f97",
-  "dart_style_tag": "@0.2.10",
+  "dart_style_tag": "@v0.2.11+1",
   "dartdoc_tag" : "@v0.9.7+6",
   "fixnum_tag": "@0.10.5",
   "func_tag": "@0.1.0",

build/config/compiler/BUILD.gn

@@ -732,10 +732,11 @@ config("optimize") {
 # Turn off optimizations.
 config("no_optimize") {
   if (is_win) {
+    # The only difference on windows is that the inlining is less aggressive.
+    # (We accept the default level). Otherwise it is very slow.
     cflags = [
       "/O2",  # Do some optimizations.
       "/Oy-",  # Disable omitting frame pointers, must be after /O2.
-      "/Ob0",  # Disable all inlining (on by default).
     ]
   } else if (is_android) {
     # On Android we kind of optimize some things that don't affect debugging

pkg/analysis_server/lib/src/analysis_server.dart

@@ -1645,16 +1645,18 @@ class ServerContextManagerCallbacks extends ContextManagerCallbacks {
       }
     }
 
+    ContextBuilderOptions builderOptions = new ContextBuilderOptions();
+    builderOptions.defaultOptions = options;
+    builderOptions.defaultPackageFilePath = defaultPackageFilePath;
+    builderOptions.defaultPackagesDirectoryPath = defaultPackagesDirectoryPath;
+    if (analysisServer.options.enablePubSummaryManager) {
+      builderOptions.pubSummaryManager = analysisServer.pubSummaryManager;
+    }
     ContextBuilder builder = new ContextBuilder(resourceProvider,
-        analysisServer.sdkManager, analysisServer.overlayState);
-    builder.defaultOptions = options;
+        analysisServer.sdkManager, analysisServer.overlayState,
+        options: builderOptions);
     builder.fileResolverProvider = analysisServer.fileResolverProvider;
     builder.packageResolverProvider = analysisServer.packageResolverProvider;
-    builder.defaultPackageFilePath = defaultPackageFilePath;
-    builder.defaultPackagesDirectoryPath = defaultPackagesDirectoryPath;
-    if (analysisServer.options.enablePubSummaryManager) {
-      builder.pubSummaryManager = analysisServer.pubSummaryManager;
-    }
     return builder;
   }
 

pkg/analysis_server/test/context_manager_test.dart

@@ -2707,9 +2707,11 @@ class TestContextManagerCallbacks extends ContextManagerCallbacks {
   @override
   ContextBuilder createContextBuilder(Folder folder, AnalysisOptions options) {
     DartSdkManager sdkManager = new DartSdkManager('/', false);
-    ContextBuilder builder =
-        new ContextBuilder(resourceProvider, sdkManager, new ContentCache());
-    builder.defaultOptions = options;
+    ContextBuilderOptions builderOptions = new ContextBuilderOptions();
+    builderOptions.defaultOptions = options;
+    ContextBuilder builder = new ContextBuilder(
+        resourceProvider, sdkManager, new ContentCache(),
+        options: builderOptions);
     return builder;
   }
 

pkg/analyzer/lib/error/error.dart

@@ -298,7 +298,14 @@ abstract class ErrorCode {
     // Manually generated. You can mostly reproduce this list by running the
     // following command from the root of the analyzer package:
     //
-    // > cat lib/src/dart/error/syntactic_errors.dart src/error/codes.dart |
+    // > cat
+    //       lib/src/analysis_options/error/option_codes.dart';
+    //       lib/src/dart/error/hint_codes.dart';
+    //       lib/src/dart/error/lint_codes.dart';
+    //       lib/src/dart/error/todo_codes.dart';
+    //       lib/src/html/error/html_codes.dart';
+    //       lib/src/dart/error/syntactic_errors.dart
+    //       lib/src/error/codes.dart |
     //     grep 'static const .*Code' |
     //     awk '{print $3"."$4","}' |
     //     sort > codes.txt
@@ -350,7 +357,8 @@ abstract class ErrorCode {
     CompileTimeErrorCode.CONST_EVAL_TYPE_NUM,
     CompileTimeErrorCode.CONST_FORMAL_PARAMETER,
     CompileTimeErrorCode.CONST_INITIALIZED_WITH_NON_CONSTANT_VALUE,
-    CompileTimeErrorCode.CONST_INITIALIZED_WITH_NON_CONSTANT_VALUE_FROM_DEFERRED_LIBRARY,
+    CompileTimeErrorCode
+        .CONST_INITIALIZED_WITH_NON_CONSTANT_VALUE_FROM_DEFERRED_LIBRARY,
     CompileTimeErrorCode.CONST_INSTANCE_FIELD,
     CompileTimeErrorCode.CONST_MAP_KEY_EXPRESSION_TYPE_IMPLEMENTS_EQUALS,
     CompileTimeErrorCode.CONST_NOT_INITIALIZED,
@@ -444,7 +452,8 @@ abstract class ErrorCode {
     CompileTimeErrorCode.NON_CONSTANT_MAP_VALUE,
     CompileTimeErrorCode.NON_CONSTANT_MAP_VALUE_FROM_DEFERRED_LIBRARY,
     CompileTimeErrorCode.NON_CONSTANT_VALUE_IN_INITIALIZER,
-    CompileTimeErrorCode.NON_CONSTANT_VALUE_IN_INITIALIZER_FROM_DEFERRED_LIBRARY,
+    CompileTimeErrorCode
+        .NON_CONSTANT_VALUE_IN_INITIALIZER_FROM_DEFERRED_LIBRARY,
     CompileTimeErrorCode.NON_CONST_MAP_AS_EXPRESSION_STATEMENT,
     CompileTimeErrorCode.NON_GENERATIVE_CONSTRUCTOR,
     CompileTimeErrorCode.NOT_ENOUGH_REQUIRED_ARGUMENTS,

pkg/analyzer/lib/src/analysis_options/error/option_codes.dart

@@ -0,0 +1,114 @@
+// Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+library analyzer.src.analysis_options.error.option_codes;
+
+import 'package:analyzer/error/error.dart';
+
+/**
+ * The error codes used for errors in analysis options files. The convention for
+ * this class is for the name of the error code to indicate the problem that
+ * caused the error to be generated and for the error message to explain what is
+ * wrong and, when appropriate, how the problem can be corrected.
+ */
+class AnalysisOptionsErrorCode extends ErrorCode {
+  /**
+   * An error code indicating that there is a syntactic error in the file.
+   *
+   * Parameters:
+   * 0: the error message from the parse error
+   */
+  static const AnalysisOptionsErrorCode PARSE_ERROR =
+      const AnalysisOptionsErrorCode('PARSE_ERROR', '{0}');
+
+  /**
+   * Initialize a newly created error code to have the given [name].
+   */
+  const AnalysisOptionsErrorCode(String name, String message,
+      [String correction])
+      : super(name, message, correction);
+
+  @override
+  ErrorSeverity get errorSeverity => ErrorSeverity.ERROR;
+
+  @override
+  ErrorType get type => ErrorType.COMPILE_TIME_ERROR;
+}
+
+/**
+ * The error codes used for warnings in analysis options files. The convention
+ * for this class is for the name of the error code to indicate the problem that
+ * caused the error to be generated and for the error message to explain what is
+ * wrong and, when appropriate, how the problem can be corrected.
+ */
+class AnalysisOptionsWarningCode extends ErrorCode {
+  /**
+   * An error code indicating that a plugin is being configured with an
+   * unsupported option and legal options are provided.
+   *
+   * Parameters:
+   * 0: the plugin name
+   * 1: the unsupported option key
+   * 2: legal values
+   */
+  static const AnalysisOptionsWarningCode UNSUPPORTED_OPTION_WITH_LEGAL_VALUES =
+      const AnalysisOptionsWarningCode(
+          'UNSUPPORTED_OPTION_WITH_LEGAL_VALUES',
+          "The option '{1}' isn't supported by '{0}'.",
+          "Try using one of the supported options: {2}.");
+
+  /**
+   * An error code indicating that a plugin is being configured with an
+   * unsupported option where there is just one legal value.
+   *
+   * Parameters:
+   * 0: the plugin name
+   * 1: the unsupported option key
+   * 2: the legal value
+   */
+  static const AnalysisOptionsWarningCode UNSUPPORTED_OPTION_WITH_LEGAL_VALUE =
+      const AnalysisOptionsWarningCode(
+          'UNSUPPORTED_OPTION_WITH_LEGAL_VALUE',
+          "The option '{1}' isn't supported by '{0}'."
+          "Try using the only supported option: '{2}'.");
+
+  /**
+   * An error code indicating that an option entry is being configured with an
+   * unsupported value.
+   *
+   * Parameters:
+   * 0: the option name
+   * 1: the unsupported value
+   * 2: legal values
+   */
+  static const AnalysisOptionsWarningCode UNSUPPORTED_VALUE =
+      const AnalysisOptionsWarningCode(
+          'UNSUPPORTED_VALUE',
+          "The value '{1}' isn't supported by '{0}'.",
+          "Try using one of the supported options: {2}.");
+
+  /**
+   * An error code indicating that an unrecognized error code is being used to
+   * specify an error filter.
+   *
+   * Parameters:
+   * 0: the unrecognized error code
+   */
+  static const AnalysisOptionsWarningCode UNRECOGNIZED_ERROR_CODE =
+      const AnalysisOptionsWarningCode(
+          'UNRECOGNIZED_ERROR_CODE', "'{0}' isn't a recognized error code.");
+
+  /**
+   * Initialize a newly created warning code to have the given [name].
+   */
+  const AnalysisOptionsWarningCode(String name, String message,
+      [String correction])
+      : super(name, message, correction);
+
+  @override
+  ErrorSeverity get errorSeverity => ErrorSeverity.WARNING;
+
+  @override
+  ErrorType get type => ErrorType.STATIC_WARNING;
+}