Fix prefix and suffix tokens

src/Plugin/DsFieldTemplate/Expert.php

@@ -239,22 +239,21 @@ class Expert extends DsFieldTemplateBase {
         $field_settings[$wrapper_key . '-cl'] = !(empty($values[$wrapper_key . '-cl'])) ? $values[$wrapper_key . '-cl'] : '';
         // Default Classes.
         if (in_array($wrapper_key, ['ow', 'lb'])) {
-          $field_settings[$wrapper_key . '-def-cl'] = !(empty($values[$wrapper_key . '-def-cl'])) ? TRUE : FALSE;
+          $field_settings[$wrapper_key . '-def-cl'] = !(empty($values[$wrapper_key . '-def-cl']));
         }
         // Attributes.
         $field_settings[$wrapper_key . '-at'] = !(empty($values[$wrapper_key . '-at'])) ? $values[$wrapper_key . '-at'] : '';
         // Default attributes.
-        $field_settings[$wrapper_key . '-def-at'] = !(empty($values[$wrapper_key . '-def-at'])) ? TRUE : FALSE;
-        // Token replacement.
+        $field_settings[$wrapper_key . '-def-at'] = !(empty($values[$wrapper_key . '-def-at']));
+
+        // Token replacement for the wrappers.
         /* @var \Drupal\Core\Entity\EntityInterface $entity */
         if ($entity = $this->getEntity()) {
           // Tokens.
           $apply_to = [
-            'prefix',
             $wrapper_key . '-el',
             $wrapper_key . '-cl',
             $wrapper_key . '-at',
-            'suffix',
           ];
 
           foreach ($apply_to as $identifier) {
@@ -264,7 +263,9 @@ class Expert extends DsFieldTemplateBase {
                 [$entity->getEntityTypeId() => $entity],
                 [
                   'clear' => TRUE,
-                  'langcode' => \Drupal::languageManager()->getCurrentLanguage(LanguageInterface::TYPE_CONTENT)->getId()
+                  'langcode' => \Drupal::languageManager()
+                    ->getCurrentLanguage(LanguageInterface::TYPE_CONTENT)
+                    ->getId()
                 ]
               );
             }
@@ -272,6 +273,29 @@ class Expert extends DsFieldTemplateBase {
         }
       }
     }
+
+    // Token replacement for the prefix and suffix.
+    /* @var \Drupal\Core\Entity\EntityInterface $entity */
+    if ($entity = $this->getEntity()) {
+      $apply_to = [
+        'prefix',
+        'suffix',
+      ];
+      foreach ($apply_to as $identifier) {
+        if (!empty($field_settings[$identifier])) {
+          $field_settings[$identifier] = \Drupal::token()->replace(
+            $field_settings[$identifier],
+            [$entity->getEntityTypeId() => $entity],
+            [
+              'clear' => TRUE,
+              'langcode' => \Drupal::languageManager()
+                ->getCurrentLanguage(LanguageInterface::TYPE_CONTENT)
+                ->getId()
+            ]
+          );
+        }
+      }
+    }
   }
 
 }