diff --git a/pkg/analysis_server/lib/src/g3/utilities.dart b/pkg/analysis_server/lib/src/g3/utilities.dart index cd6522435cc..664f7455f39 100644 --- a/pkg/analysis_server/lib/src/g3/utilities.dart +++ b/pkg/analysis_server/lib/src/g3/utilities.dart @@ -13,7 +13,6 @@ import 'package:analyzer/error/listener.dart'; import 'package:analyzer/source/line_info.dart'; import 'package:analyzer/src/dart/analysis/experiments.dart'; import 'package:analyzer/src/dart/analysis/results.dart'; -import 'package:analyzer/src/dart/scanner/reader.dart'; import 'package:analyzer/src/dart/scanner/scanner.dart'; import 'package:analyzer/src/generated/parser.dart' as p; import 'package:analyzer/src/string_source.dart'; @@ -54,13 +53,12 @@ ParseStringResult sortDirectives(String contents, {String? fileName}) { }) { var source = StringSource(contents, fullName); var diagnosticListener = RecordingDiagnosticListener(); - var reader = CharSequenceReader(contents); var featureSet = FeatureSet.fromEnableFlags2( sdkLanguageVersion: ExperimentStatus.currentVersion, flags: [], ); var diagnosticReporter = DiagnosticReporter(diagnosticListener, source); - var scanner = Scanner(reader, diagnosticReporter) + var scanner = Scanner(contents, diagnosticReporter) ..configureFeatures( featureSetForOverriding: FeatureSet.latestLanguageVersion(), featureSet: featureSet, diff --git a/pkg/analysis_server/lib/src/lsp/source_edits.dart b/pkg/analysis_server/lib/src/lsp/source_edits.dart index fe2f3669773..e07a1a8cda9 100644 --- a/pkg/analysis_server/lib/src/lsp/source_edits.dart +++ b/pkg/analysis_server/lib/src/lsp/source_edits.dart @@ -15,7 +15,6 @@ import 'package:analyzer/dart/ast/token.dart'; import 'package:analyzer/error/listener.dart'; import 'package:analyzer/source/line_info.dart'; import 'package:analyzer/source/source.dart'; -import 'package:analyzer/src/dart/scanner/reader.dart'; import 'package:analyzer/src/dart/scanner/scanner.dart'; import 'package:analyzer_plugin/protocol/protocol_common.dart' as plugin; import 'package:dart_style/dart_style.dart' hide TrailingCommas; @@ -701,7 +700,7 @@ class _MinimalEditComputer { try { var scanner = Scanner( - CharSequenceReader(s), + s, DiagnosticReporter( DiagnosticListener.nullListener, _SourceMock.instance, diff --git a/pkg/analysis_server/lib/src/services/correction/statement_analyzer.dart b/pkg/analysis_server/lib/src/services/correction/statement_analyzer.dart index f6c0108c166..094cdab909e 100644 --- a/pkg/analysis_server/lib/src/services/correction/statement_analyzer.dart +++ b/pkg/analysis_server/lib/src/services/correction/statement_analyzer.dart @@ -14,7 +14,6 @@ import 'package:analyzer/dart/ast/token.dart'; import 'package:analyzer/error/listener.dart'; import 'package:analyzer/source/source.dart'; import 'package:analyzer/source/source_range.dart'; -import 'package:analyzer/src/dart/scanner/reader.dart'; import 'package:analyzer/src/dart/scanner/scanner.dart'; import 'package:analyzer_plugin/utilities/range_factory.dart'; @@ -25,7 +24,7 @@ List _getTokens(String text, FeatureSet featureSet) { var tokens = []; var scanner = Scanner( - CharSequenceReader(text), + text, DiagnosticReporter( DiagnosticListener.nullListener, _SourceMock.instance, diff --git a/pkg/analysis_server/test/stress/replay/replay.dart b/pkg/analysis_server/test/stress/replay/replay.dart index 8ebac075bb6..97f2ffa366e 100644 --- a/pkg/analysis_server/test/stress/replay/replay.dart +++ b/pkg/analysis_server/test/stress/replay/replay.dart @@ -14,7 +14,6 @@ import 'package:analyzer/dart/ast/token.dart'; import 'package:analyzer/error/listener.dart' as error; import 'package:analyzer/source/line_info.dart'; import 'package:analyzer/source/source.dart'; -import 'package:analyzer/src/dart/scanner/reader.dart'; import 'package:analyzer/src/dart/scanner/scanner.dart'; import 'package:analyzer/src/util/file_paths.dart' as file_paths; import 'package:analyzer/src/util/glob.dart'; @@ -226,7 +225,7 @@ class Driver { var featureSet = FeatureSet.latestLanguageVersion(); var scanner = Scanner( - CharSequenceReader(text), + text, error.DiagnosticReporter( error.DiagnosticListener.nullListener, _TestSource(), diff --git a/pkg/analysis_server_plugin/lib/edit/correction_utils.dart b/pkg/analysis_server_plugin/lib/edit/correction_utils.dart index 728c2994a95..9ef7ed435e0 100644 --- a/pkg/analysis_server_plugin/lib/edit/correction_utils.dart +++ b/pkg/analysis_server_plugin/lib/edit/correction_utils.dart @@ -13,7 +13,6 @@ import 'package:analyzer/source/source.dart'; import 'package:analyzer/source/source_range.dart'; import 'package:analyzer/src/dart/ast/ast.dart'; import 'package:analyzer/src/dart/ast/extensions.dart'; -import 'package:analyzer/src/dart/scanner/reader.dart'; import 'package:analyzer/src/dart/scanner/scanner.dart'; import 'package:analyzer/src/utilities/extensions/string.dart'; import 'package:analyzer_plugin/src/utilities/string_utilities.dart'; @@ -459,7 +458,7 @@ class TokenUtils { var tokens = []; var scanner = Scanner( - CharSequenceReader(s), + s, DiagnosticReporter(DiagnosticListener.nullListener, _SourceMock()), )..configureFeatures( featureSetForOverriding: featureSet, diff --git a/pkg/analyzer/lib/dart/analysis/utilities.dart b/pkg/analyzer/lib/dart/analysis/utilities.dart index 14e3ba9bf09..c36e182cd46 100644 --- a/pkg/analyzer/lib/dart/analysis/utilities.dart +++ b/pkg/analyzer/lib/dart/analysis/utilities.dart @@ -16,7 +16,6 @@ import 'package:analyzer/file_system/physical_file_system.dart'; import 'package:analyzer/source/line_info.dart'; import 'package:analyzer/src/dart/analysis/experiments.dart'; import 'package:analyzer/src/dart/analysis/results.dart'; -import 'package:analyzer/src/dart/scanner/reader.dart'; import 'package:analyzer/src/dart/scanner/scanner.dart'; import 'package:analyzer/src/generated/parser.dart'; import 'package:analyzer/src/string_source.dart'; @@ -82,10 +81,9 @@ ParseStringResult parseString({ }) { featureSet ??= FeatureSet.latestLanguageVersion(); var source = StringSource(content, path ?? ''); - var reader = CharSequenceReader(content); var diagnosticCollector = RecordingDiagnosticListener(); var diagnosticReporter = DiagnosticReporter(diagnosticCollector, source); - var scanner = Scanner(reader, diagnosticReporter) + var scanner = Scanner(content, diagnosticReporter) ..configureFeatures( featureSetForOverriding: featureSet, featureSet: featureSet, diff --git a/pkg/analyzer/lib/src/dart/analysis/file_state.dart b/pkg/analyzer/lib/src/dart/analysis/file_state.dart index 97659522a1b..a47f2543149 100644 --- a/pkg/analyzer/lib/src/dart/analysis/file_state.dart +++ b/pkg/analyzer/lib/src/dart/analysis/file_state.dart @@ -30,7 +30,6 @@ import 'package:analyzer/src/dart/analysis/unlinked_api_signature.dart'; import 'package:analyzer/src/dart/analysis/unlinked_data.dart'; import 'package:analyzer/src/dart/analysis/unlinked_unit_store.dart'; import 'package:analyzer/src/dart/ast/ast.dart'; -import 'package:analyzer/src/dart/scanner/reader.dart'; import 'package:analyzer/src/dart/scanner/scanner.dart'; import 'package:analyzer/src/dartdoc/dartdoc_directive_info.dart'; import 'package:analyzer/src/exception/exception.dart'; @@ -581,9 +580,8 @@ class FileState { return performance.run('parseCode', (performance) { performance.getDataInt('length').add(code.length); - CharSequenceReader reader = CharSequenceReader(code); var diagnosticReporter = DiagnosticReporter(diagnosticListener, source); - Scanner scanner = Scanner(reader, diagnosticReporter) + Scanner scanner = Scanner(code, diagnosticReporter) ..configureFeatures( featureSetForOverriding: featureSet, featureSet: featureSet.restrictToVersion(packageLanguageVersion), diff --git a/pkg/analyzer/lib/src/dart/scanner/reader.dart b/pkg/analyzer/lib/src/dart/scanner/reader.dart deleted file mode 100644 index bdd6c0b7250..00000000000 --- a/pkg/analyzer/lib/src/dart/scanner/reader.dart +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file -// for details. All rights reserved. Use of this source code is governed by a -// BSD-style license that can be found in the LICENSE file. - -export 'package:_fe_analyzer_shared/src/scanner/reader.dart' - show CharacterReader, CharSequenceReader, SubSequenceReader; - -/// This file is intentionally left blank except for exports. diff --git a/pkg/analyzer/lib/src/dart/scanner/scanner.dart b/pkg/analyzer/lib/src/dart/scanner/scanner.dart index a5834ff13c5..abb8f040ddf 100644 --- a/pkg/analyzer/lib/src/dart/scanner/scanner.dart +++ b/pkg/analyzer/lib/src/dart/scanner/scanner.dart @@ -11,7 +11,6 @@ import 'package:_fe_analyzer_shared/src/scanner/token.dart' import 'package:analyzer/dart/analysis/features.dart'; import 'package:analyzer/source/source.dart'; import 'package:analyzer/src/dart/analysis/experiments.dart'; -import 'package:analyzer/src/dart/scanner/reader.dart'; import 'package:analyzer/src/dart/scanner/translate_error_token.dart' show translateErrorToken; import 'package:analyzer/src/diagnostic/diagnostic.dart' as diag; @@ -62,18 +61,11 @@ class Scanner { late FeatureSet _featureSet; - /// Initialize a newly created scanner to scan characters from the given - /// [source]. The given character [reader] will be used to read the characters - /// in the source. The given [diagnosticReporter] will be informed of any - /// errors that are found. - factory Scanner( - CharacterReader reader, - DiagnosticReporter diagnosticReporter, - ) => Scanner.fasta( - diagnosticReporter, - contents: reader.getContents(), - offset: reader.offset, - ); + /// Initializes a scanner to scan the given [contents]. + /// + /// The [diagnosticReporter] will be informed of any errors that are found. + factory Scanner(String contents, DiagnosticReporter diagnosticReporter) => + Scanner.fasta(diagnosticReporter, contents: contents); factory Scanner.fasta( DiagnosticReporter diagnosticReporter, { diff --git a/pkg/analyzer/test/generated/scanner_test.dart b/pkg/analyzer/test/generated/scanner_test.dart index d1bad2031c0..5a5fbbf15d7 100644 --- a/pkg/analyzer/test/generated/scanner_test.dart +++ b/pkg/analyzer/test/generated/scanner_test.dart @@ -7,7 +7,6 @@ import 'package:analyzer/dart/analysis/features.dart'; import 'package:analyzer/dart/ast/token.dart'; import 'package:analyzer/error/listener.dart'; import 'package:analyzer/source/line_info.dart'; -import 'package:analyzer/src/dart/scanner/reader.dart'; import 'package:analyzer/src/dart/scanner/scanner.dart'; import 'package:analyzer/src/string_source.dart'; import 'package:analyzer_testing/resource_provider_mixin.dart'; @@ -76,13 +75,11 @@ class LineInfoTest { String source = "var\r\ni\n=\n1;\n"; GatheringDiagnosticListener listener = GatheringDiagnosticListener(); Scanner scanner = - Scanner( - CharSequenceReader(source), - DiagnosticReporter(listener, TestSource()), - )..configureFeatures( - featureSetForOverriding: featureSet, - featureSet: featureSet, - ); + Scanner(source, DiagnosticReporter(listener, TestSource())) + ..configureFeatures( + featureSetForOverriding: featureSet, + featureSet: featureSet, + ); var token = scanner.tokenize(); expect(token.lexeme, 'var'); var lineStarts = scanner.lineStarts; @@ -96,13 +93,11 @@ class LineInfoTest { String source = '