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

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

Issue 1278823002: Fix PathFilter constructor to be backward compatible with analyzer 0.26.0. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 4 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 | « no previous file | pkg/analyzer/lib/source/path_filter.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analysis_server/lib/src/context_manager.dart
diff --git a/pkg/analysis_server/lib/src/context_manager.dart b/pkg/analysis_server/lib/src/context_manager.dart
index 551f3812639e1585202cc48fc6f6f3fa7ab7389d..5088ae180ddf5d0b2f5fbfe4c0c4b2263de61543 100644
--- a/pkg/analysis_server/lib/src/context_manager.dart
+++ b/pkg/analysis_server/lib/src/context_manager.dart
@@ -94,7 +94,7 @@ class ContextInfo {
: contextManager = contextManager,
folder = folder,
pathFilter = new PathFilter(
- contextManager.resourceProvider.pathContext, folder.path, null) {
+ folder.path, null, contextManager.resourceProvider.pathContext) {
packageDescriptionPath = packagespecFile.path;
parent.children.add(this);
}
@@ -311,7 +311,8 @@ class ContextManagerImpl implements ContextManager {
* Temporary flag to hide WIP .packages support (DEP 5).
*/
static bool ENABLE_PACKAGESPEC_SUPPORT = serverOptions.isSet(
- 'ContextManagerImpl.ENABLE_PACKAGESPEC_SUPPORT', defaultValue: true);
+ 'ContextManagerImpl.ENABLE_PACKAGESPEC_SUPPORT',
+ defaultValue: true);
/**
* The name of the `lib` directory.
@@ -997,14 +998,14 @@ class ContextManagerImpl implements ContextManager {
// Check to see if we need to create a new context.
if (info.isTopLevel) {
-
// Only create a new context if this is not the same directory
// described by our info object.
if (info.folder.path != directoryPath) {
if (_isPubspec(path)) {
// Check for a sibling .packages file.
- if (!resourceProvider.getFile(
- pathos.join(directoryPath, PACKAGE_SPEC_NAME)).exists) {
+ if (!resourceProvider
+ .getFile(pathos.join(directoryPath, PACKAGE_SPEC_NAME))
+ .exists) {
_extractContext(info, resource);
return;
}
@@ -1012,7 +1013,8 @@ class ContextManagerImpl implements ContextManager {
if (_isPackagespec(path)) {
// Check for a sibling pubspec.yaml file.
if (!resourceProvider
- .getFile(pathos.join(directoryPath, PUBSPEC_NAME)).exists) {
+ .getFile(pathos.join(directoryPath, PUBSPEC_NAME))
+ .exists) {
_extractContext(info, resource);
return;
}
@@ -1056,8 +1058,9 @@ class ContextManagerImpl implements ContextManager {
if (info.folder.path == directoryPath) {
if (_isPubspec(path)) {
// Check for a sibling .packages file.
- if (!resourceProvider.getFile(
- pathos.join(directoryPath, PACKAGE_SPEC_NAME)).exists) {
+ if (!resourceProvider
+ .getFile(pathos.join(directoryPath, PACKAGE_SPEC_NAME))
+ .exists) {
_mergeContext(info);
return;
}
@@ -1065,7 +1068,8 @@ class ContextManagerImpl implements ContextManager {
if (_isPackagespec(path)) {
// Check for a sibling pubspec.yaml file.
if (!resourceProvider
- .getFile(pathos.join(directoryPath, PUBSPEC_NAME)).exists) {
+ .getFile(pathos.join(directoryPath, PUBSPEC_NAME))
+ .exists) {
_mergeContext(info);
return;
}
@@ -1227,7 +1231,8 @@ class ContextsChangedEvent {
/**
* Initialize a newly created event to indicate which contexts have changed.
*/
- ContextsChangedEvent({this.added: AnalysisContext.EMPTY_LIST,
+ ContextsChangedEvent(
+ {this.added: AnalysisContext.EMPTY_LIST,
this.changed: AnalysisContext.EMPTY_LIST,
this.removed: AnalysisContext.EMPTY_LIST});
}
@@ -1252,7 +1257,8 @@ class CustomPackageResolverDisposition extends FolderDisposition {
@override
Iterable<UriResolver> createPackageUriResolvers(
- ResourceProvider resourceProvider) => <UriResolver>[resolver];
+ ResourceProvider resourceProvider) =>
+ <UriResolver>[resolver];
}
/**
@@ -1310,7 +1316,8 @@ class NoPackageFolderDisposition extends FolderDisposition {
@override
Iterable<UriResolver> createPackageUriResolvers(
- ResourceProvider resourceProvider) => const <UriResolver>[];
+ ResourceProvider resourceProvider) =>
+ const <UriResolver>[];
}
/**
@@ -1349,5 +1356,6 @@ class PackagesFileDisposition extends FolderDisposition {
@override
Iterable<UriResolver> createPackageUriResolvers(
- ResourceProvider resourceProvider) => const <UriResolver>[];
+ ResourceProvider resourceProvider) =>
+ const <UriResolver>[];
}
« no previous file with comments | « no previous file | pkg/analyzer/lib/source/path_filter.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698