Merge r36248 into trunk.

editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/util/ResourceUtil.java

Index: editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/util/ResourceUtil.java
diff --git a/editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/util/ResourceUtil.java b/editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/util/ResourceUtil.java
index 680fb6592e139f73d61f5c58224f1c56e61ea561..205138c15b499d0701af1351c7bab1e598767e62 100644
--- a/editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/util/ResourceUtil.java
+++ b/editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/util/ResourceUtil.java
@@ -116,7 +116,16 @@ public class ResourceUtil {
     if (file == null) {
       return null;
     }
-    return getResource(getCanonicalUri(file));
+    if (file.isDirectory()) {
+      return getResource(getCanonicalUri(file));
+    } else {
+      IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
+      IFile[] files = workspaceRoot.findFilesForLocationURI(file.toURI());
+      if (files.length == 0) {
+        return null;
+      }
+      return files[0];
+    }
   }
 
   /**