Add setting to re-enable @shadow on a separate line

Author: Earthcomputer

src/main/kotlin/MinecraftConfigurable.kt

@@ -84,6 +84,13 @@ class MinecraftConfigurable : Configurable {
             }
         }
 
+        group(MCDevBundle("minecraft.settings.mixin")) {
+            row {
+                checkBox(MCDevBundle("minecraft.settings.mixin.shadow_annotation_same_line"))
+                    .bindSelected(settings::isShadowAnnotationsSameLine)
+            }
+        }
+
         onApply {
             for (project in ProjectManager.getInstance().openProjects) {
                 ProjectView.getInstance(project).refresh()

src/main/kotlin/MinecraftSettings.kt

@@ -35,6 +35,8 @@ class MinecraftSettings : PersistentStateComponent<MinecraftSettings.State> {
         var isShowChatColorGutterIcons: Boolean = true,
         var isShowChatColorUnderlines: Boolean = false,
         var underlineType: UnderlineType = UnderlineType.DOTTED,
+
+        var isShadowAnnotationsSameLine: Boolean = true,
     )
 
     private var state = State()
@@ -78,6 +80,12 @@ class MinecraftSettings : PersistentStateComponent<MinecraftSettings.State> {
             state.underlineType = underlineType
         }
 
+    var isShadowAnnotationsSameLine: Boolean
+        get() = state.isShadowAnnotationsSameLine
+        set(shadowAnnotationsSameLine) {
+            state.isShadowAnnotationsSameLine = shadowAnnotationsSameLine
+        }
+
     enum class UnderlineType(private val regular: String, val effectType: EffectType) {
 
         NORMAL("Normal", EffectType.LINE_UNDERSCORE),

src/main/kotlin/platform/mixin/action/GenerateShadowAction.kt

@@ -20,6 +20,7 @@
 
 package com.demonwav.mcdev.platform.mixin.action
 
+import com.demonwav.mcdev.MinecraftSettings
 import com.demonwav.mcdev.platform.mixin.util.MixinConstants
 import com.demonwav.mcdev.platform.mixin.util.findFields
 import com.demonwav.mcdev.platform.mixin.util.findMethods
@@ -236,6 +237,11 @@ private fun copyAnnotation(modifiers: PsiModifierList, newModifiers: PsiModifier
 }
 
 inline fun disableAnnotationWrapping(project: Project, func: () -> Unit) {
+    if (!MinecraftSettings.instance.isShadowAnnotationsSameLine) {
+        func()
+        return
+    }
+
     val settings = CodeStyle.getSettings(project).getCommonSettings(JavaLanguage.INSTANCE)
     val methodWrap = settings.METHOD_ANNOTATION_WRAP
     val fieldWrap = settings.FIELD_ANNOTATION_WRAP

src/main/resources/messages/MinecraftDevelopment.properties

@@ -190,3 +190,5 @@ minecraft.settings.show_event_listener_gutter_icons=Show event listener gutter i
 minecraft.settings.show_chat_color_gutter_icons=Show chat color gutter icons
 minecraft.settings.show_chat_color_underlines=Show chat color underlines
 minecraft.settings.chat_color_underline_style=Chat color underline style:
+minecraft.settings.mixin=Mixin
+minecraft.settings.mixin.shadow_annotation_same_line=@Shadow annotations on same line