From 94ca851cc985df54349038b0b5da614f834d9ccb Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Tue, 13 Jun 2017 10:37:35 +0300
Subject: [PATCH] move exception handling from outside write action

---
 .../GenerateToStringActionHandlerImpl.java         | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/plugins/generate-tostring/src/org/jetbrains/java/generate/GenerateToStringActionHandlerImpl.java b/plugins/generate-tostring/src/org/jetbrains/java/generate/GenerateToStringActionHandlerImpl.java
index 771bf72b69fb..0f792c1d74c6 100644
--- a/plugins/generate-tostring/src/org/jetbrains/java/generate/GenerateToStringActionHandlerImpl.java
+++ b/plugins/generate-tostring/src/org/jetbrains/java/generate/GenerateToStringActionHandlerImpl.java
@@ -120,14 +120,12 @@ public class GenerateToStringActionHandlerImpl implements GenerateToStringAction
                 final GenerateToStringWorker worker = new GenerateToStringWorker(clazz, editor, chooser.isInsertOverrideAnnotation());
                 // decide what to do if the method already exists
                 ConflictResolutionPolicy resolutionPolicy = worker.exitsMethodDialog(template);
-                WriteAction.run(() -> {
-                    try {
-                        worker.execute(selectedMembers, template, resolutionPolicy);
-                    }
-                    catch (Exception e) {
-                        GenerationUtil.handleException(project, e);
-                    }
-                });
+                try {
+                    WriteAction.run(() -> worker.execute(selectedMembers, template, resolutionPolicy));
+                }
+                catch (Exception e) {
+                    GenerationUtil.handleException(project, e);
+                }
             }
             else {
                 HintManager.getInstance().showErrorHint(editor, "toString() template '" + template.getFileName() + "' is invalid");