From aa0c19fe12f64c1bf960b3f645de5c5e83347407 Mon Sep 17 00:00:00 2001
From: "Gregory.Shrago" <gregory.shrago@jetbrains.com>
Date: Wed, 24 Apr 2019 21:25:36 +0300
Subject: [PATCH] IDEA-211444 incorrect variants in drop-down for WrapOnTyping
 option

GitOrigin-RevId: 0d083004e7ec94612ef40eda23a6f1eb3db337b9
---
 .../application/options/codeStyle/MarginOptionsUtil.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/MarginOptionsUtil.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/MarginOptionsUtil.java
index 850087404054..a00905356ef0 100644
--- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/MarginOptionsUtil.java
+++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/MarginOptionsUtil.java
@@ -44,14 +44,15 @@ class MarginOptionsUtil {
   }
 
   static void customizeWrapOnTypingCombo(@NotNull JComboBox<String> wrapOnTypingCombo, @NotNull CodeStyleSettings settings) {
-    wrapOnTypingCombo.setRenderer(SimpleListCellRenderer.create((label, value, index) -> {
+    wrapOnTypingCombo.setRenderer(SimpleListCellRenderer.create("", value -> {
       for (int i = 0; i < CodeStyleSettingsCustomizable.WRAP_ON_TYPING_VALUES.length; i++) {
         if (CodeStyleSettingsCustomizable.WRAP_ON_TYPING_VALUES[i] == CommonCodeStyleSettings.WrapOnTyping.DEFAULT.intValue) {
           if (CodeStyleSettingsCustomizable.WRAP_ON_TYPING_OPTIONS[i].equals(value)) {
-            label.setText(getDefaultWrapOnTypingText(settings));
+            return getDefaultWrapOnTypingText(settings);
           }
         }
       }
+      return value;
     }));
   }