From fd8c1e5eee47bc5c376a2e7ba2a34a3b006bf161 Mon Sep 17 00:00:00 2001 From: peter Date: Wed, 12 Oct 2011 20:27:59 +0200 Subject: [PATCH 1/2] correct common prefix case for case-insensitive items --- .../src/com/intellij/codeInsight/lookup/impl/LookupImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java index 2e566f311c0c..cd35ff8e93b8 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java @@ -1086,13 +1086,13 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable final PrefixMatcher firstItemMatcher = itemMatcher(firstItem); final String oldPrefix = firstItemMatcher.getPrefix(); final String presentPrefix = oldPrefix + myAdditionalPrefix; - String commonPrefix = firstItem.getLookupString(); + String commonPrefix = handleCaseInsensitiveVariant(itemMatcher(firstItem).getPrefix(), firstItem.getLookupString()); for (int i = 1; i < listModel.getSize(); i++) { LookupElement item = (LookupElement)listModel.getElementAt(i); if (!oldPrefix.equals(itemMatcher(item).getPrefix())) return false; - final String lookupString = item.getLookupString(); + final String lookupString = handleCaseInsensitiveVariant(itemMatcher(item).getPrefix(), item.getLookupString()); final int length = Math.min(commonPrefix.length(), lookupString.length()); if (length < commonPrefix.length()) { commonPrefix = commonPrefix.substring(0, length); From 4b055c9a48db60399256755ac74b61d0cdac3ba5 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Wed, 12 Oct 2011 21:00:43 +0200 Subject: [PATCH 2/2] IDEA-75407 (recognize Mac JDK 1.7 preview release) --- bin/nix/idea.sh | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/bin/nix/idea.sh b/bin/nix/idea.sh index 18d98a1f40ba..3a16ccb56aa0 100755 --- a/bin/nix/idea.sh +++ b/bin/nix/idea.sh @@ -23,9 +23,16 @@ if [ -z "$JDK" ]; then JAVA_BIN_PATH=`which java` if [ -n "$JAVA_BIN_PATH" ]; then if [ "$OS_TYPE" = "MAC" ]; then - JAVA_LOCATION=`readlink "$JAVA_BIN_PATH" | xargs dirname | xargs dirname | xargs dirname` - if [ -x "$JAVA_LOCATION/CurrentJDK/Home/bin/java" ]; then - JDK="$JAVA_LOCATION/CurrentJDK/Home" + if [ -h "$JAVA_BIN_PATH" ] ; then + JAVA_LOCATION=`readlink "$JAVA_BIN_PATH" | xargs dirname | xargs dirname | xargs dirname` + if [ -x "$JAVA_LOCATION/CurrentJDK/Home/bin/java" ]; then + JDK="$JAVA_LOCATION/CurrentJDK/Home" + fi + else + JAVA_LOCATION=`echo "$JAVA_BIN_PATH" | xargs dirname | xargs dirname` + if [ -f "$JAVA_LOCATION/lib/tools.jar" ]; then + JDK="$JAVA_LOCATION" + fi fi else JAVA_LOCATION=`readlink -f "$JAVA_BIN_PATH"`