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

defer actual checking for encoding conversion availability to fix IDEA-169554 Encoding popup takes too long to appear

Browse Source
This commit is contained in:
Alexey Kudravtsev
2017-03-14 14:37:58 +03:00
parent 0f33ad1f7b
commit cd9ecc98d0
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/vfs/encoding/ChooseFileEncodingAction.java
+11 -3
View File
@@ -31,6 +31,7 @@ import com.intellij.openapi.project.DumbAwareAction;
import com.intellij.openapi.vfs.CharsetToolkit;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.Function;
import com.intellij.util.ui.EmptyIcon;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -57,11 +58,18 @@ public abstract class ChooseFileEncodingAction extends ComboBoxAction {
@NotNull List<Charset> charsets,
@NotNull final Function<Charset, String> charsetFilter) {
for (final Charset charset : charsets) {
String description = charsetFilter.fun(charset);
AnAction action = new DumbAwareAction(charset.displayName(), description, description == null ? AllIcons.General.Warning : null) {
AnAction action = new DumbAwareAction(charset.displayName(), null, EmptyIcon.ICON_16) {
@Override
public void actionPerformed(AnActionEvent e) {
ChooseFileEncodingAction.this.chosen(virtualFile, charset);
chosen(virtualFile, charset);
}
@Override
public void update(AnActionEvent e) {
super.update(e);
String description = charsetFilter.fun(charset);
e.getPresentation().setIcon(description == null ? AllIcons.General.Warning : null);
e.getPresentation().setDescription(description);
}
};
group.add(action);