update prev

lib/src/analyzers/lint_analyzer/lint_analyzer.dart

@@ -81,8 +81,8 @@ class LintAnalyzer {
     final analyzerResult = <LintFileReport>[];
 
     for (final context in collection.contexts) {
-      final analysisOptions = await analysisOptionsFromContext(context) ??
-          await analysisOptionsFromFilePath(rootFolder, context);
+      final analysisOptions = analysisOptionsFromContext(context) ??
+          analysisOptionsFromFilePath(rootFolder, context);
 
       final excludesRootFolder = analysisOptions.folderPath ?? rootFolder;
 

lib/src/analyzers/unused_code_analyzer/unused_code_analyzer.dart

@@ -55,7 +55,7 @@ class UnusedCodeAnalyzer {
 
     for (final context in collection.contexts) {
       final unusedCodeAnalysisConfig =
-          await _getAnalysisConfig(context, rootFolder, config);
+          _getAnalysisConfig(context, rootFolder, config);
 
       final filePaths = getFilePaths(
         folders,
@@ -98,13 +98,13 @@ class UnusedCodeAnalyzer {
     return _getReports(codeUsages, publicCode, rootFolder);
   }
 
-  Future<UnusedCodeAnalysisConfig> _getAnalysisConfig(
+  UnusedCodeAnalysisConfig _getAnalysisConfig(
     AnalysisContext context,
     String rootFolder,
     UnusedCodeConfig config,
-  ) async {
-    final analysisOptions = await analysisOptionsFromContext(context) ??
-        await analysisOptionsFromFilePath(rootFolder, context);
+  ) {
+    final analysisOptions = analysisOptionsFromContext(context) ??
+        analysisOptionsFromFilePath(rootFolder, context);
 
     final contextConfig =
         ConfigBuilder.getUnusedCodeConfigFromOption(analysisOptions)

lib/src/analyzers/unused_files_analyzer/unused_files_analyzer.dart

@@ -47,7 +47,7 @@ class UnusedFilesAnalyzer {
 
     for (final context in collection.contexts) {
       final unusedFilesAnalysisConfig =
-          await _getAnalysisConfig(context, rootFolder, config);
+          _getAnalysisConfig(context, rootFolder, config);
 
       final filePaths = getFilePaths(
         folders,
@@ -92,13 +92,13 @@ class UnusedFilesAnalyzer {
     }
   }
 
-  Future<UnusedFilesAnalysisConfig> _getAnalysisConfig(
+  UnusedFilesAnalysisConfig _getAnalysisConfig(
     AnalysisContext context,
     String rootFolder,
     UnusedFilesConfig config,
-  ) async {
-    final analysisOptions = await analysisOptionsFromContext(context) ??
-        await analysisOptionsFromFilePath(rootFolder, context);
+  ) {
+    final analysisOptions = analysisOptionsFromContext(context) ??
+        analysisOptionsFromFilePath(rootFolder, context);
 
     final contextConfig =
         ConfigBuilder.getUnusedFilesConfigFromOption(analysisOptions)

lib/src/analyzers/unused_l10n_analyzer/unused_l10n_analyzer.dart

@@ -51,8 +51,8 @@ class UnusedL10nAnalyzer {
     final localizationUsages = <ClassElement, Set<String>>{};
 
     for (final context in collection.contexts) {
-      final analysisOptions = await analysisOptionsFromContext(context) ??
-          await analysisOptionsFromFilePath(rootFolder, context);
+      final analysisOptions = analysisOptionsFromContext(context) ??
+          analysisOptionsFromFilePath(rootFolder, context);
 
       final contextConfig =
           ConfigBuilder.getUnusedL10nConfigFromOption(analysisOptions)

lib/src/config_builder/models/analysis_options.dart

@@ -1,5 +1,4 @@
 import 'dart:io';
-import 'dart:isolate';
 
 import 'package:analyzer/dart/analysis/analysis_context.dart';
 import 'package:analyzer/dart/analysis/uri_converter.dart';
@@ -110,17 +109,17 @@ class AnalysisOptions {
   }
 }
 
-Future<AnalysisOptions?> analysisOptionsFromContext(
+AnalysisOptions? analysisOptionsFromContext(
   AnalysisContext context,
-) async {
+) {
   final optionsFilePath = context.contextRoot.optionsFile?.path;
 
   return optionsFilePath == null
       ? null
       : analysisOptionsFromFile(File(optionsFilePath), context);
 }
 
-Future<AnalysisOptions> analysisOptionsFromFilePath(
+AnalysisOptions analysisOptionsFromFilePath(
   String path,
   AnalysisContext context,
 ) {
@@ -129,24 +128,24 @@ Future<AnalysisOptions> analysisOptionsFromFilePath(
   return analysisOptionsFromFile(analysisOptionsFile, context);
 }
 
-Future<AnalysisOptions> analysisOptionsFromFile(
+AnalysisOptions analysisOptionsFromFile(
   File? options,
   AnalysisContext context,
-) async =>
+) =>
     options != null && options.existsSync()
         ? AnalysisOptions(
             options.path,
-            await _loadConfigFromYamlFile(
+            _loadConfigFromYamlFile(
               options,
               context.currentSession.uriConverter,
             ),
           )
         : const AnalysisOptions(null, {});
 
-Future<Map<String, Object>> _loadConfigFromYamlFile(
+Map<String, Object> _loadConfigFromYamlFile(
   File options,
   UriConverter converter,
-) async {
+) {
   try {
     final node = options.existsSync()
         ? loadYamlNode(options.readAsStringSync())
@@ -157,25 +156,15 @@ Future<Map<String, Object>> _loadConfigFromYamlFile(
 
     final includeNode = optionsNode['include'];
     if (includeNode is String) {
-      Uri? resolvedUri;
-
       final packageImport = includeNode.startsWith('package:');
-      if (packageImport) {
-        final includeUri = Uri.parse(includeNode);
 
-        final includePath = converter.uriToPath(includeUri);
-
-        resolvedUri = includePath != null
-            ? Uri.parse(includePath)
-            : await Isolate.resolvePackageUri(includeUri);
-      } else {
-        resolvedUri =
-            Uri.file(p.absolute(p.dirname(options.path), includeNode));
-      }
+      final resolvedUri = packageImport
+          ? converter.uriToPath(Uri.parse(includeNode))
+          : p.absolute(p.dirname(options.path), includeNode);
 
       if (resolvedUri != null) {
         final resolvedYamlMap =
-            await _loadConfigFromYamlFile(File.fromUri(resolvedUri), converter);
+            _loadConfigFromYamlFile(File(resolvedUri), converter);
         optionsNode =
             mergeMaps(defaults: resolvedYamlMap, overrides: optionsNode);
       }

test/src/config_builder/models/analysis_options_test.dart

@@ -35,24 +35,23 @@ void main() {
   group('analysisOptionsFromFile constructs AnalysisOptions from', () {
     final context = AnalysisContextMock();
 
-    test('null', () async {
-      final options = await analysisOptionsFromFile(null, context);
+    test('null', () {
+      final options = analysisOptionsFromFile(null, context);
 
       expect(options.options, isEmpty);
     });
 
-    test('invalid file', () async {
+    test('invalid file', () {
       final options =
-          await analysisOptionsFromFile(File('unavailable.yaml'), context);
+          analysisOptionsFromFile(File('unavailable.yaml'), context);
 
       expect(options.options, isEmpty);
     });
 
-    test('yaml file', () async {
+    test('yaml file', () {
       const yamlFilePath = './test/resources/analysis_options_pkg.yaml';
 
-      final options =
-          await analysisOptionsFromFile(File(yamlFilePath), context);
+      final options = analysisOptionsFromFile(File(yamlFilePath), context);
 
       expect(options.options, contains('linter'));
       expect(options.options['linter'], contains('rules'));