Remove unused analyzedFilesGlobs in AbstractAnalysisServer.
Change-Id: I46f0b7c1b426d3c530d568df3cb04c0ad194d186
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/186802
Reviewed-by: Samuel Rawlins <srawlins@google.com>
Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analysis_server/lib/src/analysis_server_abstract.dart b/pkg/analysis_server/lib/src/analysis_server_abstract.dart
index 7d4584e..0a38cf0 100644
--- a/pkg/analysis_server/lib/src/analysis_server_abstract.dart
+++ b/pkg/analysis_server/lib/src/analysis_server_abstract.dart
@@ -42,7 +42,6 @@
import 'package:analyzer/src/generated/engine.dart';
import 'package:analyzer/src/generated/sdk.dart';
import 'package:analyzer/src/services/available_declarations.dart';
-import 'package:analyzer/src/util/glob.dart';
/// Implementations of [AbstractAnalysisServer] implement a server that listens
/// on a [CommunicationChannel] for analysis messages and process them.
@@ -109,24 +108,12 @@
/// The set of the files that are currently priority.
final Set<String> priorityFiles = <String>{};
- final List<String> analyzableFilePatterns = <String>[
- '**/*.${AnalysisEngine.SUFFIX_DART}',
- '**/${AnalysisEngine.ANALYSIS_OPTIONS_YAML_FILE}',
- '**/${AnalysisEngine.FIX_DATA_FILE}',
- '**/${AnalysisEngine.PUBSPEC_YAML_FILE}',
- '**/${AnalysisEngine.ANDROID_MANIFEST_FILE}'
- ];
-
/// The [ResourceProvider] using which paths are converted into [Resource]s.
final OverlayResourceProvider resourceProvider;
/// The next modification stamp for a changed file in the [resourceProvider].
int overlayModificationStamp = 0;
- /// A list of the globs used to determine which files should be analyzed. The
- /// list is lazily created and should be accessed using [analyzedFilesGlobs].
- List<Glob> _analyzedFilesGlobs;
-
AbstractAnalysisServer(
this.options,
this.sdkManager,
@@ -183,31 +170,11 @@
byteStore,
analysisPerformanceLogger,
analysisDriverScheduler,
- analyzedFilesGlobs,
instrumentationService,
);
searchEngine = SearchEngineImpl(driverMap.values);
}
- /// Return a list of the globs used to determine which files should be
- /// analyzed.
- List<Glob> get analyzedFilesGlobs {
- if (_analyzedFilesGlobs == null) {
- _analyzedFilesGlobs = <Glob>[];
- for (var pattern in analyzableFilePatterns) {
- try {
- _analyzedFilesGlobs
- .add(Glob(resourceProvider.pathContext.separator, pattern));
- } catch (exception, stackTrace) {
- AnalysisEngine.instance.instrumentationService.logException(
- CaughtException.withMessage(
- 'Invalid glob pattern: "$pattern"', exception, stackTrace));
- }
- }
- }
- return _analyzedFilesGlobs;
- }
-
/// The list of current analysis sessions in all contexts.
List<AnalysisSession> get currentSessions {
return driverMap.values.map((driver) => driver.currentSession).toList();
diff --git a/pkg/analysis_server/lib/src/context_manager.dart b/pkg/analysis_server/lib/src/context_manager.dart
index 0013292..9ff6e06 100644
--- a/pkg/analysis_server/lib/src/context_manager.dart
+++ b/pkg/analysis_server/lib/src/context_manager.dart
@@ -26,7 +26,6 @@
import 'package:analyzer/src/pubspec/pubspec_validator.dart';
import 'package:analyzer/src/task/options.dart';
import 'package:analyzer/src/util/file_paths.dart' as file_paths;
-import 'package:analyzer/src/util/glob.dart';
import 'package:analyzer/src/workspace/bazel.dart';
import 'package:analyzer_plugin/protocol/protocol_common.dart' as protocol;
import 'package:analyzer_plugin/utilities/analyzer_converter.dart';
@@ -177,9 +176,6 @@
@override
List<String> includedPaths = <String>[];
- /// A list of the globs used to determine which files should be analyzed.
- final List<Glob> analyzedFilesGlobs;
-
/// The instrumentation service used to report instrumentation data.
final InstrumentationService _instrumentationService;
@@ -206,7 +202,6 @@
this._byteStore,
this._performanceLog,
this._scheduler,
- this.analyzedFilesGlobs,
this._instrumentationService,
) {
pathContext = resourceProvider.pathContext;
