mirror of
https://github.com/flutter/flutter.git
synced 2025-06-03 00:51:18 +00:00
Remove gratuitous pub resolver from flutter analysis.
Package mapping is already done by the `PackageDependencyTracker` so this extra check is at best not needed. (At worst could cause an unneeded and costly call to `pub list-package-dirs`!)
This commit is contained in:
parent
cc93170894
commit
18d971d492
@ -6,15 +6,11 @@ import 'dart:collection';
|
|||||||
import 'dart:io';
|
import 'dart:io';
|
||||||
|
|
||||||
import 'package:analyzer/file_system/file_system.dart' as file_system;
|
import 'package:analyzer/file_system/file_system.dart' as file_system;
|
||||||
import 'package:analyzer/file_system/file_system.dart' show Folder;
|
|
||||||
import 'package:analyzer/file_system/physical_file_system.dart';
|
import 'package:analyzer/file_system/physical_file_system.dart';
|
||||||
import 'package:analyzer/plugin/options.dart';
|
import 'package:analyzer/plugin/options.dart';
|
||||||
import 'package:analyzer/source/analysis_options_provider.dart';
|
import 'package:analyzer/source/analysis_options_provider.dart';
|
||||||
import 'package:analyzer/source/embedder.dart';
|
import 'package:analyzer/source/embedder.dart';
|
||||||
import 'package:analyzer/source/error_processor.dart';
|
import 'package:analyzer/source/error_processor.dart';
|
||||||
import 'package:analyzer/source/package_map_provider.dart';
|
|
||||||
import 'package:analyzer/source/package_map_resolver.dart';
|
|
||||||
import 'package:analyzer/source/pub_package_map_provider.dart';
|
|
||||||
import 'package:analyzer/src/generated/engine.dart';
|
import 'package:analyzer/src/generated/engine.dart';
|
||||||
import 'package:analyzer/src/generated/error.dart';
|
import 'package:analyzer/src/generated/error.dart';
|
||||||
import 'package:analyzer/src/generated/java_io.dart';
|
import 'package:analyzer/src/generated/java_io.dart';
|
||||||
@ -112,16 +108,6 @@ class AnalysisDriver {
|
|||||||
if (options.packageRootPath != null) {
|
if (options.packageRootPath != null) {
|
||||||
JavaFile packageDirectory = new JavaFile(options.packageRootPath);
|
JavaFile packageDirectory = new JavaFile(options.packageRootPath);
|
||||||
resolvers.add(new PackageUriResolver(<JavaFile>[packageDirectory]));
|
resolvers.add(new PackageUriResolver(<JavaFile>[packageDirectory]));
|
||||||
} else {
|
|
||||||
PubPackageMapProvider pubPackageMapProvider =
|
|
||||||
new PubPackageMapProvider(PhysicalResourceProvider.INSTANCE, sdk);
|
|
||||||
PackageMapInfo packageMapInfo = pubPackageMapProvider.computePackageMap(
|
|
||||||
PhysicalResourceProvider.INSTANCE.getResource('.'));
|
|
||||||
Map<String, List<Folder>> packageMap = packageMapInfo.packageMap;
|
|
||||||
if (packageMap != null) {
|
|
||||||
resolvers.add(new PackageMapUriResolver(
|
|
||||||
PhysicalResourceProvider.INSTANCE, packageMap));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
resolvers.add(new FileUriResolver());
|
resolvers.add(new FileUriResolver());
|
||||||
|
Loading…
Reference in New Issue
Block a user