Version 1.5.8

dart/editor/tools/plugins/com.google.dart.engine/src/com/google/dart/engine/internal/context/AnalysisContextImpl.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 600 matching lines @@
         LibraryElementImpl libraryElement = (LibraryElementImpl) sourceEntry.getValue(DartEntry.ELEMENT);
         if (libraryElement != null) {
           library.setLibraryElement(libraryElement);
         }
       }
       libraryMap.put(librarySource, library);
       return library;
     }
 
     /**
+     * Ensure that the given library has an element model built for it. If another task needs to be
+     * executed first in order to build the element model, that task is placed in {@link #taskData}.
+     * 
+     * @param library the library which needs an element model.
+     */
+    private void ensureElementModel(ResolvableLibrary library) {
+      Source librarySource = library.getLibrarySource();
+      DartEntry libraryEntry = getReadableDartEntry(librarySource);
+      if (libraryEntry != null && libraryEntry.getState(DartEntry.PARSED_UNIT) != CacheState.ERROR) {
+        workManager.addFirst(librarySource, SourcePriority.LIBRARY);
+        if (taskData == null) {
+          taskData = createResolveDartLibraryTask(librarySource, libraryEntry);
+        }
+      }
+    }
+
+    /**
      * Ensure that all of the libraries that are exported by the given library (but are not
-     * themselves in the cycle) have element models built for them.
+     * themselves in the cycle) have element models built for them. If another task needs to be
+     * executed first in order to build the element model, that task is placed in {@link #taskData}.
      * 
      * @param library the library being tested
      */
     private void ensureExports(ResolvableLibrary library, HashSet<Source> visitedLibraries) {
       ResolvableLibrary[] dependencies = library.getExports();
       int dependencyCount = dependencies.length;
       for (int i = 0; i < dependencyCount; i++) {
         ResolvableLibrary dependency = dependencies[i];
         if (!librariesInCycle.contains(dependency)
             && visitedLibraries.add(dependency.getLibrarySource())) {
           if (dependency.getLibraryElement() == null) {
-            Source dependencySource = dependency.getLibrarySource();
-            workManager.addFirst(dependencySource, SourcePriority.LIBRARY);
-            if (taskData == null) {
-              taskData = createResolveDartLibraryTask(
-                  dependencySource,
-                  getReadableDartEntry(dependencySource));
-              return;
-            }
+            ensureElementModel(dependency);
           } else {
             ensureExports(dependency, visitedLibraries);
-            if (taskData != null) {
-              return;
-            }
+          }
+          if (taskData != null) {
+            return;
           }
         }
       }
     }
 
     /**
      * Ensure that all of the libraries that are exported by the given library (but are not
-     * themselves in the cycle) have element models built for them.
+     * themselves in the cycle) have element models built for them. If another task needs to be
+     * executed first in order to build the element model, that task is placed in {@link #taskData}.
      * 
      * @param library the library being tested
-     * @throws MissingDataException if there is at least one library being depended on that does not
-     *           have an element model built for it
      */
     private void ensureImports(ResolvableLibrary library) {
       ResolvableLibrary[] dependencies = library.getImports();
       int dependencyCount = dependencies.length;
       for (int i = 0; i < dependencyCount; i++) {
         ResolvableLibrary dependency = dependencies[i];
         if (!librariesInCycle.contains(dependency) && dependency.getLibraryElement() == null) {
-          Source dependencySource = dependency.getLibrarySource();
-          workManager.addFirst(dependencySource, SourcePriority.LIBRARY);
-          if (taskData == null) {
-            taskData = createResolveDartLibraryTask(
-                dependencySource,
-                getReadableDartEntry(dependencySource));
+          ensureElementModel(dependency);
+          if (taskData != null) {
             return;
           }
         }
       }
     }
 
     /**
      * Ensure that all of the libraries that are either imported or exported by libraries in the
      * cycle (but are not themselves in the cycle) have element models built for them.
      */
@@ skipping 5115 matching lines @@
       writer.println(" missing sources");
       for (Source source : missingSources) {
         writer.print("    ");
         writer.println(source.getFullName());
       }
       logInformation(writer.toString());
     }
     return changedSources.size() > 0;
   }
 }