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

Unified Diff: pkg/analysis_server/lib/src/socket_server.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
Index: pkg/analysis_server/lib/src/socket_server.dart
diff --git a/pkg/analysis_server/lib/src/socket_server.dart b/pkg/analysis_server/lib/src/socket_server.dart
index f5ea82240b5bd6a19f650be58c1c288bd717a28a..cbb9cb1bdca3ba8b307c6debd2263b36c58808db 100644
--- a/pkg/analysis_server/lib/src/socket_server.dart
+++ b/pkg/analysis_server/lib/src/socket_server.dart
@@ -16,6 +16,7 @@ import 'package:analysis_server/src/domain_server.dart';
import 'package:analysis_server/src/package_map_provider.dart';
import 'package:analysis_server/src/protocol.dart';
import 'package:analyzer/file_system/physical_file_system.dart';
+import 'package:analyzer/src/generated/sdk_io.dart';
import 'package:path/path.dart' as pathos;
import 'package:analysis_services/index/index.dart';
import 'package:analysis_services/index/local_file_index.dart';
@@ -53,6 +54,10 @@ class SocketServer {
*/
AnalysisServer analysisServer;
+ final DirectoryBasedDartSdk defaultSdk;
+
+ SocketServer(this.defaultSdk);
+
/**
* Create an analysis server which will communicate with the client using the
* given serverChannel.
@@ -70,8 +75,9 @@ class SocketServer {
analysisServer = new AnalysisServer(
serverChannel,
resourceProvider,
- new PubPackageMapProvider(resourceProvider),
+ new PubPackageMapProvider(resourceProvider, defaultSdk),
_createIndex(),
+ defaultSdk,
rethrowExceptions: false);
_initializeHandlers(analysisServer);
}
« no previous file with comments | « pkg/analysis_server/lib/src/package_map_provider.dart ('k') | pkg/analysis_server/test/analysis_abstract.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698