merge cl for mobile support fixes and features in editor

editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/DartCore.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;
 
 import com.google.dart.engine.AnalysisEngine;
 import com.google.dart.engine.error.ErrorCode;
 import com.google.dart.engine.index.Index;
 import com.google.dart.engine.index.IndexFactory;
-import com.google.dart.engine.index.MemoryIndexStore;
+import com.google.dart.engine.index.IndexStore;
 import com.google.dart.engine.sdk.DirectoryBasedDartSdk;
 import com.google.dart.engine.utilities.instrumentation.Instrumentation;
 import com.google.dart.engine.utilities.instrumentation.InstrumentationBuilder;
 import com.google.dart.engine.utilities.logging.Logger;
 import com.google.dart.server.AnalysisServer;
 import com.google.dart.server.internal.remote.StdioServerSocket;
 import com.google.dart.tools.core.analysis.model.AnalysisServerData;
 import com.google.dart.tools.core.analysis.model.ProjectManager;
 import com.google.dart.tools.core.analysis.model.PubFolder;
 import com.google.dart.tools.core.internal.MessageConsoleImpl;
@@ skipping 14 matching lines @@
 import com.google.dart.tools.core.model.DartModel;
 import com.google.dart.tools.core.model.DartModelException;
 import com.google.dart.tools.core.model.DartProject;
 import com.google.dart.tools.core.model.DartSdkListener;
 import com.google.dart.tools.core.model.DartSdkManager;
 import com.google.dart.tools.core.utilities.general.StringUtilities;
 import com.google.dart.tools.core.utilities.io.FileUtilities;
 import com.google.dart.tools.core.utilities.performance.PerformanceManager;
 import com.google.dart.tools.core.utilities.yaml.PubYamlUtils;
 
+import org.apache.commons.lang3.StringUtils;
 import org.eclipse.core.resources.IContainer;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IFolder;
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IResourceVisitor;
 import org.eclipse.core.resources.IWorkspaceRoot;
 import org.eclipse.core.resources.ProjectScope;
 import org.eclipse.core.resources.ResourcesPlugin;
@@ skipping 13 matching lines @@
 import org.eclipse.core.runtime.preferences.InstanceScope;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.Version;
 import org.osgi.service.prefs.BackingStoreException;
 
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.io.PrintStream;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.lang.management.ManagementFactory;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Hashtable;
@@ skipping 68 matching lines @@
    * Eclipse problem marker type used to Angular warning markers
    */
   public static final String ANGULAR_WARNING_MARKER_TYPE = PLUGIN_ID + ".angular_warning";
 
   /**
    * Extension for single unit compiled into JavaScript.
    */
   public static final String EXTENSION_JS = "js";
 
   /**
+   * Preference for enabling Angular analysis.
+   */
+  public static final String ENABLE_ANGULAR_ANALYSIS_PREFERENCE = "enableAngularAnalysis";
+
+  /**
    * Preference for the automatically running pub.
    */
   public static final String PUB_AUTO_RUN_PREFERENCE = "pubAutoRun";
 
   /**
    * Preference for enabling hints.
    */
   public static final String ENABLE_HINTS_PREFERENCE = "enableHints";
 
   /**
@@ skipping 93 matching lines @@
    * Name of special pubspec lock file
    */
   public static final String PUBSPEC_LOCK_FILE_NAME = "pubspec.lock";
 
   /**
    * The name of the build.dart special file.
    */
   public static final String BUILD_DART_FILE_NAME = "build.dart";
 
   /**
+   * Used by the {@link DartDebugUserAgentManager} to indicate whether the 
+   * allow remote connection dialog is open.
+   */
+  public static boolean allowConnectionDialogOpen = false;
+
+  /**
    * The shared message console instance.
    */
   private static final MessageConsole CONSOLE = new MessageConsoleImpl();
 
   /**
    * The QualifiedName for a resource remapping (a.foo ==> a.bar).
    */
   private static final QualifiedName RESOURCE_REMAP_NAME = new QualifiedName(
       PLUGIN_ID,
       "resourceRemap");
@@ skipping 37 matching lines @@
    */
   private static WorkspaceAnalysisServerListener analysisServerListener = new WorkspaceAnalysisServerListener(
       analysisServerDataImpl);
 
   /**
    * Used to synchronize access to {@link #analysisServer}.
    */
   private static final Object analysisServerLock = new Object();
 
   /**
+   * The socket and process manager used by {@link #analysisServer}.
+   */
+  private static StdioServerSocket analysisServerSocket;
+
+  /**
    * Add the given listener for dart ignore changes to the Dart Model. Has no effect if an identical
    * listener is already registered.
    * 
    * @param listener the listener to add
    */
   public static void addIgnoreListener(DartIgnoreListener listener) {
     getProjectManager().getIgnoreManager().addListener(listener);
   }
 
   /**
@@ skipping 100 matching lines @@
    * Answer the unique {@link AnalysisServer} used for analysis of anything in the workspace.
    * 
    * @return the {@link AnalysisServer} (not {@code null})
    */
   @SuppressWarnings("restriction")
   public static AnalysisServer getAnalysisServer() {
     synchronized (analysisServerLock) {
       if (analysisServer == null) {
         // TODO(scheglov) remove local analysis server
 //        analysisServer = new com.google.dart.server.internal.local.LocalAnalysisServerImpl();
-        File sdkDirectory = DirectoryBasedDartSdk.getDefaultSdkDirectory();
-        if (sdkDirectory == null) {
+        DartSdkManager sdkManager = DartSdkManager.getManager();
+        if (!sdkManager.hasSdk()) {
           DartCore.logError("Add the dart sdk (com.google.dart.sdk) as a JVM argument");
           System.exit(1);
         }
         String svnRoot = System.getProperty("com.google.dart.svnRoot");
         if (svnRoot == null) {
           DartCore.logError("Add the dart svnRoot (com.google.dart.svnRoot) as a JVM argument");
           System.exit(1);
         }
-        String runtimePath = sdkDirectory.getAbsolutePath() + "/bin/dart";
+        String runtimePath = sdkManager.getSdk().getVmExecutable().getAbsolutePath();
         String analysisServerPath = svnRoot + "/pkg/analysis_server/bin/server.dart";
         try {
-          StdioServerSocket socket = new StdioServerSocket(runtimePath, analysisServerPath);
-          socket.start();
+          // prepare debug stream
+          PrintStream debugStream;
+          {
+            String logPath = DartCoreDebug.ANALYSIS_SERVER_LOG_FILE;
+            if (StringUtils.isBlank(logPath)) {
+              debugStream = null;
+            } else if ("console".equals(logPath)) {
+              debugStream = System.out;
+            } else {
+              debugStream = new PrintStream(logPath);
+            }
+          }
+          // start server
+          analysisServerSocket = new StdioServerSocket(runtimePath, analysisServerPath, debugStream);
+          analysisServerSocket.start();
           analysisServer = new com.google.dart.server.internal.remote.RemoteAnalysisServerImpl(
-              socket.getRequestSink(),
-              socket.getResponseStream());
+              analysisServerSocket.getRequestSink(),
+              analysisServerSocket.getResponseStream(),
+              analysisServerSocket.getErrorStream());
           analysisServerDataImpl.setServer(analysisServer);
           analysisServer.addAnalysisServerListener(analysisServerListener);
         } catch (Throwable e) {
           DartCore.logError("Enable to start stdio server", e);
           System.exit(1);
         }
       }
     }
     return analysisServer;
   }
@@ skipping 219 matching lines @@
    * Answer the unique project manager used for analysis of anything in the workspace.
    * 
    * @return the manager (not {@code null})
    */
   public static ProjectManager getProjectManager() {
     synchronized (projectManagerLock) {
       if (projectManager == null) {
         // start index
         final Index index;
         {
-          MemoryIndexStore indexStore = IndexFactory.newMemoryIndexStore();
+          File stateDir = getPlugin().getStateLocation().toFile();
+          File indexDir = new File(stateDir, "index");
+          indexDir.mkdirs();
+          IndexStore indexStore = IndexFactory.newFileIndexStore(indexDir);
           index = IndexFactory.newIndex(indexStore);
           Thread thread = new Thread() {
             @Override
             public void run() {
               index.run();
             }
           };
           thread.setName("Index Thread");
           thread.setDaemon(true);
           thread.start();
@@ skipping 881 matching lines @@
 
     return prefs;
   }
 
   public IEclipsePreferences getProjectPreferences(IProject project) {
     ProjectScope projectScope = new ProjectScope(project);
 
     return projectScope.getNode(PLUGIN_ID);
   }
 
+  public boolean isAngularAnalysisEnabled() {
+    return DartCore.getPlugin().getPrefs().getBoolean(ENABLE_ANGULAR_ANALYSIS_PREFERENCE, true);
+  }
+
   public boolean isAutoRunPubEnabled() {
     return DartCore.getPlugin().getPrefs().getBoolean(PUB_AUTO_RUN_PREFERENCE, true);
   }
 
   public boolean isHintsDart2JSEnabled() {
     return DartCore.getPlugin().getPrefs().getBoolean(ENABLE_HINTS_DART2JS_PREFERENCE, true);
   }
 
   public boolean isHintsEnabled() {
     return DartCore.getPlugin().getPrefs().getBoolean(ENABLE_HINTS_PREFERENCE, true);
@@ skipping 95 matching lines @@
   @Override
   public void stop(BundleContext context) throws Exception {
     DartSdkManager.getManager().removeSdkListener(this);
 
     try {
       getProjectManager().stop();
 
       synchronized (analysisServerLock) {
         if (analysisServer != null) {
           analysisServer.shutdown();
+          analysisServerSocket.stop();
         }
       }
 
       if (DartCoreDebug.METRICS) {
         StringWriter writer = new StringWriter();
         PerformanceManager.getInstance().printMetrics(new PrintWriter(writer));
         String metricsInfo = writer.toString();
         if (metricsInfo.length() > 0) {
           getLog().log(new Status(Status.INFO, PLUGIN_ID, metricsInfo, null));
         }
       }
     } finally {
       super.stop(context);
     }
   }
 }