pkg/analyzer/lib/source/analysis_options_provider.dart - Issue 1808123005: First batch of changes to make analyzer package strong mode error free

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1808123005: First batch of changes to make analyzer package strong mode error free (Closed) Base URL: https://github.com/dart-lang/sdk.git@master

Patch Set: Created 4 years, 9 months 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

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 c53bbad1aedb45418cf1b3810efbeacde21d0739..b96ba5cebf2de765913c58eed54881cbc3005501 100644

--- a/pkg/analyzer/lib/source/analysis_options_provider.dart

+++ b/pkg/analyzer/lib/source/analysis_options_provider.dart

@@ -68,7 +68,7 @@ class AnalysisOptionsProvider {

if (v != null && v is! YamlNode) {

throw new OptionsFormatException(

'Bad options file format (expected Node value, '

- 'got ${v.runtimeType}: `${v.toString()}`)',

+ 'got ${v.runtimeType}: `${v.toString()}`)',

doc.span);

}

options[key] = v;

@@ -91,7 +91,7 @@ class AnalysisOptionsProvider {

///

Map<String, YamlNode> merge(

Map<String, YamlNode> defaults, Map<String, YamlNode> overrides) =>

- new Merger().merge(defaults, overrides);

+ new Merger().merge(defaults, overrides) as Map<String, YamlNode>;

/// Read the contents of [file] as a string.

/// Returns null if file does not exist.

« no previous file with comments | « pkg/analyzer/lib/dart/ast/ast.dart ('k') | pkg/analyzer/lib/source/error_processor.dart » ('j') | pkg/analyzer/lib/src/dart/ast/ast.dart » ('J')