From 60ffee3ad71043b665959570a9795b36c7a10a11 Mon Sep 17 00:00:00 2001 From: nik Date: Thu, 12 Feb 2015 11:52:24 +0300 Subject: [PATCH 1/3] external build tests: use case-insensitive comparison of source-to-output mapping for case-insensitive OS --- .../testSrc/org/jetbrains/jps/builders/BuildResult.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jps/jps-builders/testSrc/org/jetbrains/jps/builders/BuildResult.java b/jps/jps-builders/testSrc/org/jetbrains/jps/builders/BuildResult.java index 84dcedf39359..c319bac6da9b 100644 --- a/jps/jps-builders/testSrc/org/jetbrains/jps/builders/BuildResult.java +++ b/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) + ")"); } From 96ce6be8e1a65c311950f8013609910cc4e449ae Mon Sep 17 00:00:00 2001 From: "Egor.Ushakov" Date: Thu, 12 Feb 2015 12:12:17 +0300 Subject: [PATCH 2/3] Use debugger variable value as a default text in search in path - fix for toString renderer --- .../src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTree.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTree.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTree.java index 097ca988e74f..c7b70a061318 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/XDebuggerTree.java +++ b/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; From daa1e1ce79a74ae451ee63e42cc86ed017eb449a Mon Sep 17 00:00:00 2001 From: "Vladislav.Soroka" Date: Thu, 12 Feb 2015 12:22:01 +0300 Subject: [PATCH 3/3] IDEA-136307 Maven: Settings: Local repository field is not updated on changing Maven home directory --- .../org/jetbrains/idea/maven/project/MavenEnvironmentForm.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenEnvironmentForm.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenEnvironmentForm.java index 07f021beb927..a372f257b1a1 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenEnvironmentForm.java +++ b/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()); }