From 5bed7c72e314459b7aa29c4f1d7c1f19c0145bef Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 10 Mar 2011 15:09:31 +0100 Subject: [PATCH 1/3] reword the ctrl+arrows hint, don't show it for one-line editors --- .../completion/CompletionProgressIndicator.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java index b3990a318c77..65f67f5484ab 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java @@ -155,9 +155,11 @@ public class CompletionProgressIndicator extends ProgressIndicatorBase implement CompletionContributor.getActionShortcut(IdeActions.ACTION_CHOOSE_LOOKUP_ITEM_REPLACE) + " to choose the first suggestion"); } - myLookup.addAdvertisement(CompletionContributor.getActionShortcut(IdeActions.ACTION_LOOKUP_DOWN) + " and " + - CompletionContributor.getActionShortcut(IdeActions.ACTION_LOOKUP_UP) + - " will move caret down and up"); + if (!myEditor.isOneLineMode()) { + myLookup.addAdvertisement(CompletionContributor.getActionShortcut(IdeActions.ACTION_LOOKUP_DOWN) + " and " + + CompletionContributor.getActionShortcut(IdeActions.ACTION_LOOKUP_UP) + + " will move caret down and up in the editor"); + } } ProgressManager.checkCanceled(); From 904d060b3090be8f6b9b202759cfba9e912d251c Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 10 Mar 2011 17:50:14 +0100 Subject: [PATCH 2/3] kill duplicate keys --- .../lang-impl/src/com/intellij/semantic/SemServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/semantic/SemServiceImpl.java b/platform/lang-impl/src/com/intellij/semantic/SemServiceImpl.java index a8cd9df6d03c..909dbaa4ce47 100644 --- a/platform/lang-impl/src/com/intellij/semantic/SemServiceImpl.java +++ b/platform/lang-impl/src/com/intellij/semantic/SemServiceImpl.java @@ -114,7 +114,7 @@ public class SemServiceImpl extends SemService{ } }); for (final SemKey each : result.keySet()) { - final List inheritors = new ArrayList(result.get(each)); + final List inheritors = new ArrayList(new HashSet(result.get(each))); Collections.sort(inheritors, KEY_COMPARATOR); result.put(each, inheritors); } From 33ab18dd96745e785f46dba19d0c7274b13af6eb Mon Sep 17 00:00:00 2001 From: Yann Cebron Date: Thu, 10 Mar 2011 20:05:39 +0100 Subject: [PATCH 3/3] ConvertToBasicLatinAction intention description font fix --- .../ConvertToBasicLatinAction/description.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources-en/src/intentionDescriptions/ConvertToBasicLatinAction/description.html b/resources-en/src/intentionDescriptions/ConvertToBasicLatinAction/description.html index e1c738c93812..154d168fafce 100644 --- a/resources-en/src/intentionDescriptions/ConvertToBasicLatinAction/description.html +++ b/resources-en/src/intentionDescriptions/ConvertToBasicLatinAction/description.html @@ -1,5 +1,5 @@ -This intention replaces non-Basic Latin characters in literals and comments with unicode entities. +This intention replaces non-Basic Latin characters in literals and comments with unicode entities.