IDEA-132454 "Clear Read-Only Status" dialog displayed twice on cancel

This commit is contained in:
peter
2014-11-07 12:58:02 +01:00
parent 8dd5ec461d
commit ca6951a3bc
@@ -59,18 +59,19 @@ public class LookupTypedHandler extends TypedActionHandlerBase {
@Override
public void execute(@NotNull Editor originalEditor, char charTyped, @NotNull DataContext dataContext) {
final Project project = CommonDataKeys.PROJECT.getData(dataContext);
PsiFile file;
PsiFile file = project == null ? null : PsiUtilBase.getPsiFileInEditor(originalEditor, project);
if (project == null
|| (file = PsiUtilBase.getPsiFileInEditor(originalEditor, project)) == null
|| !CodeInsightUtilBase.prepareEditorForWrite(originalEditor)
|| !FileDocumentManager.getInstance().requestWriting(originalEditor.getDocument(), project)) {
if (file == null) {
if (myOriginalHandler != null){
myOriginalHandler.execute(originalEditor, charTyped, dataContext);
}
return;
}
if (!CodeInsightUtilBase.prepareEditorForWrite(originalEditor) || !FileDocumentManager.getInstance().requestWriting(originalEditor.getDocument(), project)) {
return;
}
CompletionPhase oldPhase = CompletionServiceImpl.getCompletionPhase();
if (oldPhase instanceof CompletionPhase.CommittingDocuments && ((CompletionPhase.CommittingDocuments)oldPhase).isRestartingCompletion()) {
assert oldPhase.indicator != null;