Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 library socket.server; | 5 library socket.server; |
| 6 | 6 |
| 7 import 'package:analysis_server/src/analysis_server.dart'; | 7 import 'package:analysis_server/src/analysis_server.dart'; |
| 8 import 'package:analysis_server/src/channel/channel.dart'; | 8 import 'package:analysis_server/src/channel/channel.dart'; |
| 9 import 'package:analysis_server/src/plugin/server_plugin.dart'; | 9 import 'package:analysis_server/src/plugin/server_plugin.dart'; |
| 10 import 'package:analysis_server/src/protocol.dart'; | 10 import 'package:analysis_server/src/protocol.dart'; |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 55 if (analysisServer != null) { | 55 if (analysisServer != null) { |
| 56 RequestError error = new RequestError( | 56 RequestError error = new RequestError( |
| 57 RequestErrorCode.SERVER_ALREADY_STARTED, | 57 RequestErrorCode.SERVER_ALREADY_STARTED, |
| 58 "Server already started"); | 58 "Server already started"); |
| 59 serverChannel.sendResponse(new Response('', error: error)); | 59 serverChannel.sendResponse(new Response('', error: error)); |
| 60 serverChannel.listen((Request request) { | 60 serverChannel.listen((Request request) { |
| 61 serverChannel.sendResponse(new Response(request.id, error: error)); | 61 serverChannel.sendResponse(new Response(request.id, error: error)); |
| 62 }); | 62 }); |
| 63 return; | 63 return; |
| 64 } | 64 } |
| 65 PhysicalResourceProvider resourceProvider = | 65 PhysicalResourceProvider resourceProvider; |
| 66 PhysicalResourceProvider.INSTANCE; | 66 if (analysisServerOptions.fileReadMode == 'normalize-eol') { |
| 67 resourceProvider = PhysicalResourceProvider.INSTANCE_NORMALIZE_EOL; | |
| 68 } else { | |
|
Paul Berry
2015/01/20 19:10:53
I would feel a lot more comfortable if we changed
jwren
2015/01/20 21:38:14
Done.
| |
| 69 resourceProvider = PhysicalResourceProvider.INSTANCE; | |
| 70 } | |
| 71 | |
| 67 analysisServer = new AnalysisServer( | 72 analysisServer = new AnalysisServer( |
| 68 serverChannel, | 73 serverChannel, |
| 69 resourceProvider, | 74 resourceProvider, |
| 70 new PubPackageMapProvider(resourceProvider, defaultSdk), | 75 new PubPackageMapProvider(resourceProvider, defaultSdk), |
| 71 _createIndex(), | 76 _createIndex(), |
| 72 analysisServerOptions, | 77 analysisServerOptions, |
| 73 defaultSdk, | 78 defaultSdk, |
| 74 instrumentationService, | 79 instrumentationService, |
| 75 rethrowExceptions: false); | 80 rethrowExceptions: false); |
| 76 _initializeHandlers(analysisServer); | 81 _initializeHandlers(analysisServer); |
| 77 } | 82 } |
| 78 | 83 |
| 79 /** | 84 /** |
| 80 * Initialize the handlers to be used by the given [server]. | 85 * Initialize the handlers to be used by the given [server]. |
| 81 */ | 86 */ |
| 82 void _initializeHandlers(AnalysisServer server) { | 87 void _initializeHandlers(AnalysisServer server) { |
| 83 server.handlers = serverPlugin.createDomains(server); | 88 server.handlers = serverPlugin.createDomains(server); |
| 84 } | 89 } |
| 85 } | 90 } |
| OLD | NEW |