Index: pkg/analyzer/lib/source/pub_package_map_provider.dart |
diff --git a/pkg/analyzer/lib/source/pub_package_map_provider.dart b/pkg/analyzer/lib/source/pub_package_map_provider.dart |
index a7b2c4229c4a376dbfcb1b3d1add7989b488202d..c56223292df450f32089cf5dbb29b4c1b6c19f71 100644 |
--- a/pkg/analyzer/lib/source/pub_package_map_provider.dart |
+++ b/pkg/analyzer/lib/source/pub_package_map_provider.dart |
@@ -11,8 +11,8 @@ import 'dart:io' as io; |
import 'package:analyzer/file_system/file_system.dart'; |
import 'package:analyzer/source/package_map_provider.dart'; |
+import 'package:analyzer/src/dart/sdk/sdk.dart'; |
import 'package:analyzer/src/generated/engine.dart'; |
-import 'package:analyzer/src/generated/sdk_io.dart'; |
/** |
* The function used to run pub list. |
@@ -40,7 +40,7 @@ class PubPackageMapProvider implements PackageMapProvider { |
/** |
* Sdk that we use to find the pub executable. |
*/ |
- final DirectoryBasedDartSdk sdk; |
+ final FolderBasedDartSdk sdk; |
/** |
* The function used to run pub list. |
@@ -146,6 +146,7 @@ class PubPackageMapProvider implements PackageMapProvider { |
packageMap[packageName] = folders; |
} |
} |
+ |
packages.forEach((key, value) { |
if (value is String) { |
processPaths(key, [value]); |
@@ -169,7 +170,7 @@ class PubPackageMapProvider implements PackageMapProvider { |
* Run pub list to determine the packages and input files. |
*/ |
io.ProcessResult _runPubListDefault(Folder folder) { |
- String executablePath = sdk.pubExecutable.getAbsolutePath(); |
+ String executablePath = sdk.pubExecutable.path; |
List<String> arguments = [PUB_LIST_COMMAND]; |
String workingDirectory = folder.path; |
int subprocessId = AnalysisEngine.instance.instrumentationService |