MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Yann Cebron
2011-10-12 21:30:05 +02:00
parent 9d7f265465 4b055c9a48
commit 3f43227d74
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/nix/idea.sh
+10 -3
View File
@@ -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"`
platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
+2 -2
View File
@@ -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);