Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(438)

Unified Diff: pkg/analyzer/lib/source/analysis_options_provider.dart

Issue 1437703003: Improves options validation type safety (#24885). (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « pkg/analysis_server/lib/src/context_manager.dart ('k') | pkg/analyzer/lib/src/task/options.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analyzer/lib/source/analysis_options_provider.dart
diff --git a/pkg/analyzer/lib/source/analysis_options_provider.dart b/pkg/analyzer/lib/source/analysis_options_provider.dart
index 97be54b9c1ad40636851577098d40a35aeed2d28..64c8c8bc5001839aa5994079868b0e3453c4abd2 100644
--- a/pkg/analyzer/lib/source/analysis_options_provider.dart
+++ b/pkg/analyzer/lib/source/analysis_options_provider.dart
@@ -54,14 +54,24 @@ class AnalysisOptionsProvider {
doc.span);
}
if (doc is YamlMap) {
- (doc as YamlMap).forEach((k, v) {
- if (k is! String) {
+ (doc as YamlMap).nodes.forEach((k, v) {
+ var key;
+ if (k is YamlScalar) {
+ key = k.value;
+ }
+ if (key is! String) {
throw new OptionsFormatException(
'Bad options file format (expected String scope key, '
'got ${k.runtimeType})',
k != null ? k.span : doc.span);
}
- options[k] = v;
+ if (v != null && v is! YamlNode) {
+ throw new OptionsFormatException(
+ 'Bad options file format (expected Node value, '
+ 'got ${v.runtimeType}: `${v.toString()}`)',
+ doc.span);
+ }
+ options[key] = v;
});
}
return options;
« no previous file with comments | « pkg/analysis_server/lib/src/context_manager.dart ('k') | pkg/analyzer/lib/src/task/options.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698