Merge 07316ff9b094ffda8a33cbdc1f8930a8126f3f48 into e9f1b5825a9d37ca0c173a7b2830ba36a27ca9e0

crates/typst-library/src/foundations/symbol.rs

@@ -7,6 +7,7 @@ use ecow::{EcoString, eco_format};
 use serde::{Serialize, Serializer};
 use typst_syntax::{Span, Spanned, is_ident};
 use typst_utils::hash128;
+use unicode_segmentation::UnicodeSegmentation;
 
 use crate::diag::{DeprecationSink, SourceResult, StrResult, bail, error};
 use crate::foundations::{
@@ -237,12 +238,11 @@ impl Symbol {
         'variants: for (i, &Spanned { ref v, span }) in variants.iter().enumerate() {
             modifiers.clear();
 
-            if v.1.is_empty() {
+            if v.1.is_empty() || v.1.graphemes(true).nth(1).is_some() {
-                errors.push(if v.0.is_empty() {
+                errors.push(error!(
-                    error!(span, "empty default variant")
+                    span, "invalid variant value: {}", v.1.repr();
-                } else {
+                    hint: "variant value must be exactly one grapheme cluster"
-                    error!(span, "empty variant: {}", v.0.repr())
+                ));
-                });
             }
 
             if !v.0.is_empty() {

tests/suite/symbols/symbol.typ

@@ -88,14 +88,26 @@
   ("variant.duplicate", "y"),
 )
 
---- symbol-constructor-empty-variant ---
+--- symbol-constructor-empty-variant-value ---
-// Error: 2:3-2:5 empty default variant
+// Error: 2:3-2:5 invalid variant value: ""
-// Error: 3:3-3:16 empty variant: "empty"
+// Hint: 2:3-2:5 variant value must be exactly one grapheme cluster
+// Error: 3:3-3:16 invalid variant value: ""
+// Hint: 3:3-3:16 variant value must be exactly one grapheme cluster
 #symbol(
   "",
   ("empty", "")
 )
 
+--- symbol-constructor-multi-cluster-variant-value ---
+// Error: 2:3-2:7 invalid variant value: "aa"
+// Hint: 2:3-2:7 variant value must be exactly one grapheme cluster
+// Error: 3:3-3:14 invalid variant value: "bb"
+// Hint: 3:3-3:14 variant value must be exactly one grapheme cluster
+#symbol(
+  "aa",
+  ("b", "bb")
+)
+
 --- symbol-unknown-modifier ---
 // Error: 13-20 unknown symbol modifier
 #emoji.face.garbage