Skip to content

Commit 0ffd284

Browse files
srawlinsCommit Queue
authored andcommitted
analyzer: Move analysis options-validating code out of "task"
* OptionsValidator was defined in the `src/plugin/` directory (the only file in there), which I found confusing. Moved it to `src/analysis_options/`. * OptionsFileValidator, and a few related classes, were defined in the `src/task/` (the last file in there!), so I moved it to the same place. There is more to tidy in here, but this is a simple file-move. Change-Id: I8f4c5cc0ae4e76eb6c17249457c50ab69c82590d Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/443147 Reviewed-by: Konstantin Shcheglov <[email protected]> Commit-Queue: Samuel Rawlins <[email protected]>
1 parent 1dffc4a commit 0ffd284

File tree

20 files changed

+34
-63
lines changed

20 files changed

+34
-63
lines changed

pkg/analysis_server/lib/src/context_manager.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import 'package:analyzer/file_system/overlay_file_system.dart';
1818
import 'package:analyzer/instrumentation/instrumentation.dart';
1919
import 'package:analyzer/source/file_source.dart';
2020
import 'package:analyzer/source/line_info.dart';
21+
import 'package:analyzer/src/analysis_options/options_file_validator.dart';
2122
import 'package:analyzer/src/dart/analysis/analysis_context_collection.dart';
2223
import 'package:analyzer/src/dart/analysis/byte_store.dart';
2324
import 'package:analyzer/src/dart/analysis/driver.dart';
@@ -28,7 +29,6 @@ import 'package:analyzer/src/dart/analysis/unlinked_unit_store.dart';
2829
import 'package:analyzer/src/generated/sdk.dart';
2930
import 'package:analyzer/src/manifest/manifest_validator.dart';
3031
import 'package:analyzer/src/pubspec/pubspec_validator.dart';
31-
import 'package:analyzer/src/task/options.dart';
3232
import 'package:analyzer/src/util/file_paths.dart' as file_paths;
3333
import 'package:analyzer/src/workspace/blaze.dart';
3434
import 'package:analyzer/src/workspace/blaze_watcher.dart';

pkg/analysis_server/lib/src/handler/legacy/edit_get_fixes.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ import 'package:analyzer/file_system/file_system.dart';
2222
import 'package:analyzer/source/file_source.dart';
2323
import 'package:analyzer/source/line_info.dart';
2424
import 'package:analyzer/src/analysis_options/analysis_options_provider.dart';
25+
import 'package:analyzer/src/analysis_options/options_file_validator.dart';
2526
import 'package:analyzer/src/dart/analysis/analysis_options.dart';
2627
import 'package:analyzer/src/dart/analysis/results.dart' as engine;
2728
import 'package:analyzer/src/exception/exception.dart';
2829
import 'package:analyzer/src/generated/source.dart' show SourceFactory;
2930
import 'package:analyzer/src/pubspec/pubspec_validator.dart';
30-
import 'package:analyzer/src/task/options.dart';
3131
import 'package:analyzer/src/util/file_paths.dart' as file_paths;
3232
import 'package:analyzer/src/workspace/pub.dart';
3333
import 'package:analyzer_plugin/protocol/protocol_generated.dart' as plugin;

pkg/analysis_server/lib/src/lsp/handlers/code_actions/analysis_options.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import 'package:analysis_server/src/services/correction/fix/analysis_options/fix
1111
import 'package:analyzer/source/file_source.dart';
1212
import 'package:analyzer/source/line_info.dart';
1313
import 'package:analyzer/src/analysis_options/analysis_options_provider.dart';
14+
import 'package:analyzer/src/analysis_options/options_file_validator.dart';
1415
import 'package:analyzer/src/generated/source.dart' show SourceFactory;
15-
import 'package:analyzer/src/task/options.dart';
1616
import 'package:analyzer/src/util/performance/operation_performance.dart';
1717
import 'package:analyzer/src/workspace/pub.dart';
1818
import 'package:yaml/yaml.dart';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ import 'package:analysis_server/src/services/completion/yaml/yaml_completion_gen
88
import 'package:analyzer/dart/analysis/formatter_options.dart';
99
import 'package:analyzer/error/error.dart';
1010
import 'package:analyzer/file_system/file_system.dart';
11+
import 'package:analyzer/src/analysis_options/options_file_validator.dart';
1112
import 'package:analyzer/src/dart/analysis/experiments.dart';
1213
import 'package:analyzer/src/lint/registry.dart';
13-
import 'package:analyzer/src/task/options.dart';
1414

1515
/// A completion generator that can produce completion suggestions for analysis
1616
/// options files.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
import 'package:analysis_server/src/services/completion/yaml/analysis_options_generator.dart';
66
import 'package:analyzer/error/error.dart';
7+
import 'package:analyzer/src/analysis_options/options_file_validator.dart';
78
import 'package:analyzer/src/lint/linter.dart';
8-
import 'package:analyzer/src/task/options.dart';
99
import 'package:analyzer/src/test_utilities/lint_registration_mixin.dart';
1010
import 'package:linter/src/rules.dart';
1111
import 'package:test/test.dart';

pkg/analysis_server/test/src/services/correction/fix/analysis_options/test_support.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import 'package:analysis_server_plugin/edit/fix/fix.dart';
77
import 'package:analyzer/analysis_rule/rule_state.dart';
88
import 'package:analyzer/diagnostic/diagnostic.dart';
99
import 'package:analyzer/source/file_source.dart';
10+
import 'package:analyzer/src/analysis_options/options_file_validator.dart';
1011
import 'package:analyzer/src/generated/source.dart';
11-
import 'package:analyzer/src/task/options.dart';
1212
import 'package:analyzer_plugin/protocol/protocol_common.dart'
1313
hide AnalysisError;
1414
import 'package:analyzer_testing/resource_provider_mixin.dart';

pkg/analyzer/lib/source/error_processor.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
import 'package:analyzer/diagnostic/diagnostic.dart';
66
import 'package:analyzer/error/error.dart';
7+
import 'package:analyzer/src/analysis_options/options_file_validator.dart';
78
import 'package:analyzer/src/generated/engine.dart';
8-
import 'package:analyzer/src/task/options.dart';
99
import 'package:collection/collection.dart';
1010
import 'package:meta/meta.dart';
1111
import 'package:yaml/yaml.dart';

pkg/analyzer/lib/src/analysis_options/analysis_options_provider.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import 'package:analyzer/file_system/file_system.dart';
66
import 'package:analyzer/source/file_source.dart';
77
import 'package:analyzer/source/source.dart';
8+
import 'package:analyzer/src/analysis_options/options_file_validator.dart';
89
import 'package:analyzer/src/generated/source.dart' show SourceFactory;
9-
import 'package:analyzer/src/task/options.dart';
1010
import 'package:analyzer/src/util/file_paths.dart' as file_paths;
1111
import 'package:analyzer/src/util/yaml.dart';
1212
import 'package:source_span/source_span.dart';

pkg/analyzer/lib/src/task/options.dart renamed to pkg/analyzer/lib/src/analysis_options/options_file_validator.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ import 'package:analyzer/source/error_processor.dart';
1010
import 'package:analyzer/source/source.dart';
1111
import 'package:analyzer/src/analysis_options/analysis_options_provider.dart';
1212
import 'package:analyzer/src/analysis_options/error/option_codes.dart';
13+
import 'package:analyzer/src/analysis_options/options_validator.dart';
1314
import 'package:analyzer/src/dart/analysis/experiments.dart';
1415
import 'package:analyzer/src/generated/source.dart' show SourceFactory;
1516
import 'package:analyzer/src/generated/utilities_general.dart';
1617
import 'package:analyzer/src/lint/options_rule_validator.dart';
1718
import 'package:analyzer/src/lint/registry.dart';
18-
import 'package:analyzer/src/plugin/options.dart';
1919
import 'package:analyzer/src/util/yaml.dart';
2020
import 'package:analyzer/src/utilities/extensions/string.dart';
2121
import 'package:meta/meta.dart';
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
// Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file
2+
// for details. All rights reserved. Use of this source code is governed by a
3+
// BSD-style license that can be found in the LICENSE file.
4+
5+
/// Support for client code that wants to consume options contributed to the
6+
/// analysis options file.
7+
library;
8+
9+
import 'package:analyzer/error/listener.dart';
10+
import 'package:yaml/yaml.dart';
11+
12+
/// A class that validates options as defined in an analysis options file.
13+
abstract class OptionsValidator {
14+
/// Validate [options], reporting any errors to the given [reporter].
15+
void validate(DiagnosticReporter reporter, YamlMap options);
16+
}

0 commit comments

Comments
 (0)