Merge remote-tracking branch 'origin/master'

bin/scripts/unix/idea.sh

@@ -136,7 +136,10 @@ if [ -n "$@@product_uc@@_PROPERTIES" ]; then
   IDE_PROPERTIES_PROPERTY="-Didea.properties.file=$@@product_uc@@_PROPERTIES"
 fi
 
-vm_options_file="$OS_SPECIFIC_BIN_DIR/@@vm_options@@$BITS.vmoptions"
+vm_options_file="$IDE_BIN_HOME/@@vm_options@@$BITS.vmoptions"
+if [ ! -r "$vm_options_file" ]; then
+  vm_options_file="$OS_SPECIFIC_BIN_DIR/@@vm_options@@$BITS.vmoptions"
+fi
 user_vm_options_file="$HOME/.@@system_selector@@/@@vm_options@@$BITS.vmoptions"
 if [ -r "$user_vm_options_file" ]; then
   vm_options_file="$user_vm_options_file"
@@ -184,6 +187,5 @@ LD_LIBRARY_PATH="$IDE_BIN_HOME:$LD_LIBRARY_PATH" "$JDK/jre/bin/java" \
   com.intellij.idea.Main \
   "$@"
 EC=$?
-exit $EC
-# test $EC -ne 88 && exit $EC
-# exec "$0" "$@"
+test $EC -ne 88 && exit $EC
+exec "$0" "$@"

platform/lang-impl/src/com/intellij/execution/TestStateStorage.java

@@ -94,7 +94,7 @@ public class TestStateStorage extends AbstractProjectComponent{
     }
   }
 
-  public void writeState(String testUrl, Record record) {
+  public void writeState(@NotNull String testUrl, Record record) {
     if (myMap == null) return;
     try {
       myMap.put(testUrl, record);

platform/platform-impl/src/com/intellij/openapi/editor/impl/SoftWrapModelImpl.java

@@ -658,7 +658,6 @@ public class SoftWrapModelImpl implements SoftWrapModelEx, PrioritizedInternalDo
     myApplianceManager.reset();
     myStorage.removeAll();
     myDeferredFoldRegions.clear();
-    myEditor.getScrollingModel().scrollToCaret(ScrollType.CENTER);
     myApplianceManager.recalculateIfNecessary();
   }
 

platform/platform-resources/src/idea/PlatformActions.xml

@@ -363,7 +363,7 @@
       </group>
 
       <!-- Tools -->
-      <group id="ToolsMenu" configurable="true" popup="true" compact="true">
+      <group id="ToolsMenu" popup="true" compact="true">
         <action id="PsiViewer" class="com.intellij.internal.psiView.PsiViewerAction"/>
         <action id="PsiViewerForContext" class="com.intellij.internal.psiView.PsiViewerForContextAction"/>
         <separator/>
@@ -474,7 +474,7 @@
       <group id="OtherMenu" class="com.intellij.ide.actions.NonEmptyActionGroup"/>
     </group>
 
-    <group id="MainToolBar" configurable="true">
+    <group id="MainToolBar">
       <reference ref="OpenFile"/>
       <reference ref="SaveAll"/>
       <reference ref="Synchronize"/>
@@ -499,7 +499,7 @@
 
     <group id="NavBarVcsGroup"/>
 
-    <group id="EditorPopupMenu" configurable="true">
+    <group id="EditorPopupMenu">
       <reference ref="$Cut"/>
       <reference ref="$Copy"/>
       <reference ref="$Paste"/>

platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTestRunnerResultsForm.java

@@ -828,8 +828,8 @@ public class SMTestRunnerResultsForm extends TestResultsPanel
       TestStateStorage storage = TestStateStorage.getInstance(getProject());
       List<SMTestProxy> tests = myRoot.getAllTests();
       for (SMTestProxy proxy : tests) {
-        if (proxy.isLeaf()) {
-          String url = proxy.getLocationUrl();
+        String url = proxy.getLocationUrl();
+        if (proxy.isLeaf() && url != null) {
           storage.writeState(url, new TestStateStorage.Record(proxy.getMagnitude(), new Date()));
         }
       }

platform/testFramework/src/com/intellij/testFramework/fixtures/CodeInsightTestFixture.java

@@ -472,9 +472,9 @@ public interface CodeInsightTestFixture extends IdeaProjectTestFixture {
   Document getDocument(@NotNull PsiFile file);
 
   @NotNull
-  Collection<GutterMark> findAllGutters(@NotNull @TestDataFile String filePath);
+  List<GutterMark> findAllGutters(@NotNull @TestDataFile String filePath);
 
-  Collection<GutterMark> findAllGutters();
+  List<GutterMark> findAllGutters();
 
   void type(final char c);
 

platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java

@@ -1136,14 +1136,14 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig
 
   @Override
   @NotNull
-  public Collection<GutterMark> findAllGutters(@NotNull final String filePath) {
+  public List<GutterMark> findAllGutters(@NotNull final String filePath) {
     configureByFilesInner(filePath);
     return findAllGutters();
   }
 
   @Override
   @NotNull
-  public Collection<GutterMark> findAllGutters() {
+  public List<GutterMark> findAllGutters() {
     final Project project = getProject();
     final SortedMap<Integer, List<GutterMark>> result = new TreeMap<Integer, List<GutterMark>>();