Merge r36248 into trunk.

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

 /*
  * Copyright (c) 2012, the Dart project authors.
  * 
  * Licensed under the Eclipse Public License v1.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
  * 
  * http://www.eclipse.org/legal/epl-v10.html
  * 
  * Unless required by applicable law or agreed to in writing, software distributed under the License
  * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
@@ skipping 98 matching lines @@
     }
   }
 
   /**
    * Answer the Eclipse resource associated with the specified file or <code>null</code> if none
    */
   public static IResource getResource(File file) {
     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];
+    }
   }
 
   /**
    * Return the resource associated with the given URI, or <code>null</code> if the URI does not
    * correspond to an existing resource.
    * 
    * @param uri the URI representing the resource to be returned
    * @return the resource associated with the given URI
    */
   public static IResource getResource(URI uri) {
@@ skipping 110 matching lines @@
         }
       }
       return resourceMap;
     }
   }
 
   // No instances
   private ResourceUtil() {
   }
 }