Merge remote-tracking branch 'origin/master'

jps/jps-builders/testSrc/org/jetbrains/jps/builders/BuildResult.java

@@ -15,6 +15,7 @@
  */
 package org.jetbrains.jps.builders;
 
+import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.Function;
@@ -93,7 +94,8 @@ public class BuildResult implements MessageHandler {
         for (String output : outputs) {
           hashCodeToOutputPath.put(FileUtil.pathHashCode(output), output);
         }
-        stream.println(" " + source + " -> " + StringUtil.join(outputs, ","));
+        String sourceToCompare = SystemInfo.isFileSystemCaseSensitive ? source.toLowerCase(Locale.US) : source;
+        stream.println(" " + sourceToCompare + " -> " + StringUtil.join(outputs, ","));
       }
       stream.println("End Of SourceToOutput (target " + getTargetIdWithTypeId(target) + ")");
     }

platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTree.java

@@ -43,6 +43,7 @@ import com.intellij.xdebugger.evaluation.XDebuggerEditorsProvider;
 import com.intellij.xdebugger.frame.XDebuggerTreeNodeHyperlink;
 import com.intellij.xdebugger.impl.actions.XDebuggerActions;
 import com.intellij.xdebugger.impl.frame.XValueMarkers;
+import com.intellij.xdebugger.impl.ui.DebuggerUIUtil;
 import com.intellij.xdebugger.impl.ui.tree.nodes.*;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -321,7 +322,7 @@ public class XDebuggerTree extends DnDAwareTree implements DataProvider, Disposa
     if (PlatformDataKeys.PREDEFINED_TEXT.is(dataId)) {
       XValueNodeImpl[] selectedNodes = getSelectedNodes(XValueNodeImpl.class, null);
       if (selectedNodes.length == 1 && selectedNodes[0].getFullValueEvaluator() == null) {
-        return selectedNodes[0].getRawValue();
+        return DebuggerUIUtil.getNodeRawValue(selectedNodes[0]);
       }
     }
     return null;

plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenEnvironmentForm.java

@@ -105,6 +105,8 @@ public class MavenEnvironmentForm implements PanelWithAnchor {
         }
       });
 
+    mavenHomeField.addDocumentListener(listener);
+
     setAnchor(mavenHomeComponent.getLabel());
   }