Fixed a bug when pinyin formatter removed all characters that didn't match valid syllables

Author: caseyryan

CHANGELOG.md

@@ -1,3 +1,5 @@
+## [2.9.9]
+- Fixed a bug when pinyin formatter removed all characters that didn't match valid syllables
 ## [2.9.7]
 - Fixed a period at the end if mantissa length is 0 https://github.com/caseyryan/flutter_multi_formatter/issues/106
 ## [2.9.6]

example/lib/pages/pinyin_formatter_page.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_multi_formatter/flutter_multi_formatter.dart';
-import 'package:flutter_multi_formatter/utils/pinyin_utils.dart';
 
 class PinyinFormatterPage extends StatelessWidget {
   const PinyinFormatterPage({
@@ -9,8 +8,6 @@ class PinyinFormatterPage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    final result = PinyinUtils.splitToSyllablesBySeparator('xingh');
-    print(result);
     return Unfocuser(
       child: Scaffold(
         appBar: AppBar(
@@ -27,6 +24,7 @@ class PinyinFormatterPage extends StatelessWidget {
                 ),
                 SizedBox(height: 12.0),
                 TextFormField(
+                  autocorrect: false,
                   decoration: InputDecoration(
                     border: const OutlineInputBorder(),
                     hintText: 'Enter pinyin phrase',

example/pubspec.lock

@@ -96,7 +96,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "2.9.7"
+    version: "2.9.8"
   flutter_test:
     dependency: "direct dev"
     description: flutter

lib/formatters/phone_input_formatter.dart

@@ -216,8 +216,10 @@ class PhoneInputFormatter extends TextInputFormatter {
         existingList.add(m);
       });
     }
-    print('Alternative masks for country "${countryData['country']}"' +
-        ' is now ${countryData['altMasks']}');
+    // if (kDebugMode) {
+    //   print('Alternative masks for country "${countryData['country']}"' +
+    //       ' is now ${countryData['altMasks']}');
+    // }
   }
 
   /// Replaces an existing phone mask for the given country

lib/formatters/pinyin_formatter.dart

@@ -8,7 +8,13 @@ class PinyinFormatter implements TextInputFormatter {
   static final RegExp _apostropheRegexp = RegExp('\'');
   static final RegExp _badApostrophes = RegExp(r"[’']+");
 
-  const PinyinFormatter();
+  final String? replacementForSpace;
+
+  /// [replacementForSpace] in case you need to replace
+  /// a space with something, just pass it here
+  const PinyinFormatter({
+    this.replacementForSpace,
+  });
 
   int _countSeparators(String value) {
     return _apostropheRegexp.allMatches(value).length;
@@ -22,13 +28,18 @@ class PinyinFormatter implements TextInputFormatter {
     final numOldSeparatos = _countSeparators(
       oldValue.text,
     );
+    String initialText = newValue.text;
     String newText = newValue.text.replaceAll(_badApostrophes, '');
+    if (replacementForSpace != null) {
+      initialText = initialText.replaceAll(' ', replacementForSpace!);
+      newText = newText.replaceAll(' ', replacementForSpace!);
+    }
     final syllables = PinyinUtils.splitToSyllables<SyllableData>(
-      newValue.text.trim(),
+      newText.trim(),
     );
     newText = syllables.map((e) => e.value).join('\'');
     if (newText.isEmpty) {
-      newText = newValue.text;
+      newText = initialText;
     }
     if (newText.endsWith('\'')) {
       newText = newText.removeLast();

lib/utils/pinyin_utils.dart

@@ -34,6 +34,9 @@ class SyllableData {
 }
 
 class PinyinUtils {
+  static const String UNICODE_SQUARE = '⬜';
+
+  static final RegExp _unstarredTextRegexp = RegExp(r'[^*]+');
   static final RegExp _punctuationRegex = RegExp(r"['!?.\[\],，。？！；：（ ）【 】［］]");
   static const _allSyllables = [
     "zhuang",
@@ -646,6 +649,7 @@ class PinyinUtils {
       value,
       allPossibleSentences: allPossibleSentences,
     );
+    // print(allPossibleSentences);
     if (allPossibleSentences.isNotEmpty) {
       _Sentence? sentence;
       // print(allPossibleSentences);
@@ -902,10 +906,8 @@ class _Sentence {
       if (start < 0) {
         continue;
       }
-      temp = temp.replaceFirst(
-        syl,
-        _getFiller(syl),
-      );
+      final filler = _getFiller(syl);
+      temp = temp.replaceFirst(syl, filler);
       final realSyllable = initialValue.substring(
         start,
         end,
@@ -922,6 +924,24 @@ class _Sentence {
         ),
       );
     }
+    print(temp);
+    final unstarred = PinyinUtils._unstarredTextRegexp;
+
+    /// заменяет оставшиеся символы, которые не совпали с валидными слогами
+    final matches = unstarred.allMatches(temp);
+    for (var m in matches) {
+      final text = temp.substring(m.start, m.end);
+      _correctSequence!.add(
+        SyllableData(
+          value: text,
+          tone: -1,
+          isValid: false,
+          start: m.start,
+          end: m.end,
+        ),
+      );
+    }
+
     const invalidTone = -1;
     _correctSequence!.sort((a, b) => a.start.compareTo(b.start));
     final wrongSyllables = <SyllableData>[];

pubspec.yaml

@@ -1,6 +1,6 @@
 name: flutter_multi_formatter
 description: A package of formatters for international phone numbers, credit / debit cards and a masked formatter
-version: 2.9.7
+version: 2.9.8
 homepage: https://github.com/caseyryan/flutter_multi_formatter
 
 environment: