Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(708)

Unified Diff: pkg/analysis_server/lib/src/package_map_provider.dart

Issue 394923004: As a temporary measure, allow SDK to be specified on analysis server cmd line. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « pkg/analysis_server/lib/src/analysis_server.dart ('k') | pkg/analysis_server/lib/src/socket_server.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analysis_server/lib/src/package_map_provider.dart
diff --git a/pkg/analysis_server/lib/src/package_map_provider.dart b/pkg/analysis_server/lib/src/package_map_provider.dart
index bf031c46c33b50df3104064a92946c1ae77bdd8c..a345bf205d33d4e2e780b3979f69faecf0cb7f1c 100644
--- a/pkg/analysis_server/lib/src/package_map_provider.dart
+++ b/pkg/analysis_server/lib/src/package_map_provider.dart
@@ -8,9 +8,9 @@ import 'dart:collection';
import 'dart:convert';
import 'dart:io' as io;
-import 'package:analysis_server/src/analysis_server.dart';
import 'package:analyzer/file_system/file_system.dart';
import 'package:analyzer/src/generated/engine.dart';
+import 'package:analyzer/src/generated/sdk_io.dart';
import 'package:path/path.dart';
/**
@@ -68,14 +68,19 @@ class PubPackageMapProvider implements PackageMapProvider {
*/
final ResourceProvider resourceProvider;
- PubPackageMapProvider(this.resourceProvider);
+ /**
+ * Sdk that we use to find the pub executable.
+ */
+ final DirectoryBasedDartSdk sdk;
+
+ PubPackageMapProvider(this.resourceProvider, this.sdk);
@override
PackageMapInfo computePackageMap(Folder folder) {
// TODO(paulberry) make this asynchronous so that we can (a) do other
// analysis while it's in progress, and (b) time out if it takes too long
// to respond.
- String executable = SHARED_SDK.pubExecutable.getAbsolutePath();
+ String executable = sdk.pubExecutable.getAbsolutePath();
io.ProcessResult result;
try {
result = io.Process.runSync(
« no previous file with comments | « pkg/analysis_server/lib/src/analysis_server.dart ('k') | pkg/analysis_server/lib/src/socket_server.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698