From 88fa8916bd39ca1f2da4632ede3504cd541a8e1b Mon Sep 17 00:00:00 2001 From: "Denis.Zhdanov" Date: Wed, 21 Nov 2012 16:48:11 +0400 Subject: [PATCH] [by: irina] IDEA-94950 Code Style | Arrangement: AIOOBE at ArrangementMatchingRulesModel.removeRow() on removing the last rule that is in edit mode --- .../match/ArrangementMatchingRulesControl.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/match/ArrangementMatchingRulesControl.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/match/ArrangementMatchingRulesControl.java index 91db060e8122..2a57392e52e8 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/match/ArrangementMatchingRulesControl.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/match/ArrangementMatchingRulesControl.java @@ -41,6 +41,7 @@ import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; +import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; import java.awt.*; import java.awt.event.MouseAdapter; @@ -281,6 +282,13 @@ public class ArrangementMatchingRulesControl extends JBTable { if (myEditorRow < 0) { return; } + if (isEditing()) { + TableCellEditor editor = getCellEditor(); + if (editor != null) { + editor.stopCellEditing(); + } + } + mySkipSelectionChange = true; try { ArrangementMatchingRulesModel model = getModel();