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 branch 'master' of git.labs.intellij.net:idea/community

Browse Source
This commit is contained in:
sweinreuter
2011-03-10 20:15:26 +01:00
parent a2c05ea573 33ab18dd96
commit 2b0c51e5aa
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionProgressIndicator.java
+5 -3
View File
@@ -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();
platform/lang-impl/src/com/intellij/semantic/SemServiceImpl.java
+1 -1
View File
@@ -114,7 +114,7 @@ public class SemServiceImpl extends SemService{
}
});
for (final SemKey each : result.keySet()) {
final List<SemKey> inheritors = new ArrayList<SemKey>(result.get(each));
final List<SemKey> inheritors = new ArrayList<SemKey>(new HashSet<SemKey>(result.get(each)));
Collections.sort(inheritors, KEY_COMPARATOR);
result.put(each, inheritors);
}
resources-en/src/intentionDescriptions/ConvertToBasicLatinAction/description.html
+1 -1
View File
@@ -1,5 +1,5 @@
<html>
<body>
This intention replaces non-Basic Latin characters in literals and comments with unicode entities.
<font face="verdana" size="-1">This intention replaces non-Basic Latin characters in literals and comments with unicode entities.</font>
</body>
</html>