Version 2.14.0-193.0.dev
Merge commit '1acb4431455ea414ee79d1222cd1de1f70db3433' into 'dev'
diff --git a/pkg/analysis_server/lib/src/services/correction/fix/analysis_options/fix_generator.dart b/pkg/analysis_server/lib/src/services/correction/fix/analysis_options/fix_generator.dart
index f6bbbc1..87ef1fa 100644
--- a/pkg/analysis_server/lib/src/services/correction/fix/analysis_options/fix_generator.dart
+++ b/pkg/analysis_server/lib/src/services/correction/fix/analysis_options/fix_generator.dart
@@ -57,8 +57,6 @@
// if (errorCode == AnalysisOptionsErrorCode.INCLUDED_FILE_PARSE_ERROR) {
// } else if (errorCode == AnalysisOptionsErrorCode.PARSE_ERROR) {
// } else if (errorCode ==
-// AnalysisOptionsHintCode.DEPRECATED_ANALYSIS_OPTIONS_FILE_NAME) {
-// } else if (errorCode ==
// AnalysisOptionsHintCode.PREVIEW_DART_2_SETTING_DEPRECATED) {
// } else if (errorCode ==
// AnalysisOptionsHintCode.STRONG_MODE_SETTING_DEPRECATED) {
diff --git a/pkg/analysis_server/test/analysis/set_priority_files_test.dart b/pkg/analysis_server/test/analysis/set_priority_files_test.dart
index 0dc51e8..64d569a 100644
--- a/pkg/analysis_server/test/analysis/set_priority_files_test.dart
+++ b/pkg/analysis_server/test/analysis/set_priority_files_test.dart
@@ -5,6 +5,7 @@
import 'package:analysis_server/protocol/protocol.dart';
import 'package:analysis_server/protocol/protocol_generated.dart';
import 'package:analysis_server/src/domain_analysis.dart';
+import 'package:analyzer/src/util/file_paths.dart' as file_paths;
import 'package:test/test.dart';
import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ -70,7 +71,7 @@
Future<void> test_ignoredInAnalysisOptions() async {
var sampleFile = convertPath('$projectPath/samples/sample.dart');
- newFile('$projectPath/.analysis_options', content: r'''
+ newFile('$projectPath/${file_paths.analysisOptionsYaml}', content: r'''
analyzer:
exclude:
- 'samples/**'
@@ -85,7 +86,8 @@
newFile('$projectPath/.packages');
newFile('$projectPath/child/.packages');
var sampleFile = convertPath('$projectPath/child/samples/sample.dart');
- newFile('$projectPath/child/.analysis_options', content: r'''
+ newFile('$projectPath/child/${file_paths.analysisOptionsYaml}',
+ content: r'''
analyzer:
exclude:
- 'samples/**'
@@ -100,7 +102,7 @@
newFile('$projectPath/.packages');
newFile('$projectPath/child/.packages');
var sampleFile = convertPath('$projectPath/child/samples/sample.dart');
- newFile('$projectPath/.analysis_options', content: r'''
+ newFile('$projectPath/${file_paths.analysisOptionsYaml}', content: r'''
analyzer:
exclude:
- 'child/samples/**'
diff --git a/pkg/analysis_server/test/analysis_server_test.dart b/pkg/analysis_server/test/analysis_server_test.dart
index 07cc2f4..c416406 100644
--- a/pkg/analysis_server/test/analysis_server_test.dart
+++ b/pkg/analysis_server/test/analysis_server_test.dart
@@ -183,7 +183,7 @@
test_setAnalysisSubscriptions_fileInIgnoredFolder_oldOptions() async {
var path = convertPath('/project/samples/sample.dart');
newFile(path);
- newFile('/project/.analysis_options', content: r'''
+ newFile('/project/analysis_options.yaml', content: r'''
analyzer:
exclude:
- 'samples/**'
diff --git a/pkg/analyzer/lib/dart/analysis/context_locator.dart b/pkg/analyzer/lib/dart/analysis/context_locator.dart
index 478e064..a4e0375 100644
--- a/pkg/analyzer/lib/dart/analysis/context_locator.dart
+++ b/pkg/analyzer/lib/dart/analysis/context_locator.dart
@@ -23,9 +23,8 @@
/// the list of [excludedPaths].
///
/// If an [optionsFile] is specified, then it is assumed to be the path to the
- /// `analysis_options.yaml` (or `.analysis_options`) file that should be used
- /// in place of the ones that would be found by looking in the directories
- /// containing the context roots.
+ /// `analysis_options.yaml` file that should be used in place of the ones that
+ /// would be found by looking in the directories containing the context roots.
///
/// If a [packagesFile] is specified, then it is assumed to be the path to the
/// `.packages` file that should be used in place of the one that would be
diff --git a/pkg/analyzer/lib/error/error.dart b/pkg/analyzer/lib/error/error.dart
index 1fa1831..79c599e 100644
--- a/pkg/analyzer/lib/error/error.dart
+++ b/pkg/analyzer/lib/error/error.dart
@@ -47,7 +47,6 @@
//
AnalysisOptionsErrorCode.INCLUDED_FILE_PARSE_ERROR,
AnalysisOptionsErrorCode.PARSE_ERROR,
- AnalysisOptionsHintCode.DEPRECATED_ANALYSIS_OPTIONS_FILE_NAME,
AnalysisOptionsHintCode.PREVIEW_DART_2_SETTING_DEPRECATED,
AnalysisOptionsHintCode.STRONG_MODE_SETTING_DEPRECATED,
AnalysisOptionsHintCode.SUPER_MIXINS_SETTING_DEPRECATED,
diff --git a/pkg/analyzer/lib/src/analysis_options/error/option_codes.dart b/pkg/analyzer/lib/src/analysis_options/error/option_codes.dart
index 78c31f7..2b47fc1 100644
--- a/pkg/analyzer/lib/src/analysis_options/error/option_codes.dart
+++ b/pkg/analyzer/lib/src/analysis_options/error/option_codes.dart
@@ -46,17 +46,6 @@
}
class AnalysisOptionsHintCode extends ErrorCode {
- /// An error code indicating the analysis options file name is deprecated and
- /// the file should be renamed.
- ///
- /// Parameters:
- /// 0: the uri of the file which should be renamed
- static const AnalysisOptionsHintCode DEPRECATED_ANALYSIS_OPTIONS_FILE_NAME =
- AnalysisOptionsHintCode(
- 'DEPRECATED_ANALYSIS_OPTIONS_FILE_NAME',
- "The name of the analysis options file {0} is deprecated;"
- " consider renaming it to analysis_options.yaml.");
-
/// An error code indicating that the enablePreviewDart2 setting is
/// deprecated.
static const AnalysisOptionsHintCode PREVIEW_DART_2_SETTING_DEPRECATED =
diff --git a/pkg/analyzer/lib/src/context/builder.dart b/pkg/analyzer/lib/src/context/builder.dart
index 30ffcc7..9bb60eb 100644
--- a/pkg/analyzer/lib/src/context/builder.dart
+++ b/pkg/analyzer/lib/src/context/builder.dart
@@ -42,8 +42,8 @@
/// (_embedder.yaml). If one exists then it defines the SDK. If multiple such
/// files exist then use the first one found. Otherwise, use the default SDK.
///
-/// 3. Look for an analysis options file (`analysis_options.yaml` or
-/// `.analysis_options`) and process the options in the file.
+/// 3. Look for an analysis options file (`analysis_options.yaml`) and process
+/// the options in the file.
///
/// 4. Create a new context. Initialize its source factory based on steps 1, 2
/// and 3. Initialize its analysis options from step 4.
diff --git a/tests/co19_2/co19_2-kernel.status b/tests/co19_2/co19_2-kernel.status
index 5caa9d0..660bb98 100644
--- a/tests/co19_2/co19_2-kernel.status
+++ b/tests/co19_2/co19_2-kernel.status
@@ -4,11 +4,9 @@
[ $compiler == dartk ]
Language/Libraries_and_Scripts/Scripts/top_level_main_t01: Crash
-LibTest/isolate/SendPort/send_A01_t02: Crash
-LibTest/isolate/SendPort/send_A01_t03: Crash
[ $compiler == fasta ]
-LanguageFeatures/Constant-update-2018/NewOperators_A01_t06/none: Crash
+LanguageFeatures/Instantiate-to-bound/typedef/static/typedef_l2_06_t04: SkipByDesign # Won't fix. See https://github.com/dart-lang/sdk/issues/46288
[ $runtime == vm ]
LibTest/collection/ListBase/ListBase_class_A01_t02: Slow, Pass # Does many calls
@@ -16,9 +14,6 @@
LibTest/core/List/List_class_A01_t02: Slow, Pass # Does many calls
LibTest/io/RawDatagramSocket/*: Skip # RawDatagramSocket are flacky. Skip them all until rewritten
-[ $compiler == dartk && $runtime == vm && $system == linux ]
-LibTest/isolate/Isolate/spawn_A06_t03: Crash
-
[ $compiler == dartk && $runtime == vm && $system == macos ]
LibTest/collection/ListBase/ListBase_class_A01_t02: Slow, Pass
LibTest/collection/ListBase/ListBase_class_A01_t03: Slow, Pass
@@ -27,9 +22,6 @@
LibTest/core/List/List_class_A01_t02: Slow, Pass
LibTest/core/List/List_class_A01_t03: Slow, Pass
-[ $compiler == dartk && $runtime != vm ]
-Language/Classes/Constructors/Constant_Constructors/potentially_constant_expression_t01: Crash
-
# It makes no sense to run any test that uses spawnURI under the simulator
# as that would involve running CFE (the front end) in simulator mode
# to compile the URI file specified in spawnURI code.
diff --git a/tools/VERSION b/tools/VERSION
index 4caf537..8d43d02 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -27,5 +27,5 @@
MAJOR 2
MINOR 14
PATCH 0
-PRERELEASE 192
+PRERELEASE 193
PRERELEASE_PATCH 0
\ No newline at end of file
