Version 2.18.0-122.0.dev

Merge commit '6ebd2633cd7bb68efb53d190780be377aeecdcc6' into 'dev'

Author: Dart CI

CHANGELOG.md

@@ -7,6 +7,10 @@
 - Add `connectionState` attribute and `connectionstatechange` listener to
   `RtcPeerConnection`.
 
+#### `dart:js_util`
+
+- Added `dartify` and a number of minor helper functions.
+
 ### Tools
 
 #### Linter

DEPS

@@ -80,7 +80,7 @@ vars = {
   "async_rev": "f3ed5f690e2ec9dbe1bfc5184705575b4f6480e5",
   "bazel_worker_rev": "ceeba0982d4ff40d32371c9d35f3d2dc1868de20",
   "benchmark_harness_rev": "0530da692a5d689f4b5450a7c8d1a8abe3e2d555",
-  "boolean_selector_rev": "437e7f06c7e416bed91e16ae1df453555897e945",
+  "boolean_selector_rev": "1d3565e2651d16566bb556955b96ea75018cbd0c",
   "boringssl_gen_rev": "ced85ef0a00bbca77ce5a91261a5f2ae61b1e62f",
   "boringssl_rev": "87f316d7748268eb56f2dc147bd593254ae93198",
   "browser-compat-data_tag": "ac8cae697014da1ff7124fba33b0b4245cc6cd1b", # v1.0.22
@@ -165,7 +165,7 @@ vars = {
   "WebCore_rev": "bcb10901266c884e7b3740abc597ab95373ab55c",
   "webdev_rev": "8c814f9d89915418d8abe354ff9befec8f2906b2",
   "webdriver_rev": "ff5ccb1522edf4bed578ead4d65e0cbc1f2c4f02",
-  "webkit_inspection_protocol_rev": "dd6fb5d8b536e19cedb384d0bbf1f5631923f1e8",
+  "webkit_inspection_protocol_rev": "e4965778e2837adc62354eec3a19123402997897",
   "yaml_edit_rev": "0b74d85fac10b4fbf7d1a347debcf16c8f7b0e9c",
   "yaml_rev": "0971c06490b9670add644ed62182acd6a5536946",
   "zlib_rev": "27c2f474b71d0d20764f86f60ef8b00da1a16cda",

pkg/_js_interop_checks/pubspec.yaml

@@ -7,9 +7,4 @@ environment:
 
 dependencies:
   _fe_analyzer_shared: any
-  kernel:
-    path: ../kernel
-
-dependency_overrides:
-  _fe_analyzer_shared:
-    path: ../_fe_analyzer_shared
+  kernel: any

pkg/analysis_server/lib/src/services/completion/yaml/analysis_options_generator.dart

@@ -5,7 +5,9 @@
 import 'package:analysis_server/src/protocol_server.dart';
 import 'package:analysis_server/src/services/completion/yaml/producer.dart';
 import 'package:analysis_server/src/services/completion/yaml/yaml_completion_generator.dart';
+import 'package:analyzer/error/error.dart';
 import 'package:analyzer/file_system/file_system.dart';
+import 'package:analyzer/src/dart/analysis/experiments.dart';
 import 'package:analyzer/src/lint/registry.dart';
 import 'package:analyzer/src/task/options.dart';
 
@@ -17,10 +19,10 @@ class AnalysisOptionsGenerator extends YamlCompletionGenerator {
   // TODO(brianwilkerson) We need to support multiple valid formats.
   //  For example, the lint rules can either be a list or a map, but we only
   //  suggest list items.
-  static const MapProducer analysisOptionsProducer = MapProducer({
+  static MapProducer analysisOptionsProducer = MapProducer({
     AnalyzerOptions.analyzer: MapProducer({
-      AnalyzerOptions.enableExperiment: EmptyProducer(),
-      AnalyzerOptions.errors: EmptyProducer(),
+      AnalyzerOptions.enableExperiment: ListProducer(_ExperimentProducer()),
+      AnalyzerOptions.errors: _ErrorProducer(),
       AnalyzerOptions.exclude: EmptyProducer(),
       AnalyzerOptions.language: MapProducer({
         AnalyzerOptions.strictCasts: EmptyProducer(),
@@ -45,7 +47,7 @@ class AnalysisOptionsGenerator extends YamlCompletionGenerator {
     AnalyzerOptions.include: EmptyProducer(),
     // TODO(brianwilkerson) Create constants for 'linter' and 'rules'.
     'linter': MapProducer({
-      'rules': ListProducer(LintRuleProducer()),
+      'rules': ListProducer(_LintRuleProducer()),
     }),
   });
 
@@ -58,10 +60,49 @@ class AnalysisOptionsGenerator extends YamlCompletionGenerator {
   Producer get topLevelProducer => analysisOptionsProducer;
 }
 
-class LintRuleProducer extends Producer {
+class _ErrorProducer extends KeyValueProducer {
+  static const enumProducer = EnumProducer([
+    'ignore',
+    'info',
+    'warning',
+    'error',
+  ]);
+
+  @override
+  Producer? producerForKey(String key) => enumProducer;
+
+  @override
+  Iterable<CompletionSuggestion> suggestions(
+      YamlCompletionRequest request) sync* {
+    for (var error in errorCodeValues) {
+      yield identifier('${error.name.toLowerCase()}: ');
+    }
+    for (var rule in Registry.ruleRegistry.rules) {
+      yield identifier('${rule.name}: ');
+    }
+  }
+}
+
+class _ExperimentProducer extends Producer {
+  /// Initialize a location whose valid values are the names of the known
+  /// experimental features.
+  const _ExperimentProducer();
+
+  @override
+  Iterable<CompletionSuggestion> suggestions(
+      YamlCompletionRequest request) sync* {
+    for (var feature in ExperimentStatus.knownFeatures.values) {
+      if (!feature.isEnabledByDefault) {
+        yield identifier(feature.enableString);
+      }
+    }
+  }
+}
+
+class _LintRuleProducer extends Producer {
   /// Initialize a location whose valid values are the names of the registered
   /// lint rules.
-  const LintRuleProducer();
+  const _LintRuleProducer();
 
   @override
   Iterable<CompletionSuggestion> suggestions(

pkg/analysis_server/pubspec.yaml

@@ -6,43 +6,29 @@ environment:
   sdk: '>=2.17.0 <3.0.0'
 
 dependencies:
-  _fe_analyzer_shared:
-    path: ../_fe_analyzer_shared
-  analyzer:
-    path: ../analyzer
-  analyzer_plugin:
-    path: ../analyzer_plugin
+  _fe_analyzer_shared: any
+  analyzer: any
+  analyzer_plugin: any
   args: any
   collection: any
   convert: any
   crypto: any
   dart_style: any
-  http: any
   html: any
+  http: any
   linter: any
-  meta:
-    path: ../meta
+  meta: any
+  path: any
   stream_channel: any
-  telemetry:
-    path: ../telemetry
+  telemetry: any
   test: any
-  path: any
   watcher: any
   yaml: any
 
 dev_dependencies:
-  analyzer_utilities:
-    path: ../analyzer_utilities
+  analyzer_utilities: any
   cli_util: any
-  lints: ^2.0.0
+  lints: any
   logging: any
   matcher: any
   test_reflective_loader: any
-
-dependency_overrides:
-  _fe_analyzer_shared:
-    path: ../_fe_analyzer_shared
-  analyzer:
-    path: ../analyzer
-  meta:
-    path: ../meta

pkg/analysis_server/test/src/services/completion/yaml/analysis_options_generator_test.dart

@@ -29,7 +29,62 @@ class AnalysisOptionsGeneratorTest extends YamlGeneratorTest {
 analyzer:
   ^
 ''');
-    assertSuggestion('${AnalyzerOptions.enableExperiment}: ');
+    assertSuggestion('${AnalyzerOptions.enableExperiment}:');
+  }
+
+  void test_analyzer_enableExperiment() {
+    registerLintRules();
+    getCompletions('''
+analyzer:
+  enable-experiment:
+    ^
+''');
+    assertSuggestion('macros');
+    assertNoSuggestion('super-parameters');
+  }
+
+  void test_analyzer_enableExperiment_nonDuplicate() {
+    registerLintRules();
+    getCompletions('''
+analyzer:
+  enable-experiment:
+    - macros
+    ^
+''');
+    assertNoSuggestion('macros');
+  }
+
+  void test_analyzer_errors() {
+    getCompletions('''
+analyzer:
+  errors:
+    ^
+''');
+    assertSuggestion('dead_code: ');
+    assertSuggestion('invalid_assignment: ');
+    assertSuggestion('annotate_overrides: ');
+  }
+
+  void test_analyzer_errors_nonDuplicate() {
+    getCompletions('''
+analyzer:
+  errors:
+    dead_code: info
+    ^
+''');
+    assertNoSuggestion('dead_code');
+  }
+
+  void test_analyzer_errors_severity() {
+    getCompletions('''
+analyzer:
+  errors:
+    dead_code: ^
+''');
+    assertSuggestion('ignore');
+    assertSuggestion('info');
+    assertSuggestion('warning');
+    assertSuggestion('error');
   }
 
   void test_codeStyle() {

pkg/analyzer/CHANGELOG.md

@@ -4,6 +4,7 @@
 * Deprecated `ResourceProviderMixin.newAnalysisOptionsYamlFile2`, use `newAnalysisOptionsYamlFile` instead.
 * Deprecated `DartType.resolveToBound`, use `TypeSystem.resolveToBound` instead.
 * Deprecated `LibraryElement.getImportsWithPrefix`, use `PrefixElement.imports` instead.
+* Fix for `AnalysisSession.getFile()` to return stale content even after `applyPendingFileChanges`.
 
 ## 4.0.0
 * Removed deprecated `UriKind` and `Source.uriKind`.

pkg/analyzer/lib/src/dart/analysis/driver.dart

@@ -84,7 +84,7 @@ import 'package:meta/meta.dart';
 /// TODO(scheglov) Clean up the list of implicitly analyzed files.
 class AnalysisDriver implements AnalysisDriverGeneric {
   /// The version of data format, should be incremented on every format change.
-  static const int DATA_VERSION = 218;
+  static const int DATA_VERSION = 219;
 
   /// The number of exception contexts allowed to write. Once this field is
   /// zero, we stop writing any new exception contexts in this process.
@@ -1041,10 +1041,6 @@ class AnalysisDriver implements AnalysisDriverGeneric {
 
   @override
   Future<void> performWork() async {
-    if (_fileTracker.verifyChangedFilesIfNeeded()) {
-      return;
-    }
-
     if (!_hasDartCoreDiscovered) {
       _hasDartCoreDiscovered = true;
       _discoverDartCore();
@@ -1370,6 +1366,9 @@ class AnalysisDriver implements AnalysisDriverGeneric {
     }
     _pendingFileChanges.clear();
 
+    // Read files, so that synchronous methods also see new content.
+    while (_fileTracker.verifyChangedFilesIfNeeded()) {}
+
     if (_pendingFileChangesCompleters.isNotEmpty) {
       var completers = _pendingFileChangesCompleters.toList();
       _pendingFileChangesCompleters.clear();