pass library files not directories to analysis server

editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/index/impl/InMemoryIndex.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
  * or implied. See the License for the specific language governing permissions and limitations under
  * the License.
  */
 package com.google.dart.tools.core.internal.index.impl;
 
 import com.google.dart.compiler.DartSource;
 import com.google.dart.compiler.LibrarySource;
 import com.google.dart.compiler.SystemLibraryManager;
 import com.google.dart.compiler.ast.DartUnit;
-import com.google.dart.compiler.ast.LibraryUnit;
 import com.google.dart.tools.core.DartCore;
 import com.google.dart.tools.core.DartCoreDebug;
 import com.google.dart.tools.core.analysis.AnalysisServer;
 import com.google.dart.tools.core.analysis.ResolveCallback;
 import com.google.dart.tools.core.analysis.SavedContext;
 import com.google.dart.tools.core.index.Attribute;
 import com.google.dart.tools.core.index.AttributeCallback;
 import com.google.dart.tools.core.index.Element;
 import com.google.dart.tools.core.index.Index;
 import com.google.dart.tools.core.index.NotifyCallback;
@@ skipping 33 matching lines @@
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
-import java.util.HashSet;
 
 /**
  * The unique instance of the class <code>InMemoryIndex</code> maintains an in-memory {@link Index
  * index}. The index is expected to be initialized once before it is used in any given session and
  * shut down at the end of the session. The index will be read from disk when it is initialized and
  * written to disk when it is shut down.
  */
 public class InMemoryIndex implements Index {
   /**
    * The index store used to hold the data in the index.
@@ skipping 379 matching lines @@
    * Initialize this index with information from the user libraries.
    */
   private boolean indexUserLibraries() {
     boolean librariesIndexed = true;
     try {
       AnalysisServer analysisServer = SystemLibraryManagerProvider.getDefaultAnalysisServer();
       SavedContext savedContext = analysisServer.getSavedContext();
       DartModel model = DartCore.create(ResourcesPlugin.getWorkspace().getRoot());
       for (DartProject project : model.getDartProjects()) {
         for (DartLibrary library : project.getDartLibraries()) {
-          IResource libraryResource = library.getResource();
+          CompilationUnit compilationUnit = library.getDefiningCompilationUnit();
+          if (compilationUnit == null) {
+            continue;
+          }
+          IResource libraryResource = compilationUnit.getResource();
           if (libraryResource == null) {
             continue;
           }
           IPath libraryLocation = libraryResource.getLocation();
           if (libraryLocation == null) {
             continue;
           }
           File libraryFile = libraryLocation.toFile();
           ResolveCallback.Sync callback = new ResolveCallback.Sync();
           savedContext.resolve(libraryFile, callback);
           // Block until library is resolved so that we know it has been indexed
           callback.waitForResolve(5 * 60 * 1000); // Five minutes
         }
       }
     } catch (Exception exception) {
       librariesIndexed = false;
       DartCore.logError("Could not index user libraries", exception);
     }
     return librariesIndexed;
   }
 
   /**
-   * Initialize this index with information from the given user library.
-   * 
-   * @param libraryUnit the library to be used to initialize the index
-   * @param initializedLibraries the URI's of libraries that have already been used to initialize
-   *          the index
-   */
-  private void indexUserLibrary(LibraryUnit libraryUnit, HashSet<URI> initializedLibraries) {
-    LibrarySource librarySource = libraryUnit.getSource();
-    URI libraryUri = librarySource.getUri();
-    if (SystemLibraryManager.isDartUri(libraryUri) || initializedLibraries.contains(libraryUri)) {
-      return;
-    }
-    initializedLibraries.add(libraryUri);
-    DartLibraryImpl library = new DartLibraryImpl(librarySource);
-    for (DartUnit ast : libraryUnit.getUnits()) {
-      DartSource unitSource = (DartSource) ast.getSourceInfo().getSource();
-      URI unitUri = unitSource.getUri();
-      Resource resource = new Resource(unitUri.toString());
-      CompilationUnit compilationUnit = new CompilationUnitImpl(
-          library,
-          unitUri,
-          DefaultWorkingCopyOwner.getInstance());
-      // library.getCompilationUnit(unitUri);
-      long startTime = System.currentTimeMillis();
-      indexResource(resource, compilationUnit, ast);
-      long endTime = System.currentTimeMillis();
-      initIndexingTime += endTime - startTime;
-    }
-    for (LibraryUnit importedLibrary : libraryUnit.getImportedLibraries()) {
-      // library.getImportedLibrary(importedLibrary.getSource().getUri());
-      indexUserLibrary(importedLibrary, initializedLibraries);
-    }
-  }
-
-  /**
    * Initialize this index to contain information about the bundled libraries. The index store is
    * expected to have been cleared before invoking this method.
    * 
    * @return {@code true} if the bundled libraries were successfully indexed
    */
   private boolean initializeBundledLibraries() {
     synchronized (indexStore) {
       hasBeenInitialized = true;
       if (!initializeIndexFrom(getInitialIndexFile())) {
         indexStore.clear();
@@ skipping 129 matching lines @@
       }
     }
     if (!successfullyWritten) {
       if (!indexFile.delete()) {
         DartCore.logError("Could not delete corrupted index file: \"" + indexFile.getAbsolutePath()
             + "\"");
       }
     }
   }
 }