Issue 3752. Support for @override annotations (as structured doc comments)

editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/utilities/compiler/DartCompilerUtilities.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.utilities.compiler;
 
+import com.google.common.collect.Sets;
 import com.google.dart.compiler.CommandLineOptions.CompilerOptions;
 import com.google.dart.compiler.CompilerConfiguration;
 import com.google.dart.compiler.DartArtifactProvider;
 import com.google.dart.compiler.DartCompilationError;
 import com.google.dart.compiler.DartCompiler;
 import com.google.dart.compiler.DartCompilerListener;
 import com.google.dart.compiler.DartSource;
 import com.google.dart.compiler.DefaultCompilerConfiguration;
 import com.google.dart.compiler.LibrarySource;
 import com.google.dart.compiler.Source;
 import com.google.dart.compiler.SourceDelta;
 import com.google.dart.compiler.SystemLibraryManager;
 import com.google.dart.compiler.ast.DartNode;
 import com.google.dart.compiler.ast.DartUnit;
 import com.google.dart.compiler.ast.LibraryUnit;
-import com.google.dart.compiler.parser.CommentPreservingParser;
 import com.google.dart.compiler.parser.DartParser;
 import com.google.dart.compiler.resolver.LibraryElement;
 import com.google.dart.compiler.util.DartSourceString;
 import com.google.dart.tools.core.DartCore;
 import com.google.dart.tools.core.analysis.AnalysisServer;
 import com.google.dart.tools.core.internal.builder.LocalArtifactProvider;
 import com.google.dart.tools.core.internal.builder.RootArtifactProvider;
 import com.google.dart.tools.core.internal.cache.LRUCache;
 import com.google.dart.tools.core.internal.model.CompilationUnitImpl;
 import com.google.dart.tools.core.internal.model.DartLibraryImpl;
@@ skipping 351 matching lines @@
       this.source = source;
       this.preserveComments = preserveComments;
     }
 
     @Override
     public void run() throws Exception {
       result = secureParseUnit(createParser(), sourceRef);
     }
 
     private DartParser createParser() {
-      if (preserveComments) {
-        return new CommentPreservingParser(CommentPreservingParser.createContext(
-            sourceRef,
-            source,
-            this), false);
-      } else {
-        return new DartParser(sourceRef, source, this);
-      }
+      return new DartParser(sourceRef, source, false, Sets.<String> newHashSet(), this, null);
     }
   }
 
   /**
    * Internal class for safely calling the
    * {@link DartCompiler#analyzeLibrary(LibrarySource, Map, CompilerConfiguration, DartArtifactProvider, DartCompilerListener)}
    * , recording compilation errors, and capturing any parser exception.
    */
   private static final class ResolverRunnable extends CompilerRunner {
     private LibrarySource librarySource;
@@ skipping 455 matching lines @@
       performanceListener.compileComplete(start, libSource.getName());
     }
   }
 
   /**
    * A synchronized call to {@link DartParser#parseUnit(DartSource)}
    */
   public static DartUnit secureParseUnit(DartParser parser, DartSource sourceRef) {
     // All calls to DartC must be synchronized
     synchronized (compilerLock) {
-      return parser.parseUnit(sourceRef);
+      return parser.parseUnit();
     }
   }
 
   public static void setPerformanceListener(PerformanceListener performanceListener) {
     DartCompilerUtilities.performanceListener = performanceListener;
   }
 
   private static Map<URI, DartUnit> createMap(Collection<DartUnit> suppliedUnits) {
     if (suppliedUnits == null || suppliedUnits.isEmpty()) {
       return null;
@@ skipping 48 matching lines @@
     } else if (secondScheme == null || !firstScheme.equals(secondScheme)) {
       return false;
     } else if (SystemLibraryManager.isDartUri(firstUri)
         || SystemLibraryManager.isDartUri(secondUri)) {
       return URIUtilities.safelyResolveDartUri(firstUri).equals(
           URIUtilities.safelyResolveDartUri(secondUri));
     }
     return URIUtil.toPath(firstUri).equals(URIUtil.toPath(secondUri));
   }
 }