Merge branch 'master' of git@git.labs.intellij.net:idea/community

platform/platform-impl/src/com/intellij/ide/CommandLineProcessor.java

@@ -17,6 +17,7 @@ package com.intellij.ide;
 
 import com.intellij.ide.highlighter.ProjectFileType;
 import com.intellij.ide.impl.ProjectUtil;
+import com.intellij.idea.StartupUtil;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.fileEditor.OpenFileDescriptor;
 import com.intellij.openapi.project.Project;
@@ -122,6 +123,9 @@ public class CommandLineProcessor {
     int line = -1;
     for (int i = 0, argsSize = args.size(); i < argsSize; i++) {
       String arg = args.get(i);
+      if (arg.equals(StartupUtil.NOSPLASH)) {
+        continue;
+      }
       if (arg.equals("-l") || arg.equals("--line")) {
         //noinspection AssignmentToForLoopParameter
         i++;

platform/platform-impl/src/com/intellij/idea/StartupUtil.java

@@ -37,6 +37,8 @@ public class StartupUtil {
   static SocketLock ourLock;
   private static String myDefaultLAF;
 
+  @NonNls public static final String NOSPLASH = "nosplash";
+
   private StartupUtil() {
   }
 
@@ -49,7 +51,7 @@ public class StartupUtil {
   }
 
   public static boolean shouldShowSplash(final String[] args) {
-    @NonNls final String nosplashCode = "nosplash";
+    @NonNls final String nosplashCode = NOSPLASH;
     return !Arrays.asList(args).contains(nosplashCode);
   }