fix: not all character is two width

swc-project · Feb 7, 2025 · f13a01f · f13a01f
1 parent a1b6682
commit f13a01f
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/crates/swc_common/src/syntax_pos.rs b/crates/swc_common/src/syntax_pos.rs
@@ -700,7 +700,7 @@ pub enum NonNarrowChar {
     /// Represents a zero-width character
     ZeroWidth(BytePos),
     /// Represents a wide (fullwidth) character
-    Wide(BytePos),
+    Wide(BytePos, usize),
     /// Represents a tab character, represented visually with a width of 4
     /// characters
     Tab(BytePos),
@@ -710,24 +710,23 @@ impl NonNarrowChar {
     fn new(pos: BytePos, width: usize) -> Self {
         match width {
             0 => NonNarrowChar::ZeroWidth(pos),
-            2 => NonNarrowChar::Wide(pos),
             4 => NonNarrowChar::Tab(pos),
-            _ => panic!("width {} given for non-narrow character", width),
+            w => NonNarrowChar::Wide(pos, w),
         }
     }
 
     /// Returns the absolute offset of the character in the SourceMap
     pub fn pos(self) -> BytePos {
         match self {
-            NonNarrowChar::ZeroWidth(p) | NonNarrowChar::Wide(p) | NonNarrowChar::Tab(p) => p,
+            NonNarrowChar::ZeroWidth(p) | NonNarrowChar::Wide(p, _) | NonNarrowChar::Tab(p) => p,
         }
     }
 
     /// Returns the width of the character, 0 (zero-width) or 2 (wide)
     pub fn width(self) -> usize {
         match self {
             NonNarrowChar::ZeroWidth(_) => 0,
-            NonNarrowChar::Wide(_) => 2,
+            NonNarrowChar::Wide(_, width) => width,
             NonNarrowChar::Tab(_) => 4,
         }
     }
@@ -739,7 +738,7 @@ impl Add<BytePos> for NonNarrowChar {
     fn add(self, rhs: BytePos) -> Self {
         match self {
             NonNarrowChar::ZeroWidth(pos) => NonNarrowChar::ZeroWidth(pos + rhs),
-            NonNarrowChar::Wide(pos) => NonNarrowChar::Wide(pos + rhs),
+            NonNarrowChar::Wide(pos, width) => NonNarrowChar::Wide(pos + rhs, width),
             NonNarrowChar::Tab(pos) => NonNarrowChar::Tab(pos + rhs),
         }
     }
@@ -751,7 +750,7 @@ impl Sub<BytePos> for NonNarrowChar {
     fn sub(self, rhs: BytePos) -> Self {
         match self {
             NonNarrowChar::ZeroWidth(pos) => NonNarrowChar::ZeroWidth(pos - rhs),
-            NonNarrowChar::Wide(pos) => NonNarrowChar::Wide(pos - rhs),
+            NonNarrowChar::Wide(pos, width) => NonNarrowChar::Wide(pos - rhs, width),
             NonNarrowChar::Tab(pos) => NonNarrowChar::Tab(pos - rhs),
         }
     }