| 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 context.directory.manager; | 5 library context.directory.manager; |
| 6 | 6 |
| 7 import 'dart:async'; | 7 import 'dart:async'; |
| 8 import 'dart:collection'; | 8 import 'dart:collection'; |
| 9 import 'dart:convert'; | 9 import 'dart:convert'; |
| 10 import 'dart:core' hide Resource; | 10 import 'dart:core' hide Resource; |
| (...skipping 820 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 831 if (pathContext.basename(packagespecFile.path) == PACKAGE_SPEC_NAME) { | 831 if (pathContext.basename(packagespecFile.path) == PACKAGE_SPEC_NAME) { |
| 832 Packages packages = _readPackagespec(packagespecFile); | 832 Packages packages = _readPackagespec(packagespecFile); |
| 833 return new PackagesFileDisposition(packages); | 833 return new PackagesFileDisposition(packages); |
| 834 } | 834 } |
| 835 if (packageResolverProvider != null) { | 835 if (packageResolverProvider != null) { |
| 836 UriResolver resolver = packageResolverProvider(folder); | 836 UriResolver resolver = packageResolverProvider(folder); |
| 837 if (resolver != null) { | 837 if (resolver != null) { |
| 838 return new CustomPackageResolverDisposition(resolver); | 838 return new CustomPackageResolverDisposition(resolver); |
| 839 } | 839 } |
| 840 } | 840 } |
| 841 | 841 |
| 842 // Notify server that no `.packages` file was found (and there is no | |
| 843 // alternative resolver provider). | |
| 844 // | |
| 845 // NOTE that this is a temporary measure and will be replaced with | |
| 846 // a proper call to diagnostics when support is there. | |
| 847 // https://github.com/dart-lang/sdk/issues/24900 | |
| 848 AnalysisEngine.instance.logger.logError( | |
| 849 'No `.packages` for $folder, falling back to `pub`.'); | |
| 850 | |
| 851 ServerPerformanceStatistics.pub.makeCurrentWhile(() { | 842 ServerPerformanceStatistics.pub.makeCurrentWhile(() { |
| 852 packageMapInfo = _packageMapProvider.computePackageMap(folder); | 843 packageMapInfo = _packageMapProvider.computePackageMap(folder); |
| 853 }); | 844 }); |
| 854 } finally { | 845 } finally { |
| 855 callbacks.endComputePackageMap(); | 846 callbacks.endComputePackageMap(); |
| 856 } | 847 } |
| 857 for (String dependencyPath in packageMapInfo.dependencies) { | 848 for (String dependencyPath in packageMapInfo.dependencies) { |
| 858 addDependency(dependencyPath); | 849 addDependency(dependencyPath); |
| 859 } | 850 } |
| 860 if (packageMapInfo.packageMap == null) { | 851 if (packageMapInfo.packageMap == null) { |
| (...skipping 603 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1464 var path = resourceProvider.pathContext.fromUri(uri); | 1455 var path = resourceProvider.pathContext.fromUri(uri); |
| 1465 packageMap[name] = <Folder>[resourceProvider.getFolder(path)]; | 1456 packageMap[name] = <Folder>[resourceProvider.getFolder(path)]; |
| 1466 } | 1457 } |
| 1467 }); | 1458 }); |
| 1468 return <UriResolver>[new SdkExtUriResolver(packageMap)]; | 1459 return <UriResolver>[new SdkExtUriResolver(packageMap)]; |
| 1469 } else { | 1460 } else { |
| 1470 return const <UriResolver>[]; | 1461 return const <UriResolver>[]; |
| 1471 } | 1462 } |
| 1472 } | 1463 } |
| 1473 } | 1464 } |
| OLD | NEW |