ENGCOM-1780: [Backport] Fixed typo error #15648

Author: Stanislav Idolov

app/code/Magento/Config/Block/System/Config/Form.php

@@ -366,15 +366,6 @@ protected function _initElement(
                 $data = $this->getConfigValue($path);
             }
         }
-        $fieldRendererClass = $field->getFrontendModel();
-        if ($fieldRendererClass) {
-            $fieldRenderer = $this->_layout->getBlockSingleton($fieldRendererClass);
-        } else {
-            $fieldRenderer = $this->_fieldRenderer;
-        }
-
-        $fieldRenderer->setForm($this);
-        $fieldRenderer->setConfigData($this->_configData);
 
         $elementName = $this->_generateElementName($field->getPath(), $fieldPrefix);
         $elementId = $this->_generateElementId($field->getPath($fieldPrefix));
@@ -420,7 +411,7 @@ protected function _initElement(
         if ($field->hasOptions()) {
             $formField->setValues($field->getOptions());
         }
-        $formField->setRenderer($fieldRenderer);
+        $formField->setRenderer($this->resolveFieldRenderer($field));
     }
 
     /**
@@ -791,4 +782,23 @@ private function getAppConfigDataValue($path)
         }
         return $data->getData($path);
     }
+
+    /**
+     * @param \Magento\Config\Model\Config\Structure\Element\Field $field
+     * @return Form\Field|\Magento\Framework\View\Element\BlockInterface
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function resolveFieldRenderer(\Magento\Config\Model\Config\Structure\Element\Field $field)
+    {
+        $fieldRendererClass = $field->getFrontendModel();
+        if ($fieldRendererClass) {
+            $fieldRenderer = $this->_layout->getBlockSingleton($fieldRendererClass);
+        } else {
+            $fieldRenderer = $this->_fieldRenderer;
+        }
+
+        $fieldRenderer->setForm($this);
+        $fieldRenderer->setConfigData($this->_configData);
+        return $fieldRenderer;
+    }
 }