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

Unified Diff: editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/refresh/DartPackagesFolderMatcher.java

Issue 11364134: Merge libv1. (Closed) Base URL: https://dart.googlecode.com/svn/experimental/lib_v2/dart
Patch Set: Reupload due to error Created 8 years, 1 month 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: editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/refresh/DartPackagesFolderMatcher.java
diff --git a/editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/refresh/DartPackagesFolderMatcher.java b/editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/refresh/DartPackagesFolderMatcher.java
index f5a2db30b9982e46813767eb3d871966db570458..27859c3a4f92dbb913754937be33134eaf09216f 100644
--- a/editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/refresh/DartPackagesFolderMatcher.java
+++ b/editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/refresh/DartPackagesFolderMatcher.java
@@ -42,7 +42,17 @@ public class DartPackagesFolderMatcher extends AbstractFileInfoMatcher {
@Override
public boolean matches(IContainer parent, IFileInfo fileInfo) throws CoreException {
- // Check that the folder's name is "packages".
+
+ // suppress self link
+ if (parent.getParent() != null
+ && parent.getParent().getName().equals(DartCore.PACKAGES_DIRECTORY_NAME)) {
+ if (DartCore.isSelfLinkedResource(parent.getProject(), parent)) {
+ return true;
+ }
+ return false;
+ }
+
+ // Check that the folder's name is "packages"
if (!parent.getName().equals(DartCore.PACKAGES_DIRECTORY_NAME)) {
return false;
}

Powered by Google App Engine
This is Rietveld 408576698