Merge "HTMLForm: Handle HTMLFormFieldWithButton subclasses in OOUI forms"

diff --combined includes/htmlform/HTMLFormField.php
index b26b45d,6f2971b..1d9b255
--- 1/includes/htmlform/HTMLFormField.php
--- 2/includes/htmlform/HTMLFormField.php
+++ b/includes/htmlform/HTMLFormField.php
@@@ -49,7 -49,7 +49,7 @@@ abstract class HTMLFormField 
         * Defaults to false, which getOOUI will interpret as "use the HTML version"
         *
         * @param string $value
 -       * @return OOUI\Widget|false
 +       * @return OOUI\\Widget|false
         */
        function getInputOOUI( $value ) {
                return false;
@@@ -582,13 -582,14 +582,14 @@@
  
                $fieldType = get_class( $this );
                $helpText = $this->getHelpText();
-               $field = new OOUI\FieldLayout( $inputField, array(
+               $config = array(
                        'classes' => array( "mw-htmlform-field-$fieldType", $this->mClass, $errorClass ),
                        'align' => $this->getLabelAlignOOUI(),
                        'label' => $this->getLabel(),
                        'help' => $helpText !== null ? new OOUI\HtmlSnippet( $helpText ) : null,
                        'infusable' => $infusable,
-               ) );
+               );
+               $field = $this->getFieldLayoutOOUI( $inputField, $config );
  
                return $field . $errors;
        }
@@@ -601,6 -602,18 +602,18 @@@
                return 'top';
        }
  
+       /**
+        * Get a FieldLayout (or subclass thereof) to wrap this field in when using OOUI output.
+        * @return OOUI\FieldLayout|OOUI\ActionFieldLayout
+        */
+       protected function getFieldLayoutOOUI( $inputField, $config ) {
+               if ( isset( $this->mClassWithButton ) ) {
+                       $buttonWidget = $this->mClassWithButton->getInputOOUI( '' );
+                       return new OOUI\ActionFieldLayout( $inputField, $buttonWidget, $config );
+               }
+               return new OOUI\FieldLayout( $inputField, $config );
+       }
+ 
        /**
         * Get the complete raw fields for the input, including help text,
         * labels, and whatever.