Version 3.10.0-268.0.dev
Merge d4036a7bfe2cc46ae13d9652298ccb8869efa8d2 into dev
diff --git a/build/rbe/rewrapper_dart.py b/build/rbe/rewrapper_dart.py
index 0efcc43..bf17204 100644
--- a/build/rbe/rewrapper_dart.py
+++ b/build/rbe/rewrapper_dart.py
@@ -480,10 +480,13 @@
self.extra_paths.add(self.rebase(self.optarg))
self.entry_points.add(
self.rebase(os.path.join(self.optarg, 'compiler_api.dart')))
- # This file isn't referenced from compiler_api.dart.
+ # These files aren't referenced from compiler_api.dart.
self.entry_points.add(
self.rebase(
os.path.join(self.optarg, 'src/io/mapped_file.dart')))
+ self.entry_points.add(
+ self.rebase(
+ 'package:shell_arg_splitter/shell_arg_splitter.dart'))
else:
self.unsupported('analysis_server', arg)
diff --git a/pkg/analyzer/lib/src/dart/analysis/driver.dart b/pkg/analyzer/lib/src/dart/analysis/driver.dart
index cb68fed..182e805 100644
--- a/pkg/analyzer/lib/src/dart/analysis/driver.dart
+++ b/pkg/analyzer/lib/src/dart/analysis/driver.dart
@@ -1496,6 +1496,8 @@
completeWithError(_requestedFilesNonInteractive.remove(file.path));
// getErrors()
completeWithError(_errorsRequestedFiles.remove(file.path));
+ // getIndex()
+ completeWithError(_indexRequestedFiles.remove(file.path));
}
// getResolvedLibrary()
completeWithError(_requestedLibraries.remove(library.file.path));
diff --git a/tools/VERSION b/tools/VERSION
index 3f64de1..46dfe0c 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -27,5 +27,5 @@
MAJOR 3
MINOR 10
PATCH 0
-PRERELEASE 267
+PRERELEASE 268
PRERELEASE_PATCH 0
