flet-code-editor-dsl 0.3.1__tar.gz → 0.3.2__tar.gz

{flet_code_editor_dsl-0.3.1/src/flet_code_editor_dsl.egg-info → flet_code_editor_dsl-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flet-code-editor-dsl
-Version: 0.3.1
+Version: 0.3.2
 Summary: Flet code editors with syntax highlighting: EditorTokens (tokenizer) and EditorRegex (regex)
 Author-email: obgwew <obgwew@gmail.com>
 License-Expression: Apache-2.0
@@ -25,7 +25,7 @@ Dynamic: license-file
 ## Table of Contents
 
 1. [Overview](#overview)
-2. [What's New in 0.3.0 / Migration](#whats-new-in-030--migration)
+2. [What's New in 0.3.2 / Migration](#whats-new-in-032--migration)
 3. [Features](#features)
 4. [Requirements](#requirements)
 5. [Installation](#installation)
@@ -97,9 +97,9 @@ lang = ce.Language(
 
 and hand `lang.to_json()` to `EditorTokens`.
 
-## What's New in 0.3.0 / Migration
+## What's New in 0.3.2 / Migration
 
-### 0.3.0
+### 0.3.2
 
 | Change | Details |
 |--------|---------|
@@ -109,6 +109,8 @@ and hand `lang.to_json()` to `EditorTokens`.
 | **Touch support** | New selection menu at the caret/handles, optional toolbar and cursor pad, magnifier, `scroll_mode`. See [Mobile / Touch Features](#mobile--touch-features). |
 | **Paste fix** | Cut/copy/paste from the new menu/toolbar read the clipboard directly and normalize line endings and control characters before inserting. |
 | **New Dart files** | `regex_highlighter.dart` (regex engine). `code_editor.dart` is now shared by both controls. The old `src/flet_code_editor_dsl.dart` (`CodeField` widget) was deleted. |
+| **Number literals** | `0b…` now accepts only `0`/`1` and `0o…` only `0`–`7` (before, they accepted any hex digit, so `0b1010f` was one number). `0x…` is unchanged. |
+| **Sigils** | If the longest matching prefix has no name after it, shorter prefixes are tried next (for example `$$` and `$` defined together: a lone `$$ ` now falls back to `$`). |
 
 Rename in your code:
 
@@ -120,11 +122,11 @@ ce.FletCodeField(rules=[...])             ce.EditorRegex(rules=[...])
 
 Because the Dart side changed, **rebuild your app** after upgrading.
 
-### 0.2.0 (from the original `CodeEditor` API)
+### Migrating from the original `CodeEditor` API
 
 The earlier regex-based `CodeEditor` control and its `rule()` / `group()` / `pair()` helpers no longer exist.
 
-| Original API | 0.2.0+ |
+| Original API | 0.3.2 |
 |-------|-------|
 | Control `CodeEditor` | `EditorTokens` (tokenizer) and `EditorRegex` (regex) |
 | `rule()`, `group()` + `rules_json()` | `Language(words=[WordGroup(...)], strings=..., ...)` + `Language.to_json()`; `HighlightRule` list for `EditorRegex` |
@@ -178,17 +180,17 @@ version = "1.0.0"
 requires-python = ">=3.10"
 dependencies = [
   "flet>=0.85.2",
-  "flet-code-editor-dsl>=0.3.0",
+  "flet-code-editor-dsl>=0.3.2",
 ]
 ```
 
-Pin an exact version for reproducible builds: `"flet-code-editor-dsl==0.3.0"`. Upgrade with `pip install --upgrade flet-code-editor-dsl`.
+Pin an exact version for reproducible builds: `"flet-code-editor-dsl==0.3.2"`. Upgrade with `pip install --upgrade flet-code-editor-dsl`.
 
 ### Option 2: GitHub
 
 ```bash
 pip install "git+https://github.com/obgwew/flet-code-editor-dsl.git"
-pip install "git+https://github.com/obgwew/flet-code-editor-dsl.git@v0.3.0"   # pinned
+pip install "git+https://github.com/obgwew/flet-code-editor-dsl.git@v0.3.2"   # pinned
 ```
 
 Inside `pyproject.toml`:
@@ -445,13 +447,13 @@ Changing the language/rules, `syntax_highlighting`, `show_errors` or `code_foldi
 
 ## Mobile / Touch Features
 
-New in 0.3.0. They apply to both controls. Properties that take `None` mean **automatic**: enabled on Android/iOS, disabled elsewhere.
+New in 0.3.2. They apply to both controls. Properties that take `None` mean **automatic**: enabled on Android/iOS, disabled elsewhere.
 
 | Property | Type | Default | Description |
 |----------|------|---------|-------------|
 | `selection_menu` | `bool` | `True` | Show the cut/copy/paste menu at the caret and selection handles (Android/iOS only). |
-| `selection_menu_items` | `list[str]` | `["cut","copy","paste","select_all"]` | Buttons of that menu. Also accepts `"undo"`, `"redo"`. |
-| `mobile_controls` | `bool \| None` | `None` (hidden) | Show the extra toolbar. Opt-in: `True` to show. |
+| `selection_menu_items` | `list[str]` | `["cut","copy","paste","select_all"]` | Buttons of that menu, in order (see `ce.DEFAULT_SELECTION_MENU_ITEMS`). Also accepts `"undo"`, `"redo"`. Unknown ids are ignored. |
+| `mobile_controls` | `bool \| None` | `None` (auto) | Show the extra toolbar. Auto = shown on Android/iOS, hidden elsewhere; `True` / `False` force it. |
 | `toolbar_items` | `list[str]` | all items | Toolbar buttons, see below. |
 | `toolbar_position` | `ToolbarPosition` | `BOTTOM` | `BOTTOM` or `TOP`. |
 | `cursor_pad` | `bool \| None` | `None` (auto) | Draggable pad inside the toolbar. Only visible when the toolbar is shown. |
@@ -474,11 +476,12 @@ ce.EditorTokens(
 
 - *Cut* and *Copy* appear only when something is selected. *Cut*, *Paste*, *Undo* and *Redo* are hidden in `read_only` mode.
 - The menu is shown on **Android and iOS only**. On desktop, the usual keyboard shortcuts apply.
-- Set `selection_menu=False` to disable it.
+- Set `selection_menu=False` to disable it. The menu is rebuilt every time it opens, so changing `selection_menu_items` or `read_only` at runtime takes effect immediately.
+- It works together with the optional toolbar: both use the same cut/copy/paste implementation (see [Paste behavior](#paste-behavior)).
 
 ### Extra toolbar and cursor pad
 
-An optional bar next to the editor, useful when you want explicit controls on a phone:
+An extra bar next to the editor (arrows, undo/redo, home/end, tab, cursor pad). With the default `mobile_controls=None` it is **shown automatically on Android/iOS** and hidden on desktop; pass `True` or `False` to force it:
 
 ```python
 ce.EditorTokens(
@@ -640,7 +643,7 @@ sigils=[ce.Sigil("$", "#9CDCFE"), ce.Sigil("@", "#4FC1FF"), ce.Sigil("%", "#D7BA
 
 ### Numbers, operators, punctuation, identifiers
 
-**Numbers** (`numbers=True`): integers and decimals (`42`, `3.14`, `.5`), digit separators (`1_000_000`), exponents (`1e10`, `2.5E-3`), prefixed literals (`0x1F`, `0b1010`, `0o755`). A number ends where it ends: `10px` is the number `10` followed by the identifier `px`. Identifiers cannot start with a digit. Set `numbers=False` if digits should not be treated specially.
+**Numbers** (`numbers=True`): integers and decimals (`42`, `3.14`, `.5`), digit separators (`1_000_000`), exponents (`1e10`, `2.5E-3`), prefixed literals (`0x1F` hex, `0b1010` binary, `0o755` octal; each prefix accepts only its own digits and `_`). A number ends where it ends: `10px` is the number `10` followed by the identifier `px`. Identifiers cannot start with a digit. Set `numbers=False` if digits should not be treated specially.
 
 **Operators** — each character in `Language.operators` is an operator character; a *run* of operator characters (`==`, `<=`, `&&`) becomes **one** token with `TokenColors.operator`.
 
@@ -711,7 +714,7 @@ errors=ce.ErrorRules(
 )
 ```
 
-> The lexer builds a message for each error (*Unterminated string*, *Unknown word: foo*, *Unmatched ')'*, *Unclosed '('*), but the editor only draws the underline; messages are not shown as tooltips yet. Brackets spanning several lines are **not** matched across lines; for a language where `{` and `}` regularly sit on different lines, leave the `{}` pair out.
+> The lexer builds a message for each error (*Unterminated string*, *Unknown word: foo*, *Not allowed: goto*, *Unmatched ')'*, *Unclosed '('*), but the editor only draws the underline; messages are not shown as tooltips yet. Brackets spanning several lines are **not** matched across lines; for a language where `{` and `}` regularly sit on different lines, leave the `{}` pair out.
 
 ### `FoldRule` and `fold_by_indent` (code folding)
 
@@ -1086,7 +1089,7 @@ page.add(
 | Change | Rebuild needed? |
 |--------|-----------------|
 | Editing Python code, `value`, `language` / `Language(...)`, `rules`, colors, fonts, flags, sizes, layout, mobile options | No — sent to the client at runtime. |
-| Updating `flet-code-editor-dsl` to a version whose Dart code changed (for example 0.2.x → 0.3.0) | **Yes** |
+| Updating `flet-code-editor-dsl` to a version whose Dart code changed (for example when upgrading to 0.3.2) | **Yes** |
 | Upgrading Flet itself to a new major/minor version | Yes |
 | Adding or removing other Flet extensions | Yes |
 
@@ -1133,7 +1136,7 @@ To test the library **before publishing it**:
    ```toml
    dependencies = [
      "flet>=0.85.2",
-     "flet-code-editor-dsl @ file:///C:/path/to/repo/dist/flet_code_editor_dsl-0.3.0-py3-none-any.whl",
+     "flet-code-editor-dsl @ file:///C:/path/to/repo/dist/flet_code_editor_dsl-0.3.2-py3-none-any.whl",
    ]
    ```
 
@@ -1187,7 +1190,7 @@ flet-code-editor-dsl/
         ├── __init__.py
         └── flet_code_editor_dsl/
             ├── __init__.py
-            ├── pubspec.yaml               # Flutter package (v0.3.0)
+            ├── pubspec.yaml               # Flutter package (v0.3.2)
             └── lib/
                 ├── flet_code_editor_dsl.dart      # Exports Extension
                 └── src/
@@ -1221,7 +1224,7 @@ flet-code-editor-dsl/
 
 ## Known Limitations
 
-- **Touch features are new in 0.3.0** and have had limited testing on real devices; please report problems with your device, OS version and Flet version.
+- **Touch features are new in 0.3.2** and have had limited testing on real devices; please report problems with your device, OS version and Flet version.
 - **The magnifier does not follow the selection handles** (they are owned by `re_editor`); it appears on a long press inside the text and follows the finger, not the caret.
 - **The selection menu is Android/iOS only.** Desktop keeps `re_editor`'s keyboard shortcuts.
 - **Pasting with the platform's built-in shortcut/menu inside `re_editor`** still uses its own code path; the library's paste normalization applies to its own menu and toolbar.
@@ -1241,13 +1244,13 @@ flet-code-editor-dsl/
 | Symptom | Likely cause and fix |
 |---------|----------------------|
 | `Unknown control: EditorRegex` / `EditorTokens` | The app is not running with the extension compiled in. Declare the library in `pyproject.toml` and run a build made with `flet build`. |
-| `ImportError: cannot import name 'EditorRegex'` in the built app | The build packaged an older version (for example 0.2.0 from PyPI). See [Developing and Testing Locally](#developing-and-testing-locally): use a wheel file in `dependencies`, delete `build/`, rebuild, and check `build/site-packages/flet_code_editor_dsl/__init__.py`. |
-| `TypeError` about `incremental_highlighting` | The argument was removed in 0.3.0; `EditorRegex` always highlights per line. Remove it. |
+| `ImportError: cannot import name 'EditorRegex'` in the built app | The build packaged an older version (an older release from PyPI). See [Developing and Testing Locally](#developing-and-testing-locally): use a wheel file in `dependencies`, delete `build/`, rebuild, and check `build/site-packages/flet_code_editor_dsl/__init__.py`. |
+| `TypeError` about `incremental_highlighting` | The argument no longer exists; `EditorRegex` always highlights per line. Remove it. |
 | `FletCodeEditor` / `FletCodeField` not found | They remain as deprecated aliases of `EditorTokens` / `EditorRegex`. If you removed the aliases, use the new names. |
-| No cut/copy/paste menu on the phone | Make sure `selection_menu=True` (default), the app was **rebuilt** with 0.3.0, and the app runs on Android/iOS. The menu appears when you tap the caret, long-press, or select text. |
+| No cut/copy/paste menu on the phone | Make sure `selection_menu=True` (default), `selection_menu_items` is not empty, the app was **rebuilt** with 0.3.2 or newer, and the app runs on Android/iOS. The menu appears when you tap the caret, long-press, or select text. |
 | Pasted text does not appear | Use *Paste* from the selection menu or the toolbar (they sanitize the clipboard text). Check that the editor is not `read_only`. |
 | Magnifier does not appear | It is touch-only, needs a ~0.4 s long press inside the text area, and `magnifier` must not be `False`. |
-| Cursor pad is missing | It lives in the toolbar: set `mobile_controls=True` (and keep `cursor_pad` not `False`). |
+| Cursor pad is missing | It lives in the toolbar: the toolbar must be visible (automatic on Android/iOS, or `mobile_controls=True`) and `cursor_pad` must not be `False`. |
 | The page does not scroll when dragging over the editor | Check `scroll_mode`. `PAGE_FIRST` (default) moves the page first; `EDITOR_ONLY` disables hand-off. The editor must be inside a vertical scrollable (`ListView`, `Column(scroll=...)`). |
 | The editor is tiny | `width_level` / `height_level` default to 13 (of 30). Set `expand=True`, `width`/`height`, or levels up to 30. |
 | No colors at all | `EditorTokens`: `language` is empty or not valid JSON — pass `Language(...).to_json()` (a string). `EditorRegex`: `rules` is empty or the patterns are invalid for Dart. Also check `syntax_highlighting=True`. |

{flet_code_editor_dsl-0.3.1 → flet_code_editor_dsl-0.3.2}/README.md

@@ -12,7 +12,7 @@
 ## Table of Contents
 
 1. [Overview](#overview)
-2. [What's New in 0.3.0 / Migration](#whats-new-in-030--migration)
+2. [What's New in 0.3.2 / Migration](#whats-new-in-032--migration)
 3. [Features](#features)
 4. [Requirements](#requirements)
 5. [Installation](#installation)
@@ -84,9 +84,9 @@ lang = ce.Language(
 
 and hand `lang.to_json()` to `EditorTokens`.
 
-## What's New in 0.3.0 / Migration
+## What's New in 0.3.2 / Migration
 
-### 0.3.0
+### 0.3.2
 
 | Change | Details |
 |--------|---------|
@@ -96,6 +96,8 @@ and hand `lang.to_json()` to `EditorTokens`.
 | **Touch support** | New selection menu at the caret/handles, optional toolbar and cursor pad, magnifier, `scroll_mode`. See [Mobile / Touch Features](#mobile--touch-features). |
 | **Paste fix** | Cut/copy/paste from the new menu/toolbar read the clipboard directly and normalize line endings and control characters before inserting. |
 | **New Dart files** | `regex_highlighter.dart` (regex engine). `code_editor.dart` is now shared by both controls. The old `src/flet_code_editor_dsl.dart` (`CodeField` widget) was deleted. |
+| **Number literals** | `0b…` now accepts only `0`/`1` and `0o…` only `0`–`7` (before, they accepted any hex digit, so `0b1010f` was one number). `0x…` is unchanged. |
+| **Sigils** | If the longest matching prefix has no name after it, shorter prefixes are tried next (for example `$$` and `$` defined together: a lone `$$ ` now falls back to `$`). |
 
 Rename in your code:
 
@@ -107,11 +109,11 @@ ce.FletCodeField(rules=[...])             ce.EditorRegex(rules=[...])
 
 Because the Dart side changed, **rebuild your app** after upgrading.
 
-### 0.2.0 (from the original `CodeEditor` API)
+### Migrating from the original `CodeEditor` API
 
 The earlier regex-based `CodeEditor` control and its `rule()` / `group()` / `pair()` helpers no longer exist.
 
-| Original API | 0.2.0+ |
+| Original API | 0.3.2 |
 |-------|-------|
 | Control `CodeEditor` | `EditorTokens` (tokenizer) and `EditorRegex` (regex) |
 | `rule()`, `group()` + `rules_json()` | `Language(words=[WordGroup(...)], strings=..., ...)` + `Language.to_json()`; `HighlightRule` list for `EditorRegex` |
@@ -165,17 +167,17 @@ version = "1.0.0"
 requires-python = ">=3.10"
 dependencies = [
   "flet>=0.85.2",
-  "flet-code-editor-dsl>=0.3.0",
+  "flet-code-editor-dsl>=0.3.2",
 ]
 ```
 
-Pin an exact version for reproducible builds: `"flet-code-editor-dsl==0.3.0"`. Upgrade with `pip install --upgrade flet-code-editor-dsl`.
+Pin an exact version for reproducible builds: `"flet-code-editor-dsl==0.3.2"`. Upgrade with `pip install --upgrade flet-code-editor-dsl`.
 
 ### Option 2: GitHub
 
 ```bash
 pip install "git+https://github.com/obgwew/flet-code-editor-dsl.git"
-pip install "git+https://github.com/obgwew/flet-code-editor-dsl.git@v0.3.0"   # pinned
+pip install "git+https://github.com/obgwew/flet-code-editor-dsl.git@v0.3.2"   # pinned
 ```
 
 Inside `pyproject.toml`:
@@ -432,13 +434,13 @@ Changing the language/rules, `syntax_highlighting`, `show_errors` or `code_foldi
 
 ## Mobile / Touch Features
 
-New in 0.3.0. They apply to both controls. Properties that take `None` mean **automatic**: enabled on Android/iOS, disabled elsewhere.
+New in 0.3.2. They apply to both controls. Properties that take `None` mean **automatic**: enabled on Android/iOS, disabled elsewhere.
 
 | Property | Type | Default | Description |
 |----------|------|---------|-------------|
 | `selection_menu` | `bool` | `True` | Show the cut/copy/paste menu at the caret and selection handles (Android/iOS only). |
-| `selection_menu_items` | `list[str]` | `["cut","copy","paste","select_all"]` | Buttons of that menu. Also accepts `"undo"`, `"redo"`. |
-| `mobile_controls` | `bool \| None` | `None` (hidden) | Show the extra toolbar. Opt-in: `True` to show. |
+| `selection_menu_items` | `list[str]` | `["cut","copy","paste","select_all"]` | Buttons of that menu, in order (see `ce.DEFAULT_SELECTION_MENU_ITEMS`). Also accepts `"undo"`, `"redo"`. Unknown ids are ignored. |
+| `mobile_controls` | `bool \| None` | `None` (auto) | Show the extra toolbar. Auto = shown on Android/iOS, hidden elsewhere; `True` / `False` force it. |
 | `toolbar_items` | `list[str]` | all items | Toolbar buttons, see below. |
 | `toolbar_position` | `ToolbarPosition` | `BOTTOM` | `BOTTOM` or `TOP`. |
 | `cursor_pad` | `bool \| None` | `None` (auto) | Draggable pad inside the toolbar. Only visible when the toolbar is shown. |
@@ -461,11 +463,12 @@ ce.EditorTokens(
 
 - *Cut* and *Copy* appear only when something is selected. *Cut*, *Paste*, *Undo* and *Redo* are hidden in `read_only` mode.
 - The menu is shown on **Android and iOS only**. On desktop, the usual keyboard shortcuts apply.
-- Set `selection_menu=False` to disable it.
+- Set `selection_menu=False` to disable it. The menu is rebuilt every time it opens, so changing `selection_menu_items` or `read_only` at runtime takes effect immediately.
+- It works together with the optional toolbar: both use the same cut/copy/paste implementation (see [Paste behavior](#paste-behavior)).
 
 ### Extra toolbar and cursor pad
 
-An optional bar next to the editor, useful when you want explicit controls on a phone:
+An extra bar next to the editor (arrows, undo/redo, home/end, tab, cursor pad). With the default `mobile_controls=None` it is **shown automatically on Android/iOS** and hidden on desktop; pass `True` or `False` to force it:
 
 ```python
 ce.EditorTokens(
@@ -627,7 +630,7 @@ sigils=[ce.Sigil("$", "#9CDCFE"), ce.Sigil("@", "#4FC1FF"), ce.Sigil("%", "#D7BA
 
 ### Numbers, operators, punctuation, identifiers
 
-**Numbers** (`numbers=True`): integers and decimals (`42`, `3.14`, `.5`), digit separators (`1_000_000`), exponents (`1e10`, `2.5E-3`), prefixed literals (`0x1F`, `0b1010`, `0o755`). A number ends where it ends: `10px` is the number `10` followed by the identifier `px`. Identifiers cannot start with a digit. Set `numbers=False` if digits should not be treated specially.
+**Numbers** (`numbers=True`): integers and decimals (`42`, `3.14`, `.5`), digit separators (`1_000_000`), exponents (`1e10`, `2.5E-3`), prefixed literals (`0x1F` hex, `0b1010` binary, `0o755` octal; each prefix accepts only its own digits and `_`). A number ends where it ends: `10px` is the number `10` followed by the identifier `px`. Identifiers cannot start with a digit. Set `numbers=False` if digits should not be treated specially.
 
 **Operators** — each character in `Language.operators` is an operator character; a *run* of operator characters (`==`, `<=`, `&&`) becomes **one** token with `TokenColors.operator`.
 
@@ -698,7 +701,7 @@ errors=ce.ErrorRules(
 )
 ```
 
-> The lexer builds a message for each error (*Unterminated string*, *Unknown word: foo*, *Unmatched ')'*, *Unclosed '('*), but the editor only draws the underline; messages are not shown as tooltips yet. Brackets spanning several lines are **not** matched across lines; for a language where `{` and `}` regularly sit on different lines, leave the `{}` pair out.
+> The lexer builds a message for each error (*Unterminated string*, *Unknown word: foo*, *Not allowed: goto*, *Unmatched ')'*, *Unclosed '('*), but the editor only draws the underline; messages are not shown as tooltips yet. Brackets spanning several lines are **not** matched across lines; for a language where `{` and `}` regularly sit on different lines, leave the `{}` pair out.
 
 ### `FoldRule` and `fold_by_indent` (code folding)
 
@@ -1073,7 +1076,7 @@ page.add(
 | Change | Rebuild needed? |
 |--------|-----------------|
 | Editing Python code, `value`, `language` / `Language(...)`, `rules`, colors, fonts, flags, sizes, layout, mobile options | No — sent to the client at runtime. |
-| Updating `flet-code-editor-dsl` to a version whose Dart code changed (for example 0.2.x → 0.3.0) | **Yes** |
+| Updating `flet-code-editor-dsl` to a version whose Dart code changed (for example when upgrading to 0.3.2) | **Yes** |
 | Upgrading Flet itself to a new major/minor version | Yes |
 | Adding or removing other Flet extensions | Yes |
 
@@ -1120,7 +1123,7 @@ To test the library **before publishing it**:
    ```toml
    dependencies = [
      "flet>=0.85.2",
-     "flet-code-editor-dsl @ file:///C:/path/to/repo/dist/flet_code_editor_dsl-0.3.0-py3-none-any.whl",
+     "flet-code-editor-dsl @ file:///C:/path/to/repo/dist/flet_code_editor_dsl-0.3.2-py3-none-any.whl",
    ]
    ```
 
@@ -1174,7 +1177,7 @@ flet-code-editor-dsl/
         ├── __init__.py
         └── flet_code_editor_dsl/
             ├── __init__.py
-            ├── pubspec.yaml               # Flutter package (v0.3.0)
+            ├── pubspec.yaml               # Flutter package (v0.3.2)
             └── lib/
                 ├── flet_code_editor_dsl.dart      # Exports Extension
                 └── src/
@@ -1208,7 +1211,7 @@ flet-code-editor-dsl/
 
 ## Known Limitations
 
-- **Touch features are new in 0.3.0** and have had limited testing on real devices; please report problems with your device, OS version and Flet version.
+- **Touch features are new in 0.3.2** and have had limited testing on real devices; please report problems with your device, OS version and Flet version.
 - **The magnifier does not follow the selection handles** (they are owned by `re_editor`); it appears on a long press inside the text and follows the finger, not the caret.
 - **The selection menu is Android/iOS only.** Desktop keeps `re_editor`'s keyboard shortcuts.
 - **Pasting with the platform's built-in shortcut/menu inside `re_editor`** still uses its own code path; the library's paste normalization applies to its own menu and toolbar.
@@ -1228,13 +1231,13 @@ flet-code-editor-dsl/
 | Symptom | Likely cause and fix |
 |---------|----------------------|
 | `Unknown control: EditorRegex` / `EditorTokens` | The app is not running with the extension compiled in. Declare the library in `pyproject.toml` and run a build made with `flet build`. |
-| `ImportError: cannot import name 'EditorRegex'` in the built app | The build packaged an older version (for example 0.2.0 from PyPI). See [Developing and Testing Locally](#developing-and-testing-locally): use a wheel file in `dependencies`, delete `build/`, rebuild, and check `build/site-packages/flet_code_editor_dsl/__init__.py`. |
-| `TypeError` about `incremental_highlighting` | The argument was removed in 0.3.0; `EditorRegex` always highlights per line. Remove it. |
+| `ImportError: cannot import name 'EditorRegex'` in the built app | The build packaged an older version (an older release from PyPI). See [Developing and Testing Locally](#developing-and-testing-locally): use a wheel file in `dependencies`, delete `build/`, rebuild, and check `build/site-packages/flet_code_editor_dsl/__init__.py`. |
+| `TypeError` about `incremental_highlighting` | The argument no longer exists; `EditorRegex` always highlights per line. Remove it. |
 | `FletCodeEditor` / `FletCodeField` not found | They remain as deprecated aliases of `EditorTokens` / `EditorRegex`. If you removed the aliases, use the new names. |
-| No cut/copy/paste menu on the phone | Make sure `selection_menu=True` (default), the app was **rebuilt** with 0.3.0, and the app runs on Android/iOS. The menu appears when you tap the caret, long-press, or select text. |
+| No cut/copy/paste menu on the phone | Make sure `selection_menu=True` (default), `selection_menu_items` is not empty, the app was **rebuilt** with 0.3.2 or newer, and the app runs on Android/iOS. The menu appears when you tap the caret, long-press, or select text. |
 | Pasted text does not appear | Use *Paste* from the selection menu or the toolbar (they sanitize the clipboard text). Check that the editor is not `read_only`. |
 | Magnifier does not appear | It is touch-only, needs a ~0.4 s long press inside the text area, and `magnifier` must not be `False`. |
-| Cursor pad is missing | It lives in the toolbar: set `mobile_controls=True` (and keep `cursor_pad` not `False`). |
+| Cursor pad is missing | It lives in the toolbar: the toolbar must be visible (automatic on Android/iOS, or `mobile_controls=True`) and `cursor_pad` must not be `False`. |
 | The page does not scroll when dragging over the editor | Check `scroll_mode`. `PAGE_FIRST` (default) moves the page first; `EDITOR_ONLY` disables hand-off. The editor must be inside a vertical scrollable (`ListView`, `Column(scroll=...)`). |
 | The editor is tiny | `width_level` / `height_level` default to 13 (of 30). Set `expand=True`, `width`/`height`, or levels up to 30. |
 | No colors at all | `EditorTokens`: `language` is empty or not valid JSON — pass `Language(...).to_json()` (a string). `EditorRegex`: `rules` is empty or the patterns are invalid for Dart. Also check `syntax_highlighting=True`. |

{flet_code_editor_dsl-0.3.1 → flet_code_editor_dsl-0.3.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "flet-code-editor-dsl"
-version = "0.3.1"
+version = "0.3.2"
 description = "Flet code editors with syntax highlighting: EditorTokens (tokenizer) and EditorRegex (regex)"
 readme = "README.md"
 requires-python = ">=3.10"

{flet_code_editor_dsl-0.3.1 → flet_code_editor_dsl-0.3.2}/src/flet_code_editor_dsl/__init__.py

@@ -1,4 +1,5 @@
 from flet_code_editor_dsl.flet_code_editor_dsl import (
+    DEFAULT_SELECTION_MENU_ITEMS,
     DEFAULT_TOOLBAR_ITEMS,
     EditorRegex,
     EditorTokens,
@@ -27,7 +28,8 @@ FletCodeField = EditorRegex
 __all__ = [
     "EditorRegex", "EditorTokens",
     "HighlightRule", "ErrorPattern",
-    "VerticalMode", "ScrollMode", "ToolbarPosition", "DEFAULT_TOOLBAR_ITEMS",
+    "VerticalMode", "ScrollMode", "ToolbarPosition",
+    "DEFAULT_TOOLBAR_ITEMS", "DEFAULT_SELECTION_MENU_ITEMS",
     "Language", "WordGroup", "StringRule", "BlockComment", "Sigil",
     "TokenColors", "FoldRule", "ErrorRules", "BracketPair",
     "FletCodeEditor", "FletCodeField",

{flet_code_editor_dsl-0.3.1 → flet_code_editor_dsl-0.3.2}/src/flet_code_editor_dsl/flet_code_editor_dsl.py

@@ -37,6 +37,9 @@ class ToolbarPosition(str, Enum):
     TOP = "top"
 
 
+# Buttons of the floating selection menu (Android/iOS). Also accepted: "undo", "redo".
+DEFAULT_SELECTION_MENU_ITEMS = ["cut", "copy", "paste", "select_all"]
+
 DEFAULT_TOOLBAR_ITEMS = [
     "undo", "redo", "cut", "copy", "paste", "select_all", "select_mode",
     "left", "right", "up", "down", "home", "end", "tab",
@@ -81,6 +84,8 @@ class EditorRegex(ft.LayoutControl):
     debounce_ms: int = 150
 
     # --- mobile (None = automatic: on for Android/iOS, off elsewhere) ---
+    selection_menu: bool = True           # floating cut/copy/paste menu at the caret (Android/iOS)
+    selection_menu_items: list[str] = field(default_factory=lambda: list(DEFAULT_SELECTION_MENU_ITEMS))
     mobile_controls: bool | None = None   # toolbar: cut/copy/paste/undo/arrows...
     toolbar_items: list[str] = field(default_factory=lambda: list(DEFAULT_TOOLBAR_ITEMS))
     toolbar_position: ToolbarPosition = ToolbarPosition.BOTTOM
@@ -125,6 +130,8 @@ class EditorTokens(ft.LayoutControl):
     debounce_ms: int = 150
 
     # --- mobile ---
+    selection_menu: bool = True
+    selection_menu_items: list[str] = field(default_factory=lambda: list(DEFAULT_SELECTION_MENU_ITEMS))
     mobile_controls: bool | None = None
     toolbar_items: list[str] = field(default_factory=lambda: list(DEFAULT_TOOLBAR_ITEMS))
     toolbar_position: ToolbarPosition = ToolbarPosition.BOTTOM

{flet_code_editor_dsl-0.3.1 → flet_code_editor_dsl-0.3.2/src/flet_code_editor_dsl.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flet-code-editor-dsl
-Version: 0.3.1
+Version: 0.3.2
 Summary: Flet code editors with syntax highlighting: EditorTokens (tokenizer) and EditorRegex (regex)
 Author-email: obgwew <obgwew@gmail.com>
 License-Expression: Apache-2.0
@@ -25,7 +25,7 @@ Dynamic: license-file
 ## Table of Contents
 
 1. [Overview](#overview)
-2. [What's New in 0.3.0 / Migration](#whats-new-in-030--migration)
+2. [What's New in 0.3.2 / Migration](#whats-new-in-032--migration)
 3. [Features](#features)
 4. [Requirements](#requirements)
 5. [Installation](#installation)
@@ -97,9 +97,9 @@ lang = ce.Language(
 
 and hand `lang.to_json()` to `EditorTokens`.
 
-## What's New in 0.3.0 / Migration
+## What's New in 0.3.2 / Migration
 
-### 0.3.0
+### 0.3.2
 
 | Change | Details |
 |--------|---------|
@@ -109,6 +109,8 @@ and hand `lang.to_json()` to `EditorTokens`.
 | **Touch support** | New selection menu at the caret/handles, optional toolbar and cursor pad, magnifier, `scroll_mode`. See [Mobile / Touch Features](#mobile--touch-features). |
 | **Paste fix** | Cut/copy/paste from the new menu/toolbar read the clipboard directly and normalize line endings and control characters before inserting. |
 | **New Dart files** | `regex_highlighter.dart` (regex engine). `code_editor.dart` is now shared by both controls. The old `src/flet_code_editor_dsl.dart` (`CodeField` widget) was deleted. |
+| **Number literals** | `0b…` now accepts only `0`/`1` and `0o…` only `0`–`7` (before, they accepted any hex digit, so `0b1010f` was one number). `0x…` is unchanged. |
+| **Sigils** | If the longest matching prefix has no name after it, shorter prefixes are tried next (for example `$$` and `$` defined together: a lone `$$ ` now falls back to `$`). |
 
 Rename in your code:
 
@@ -120,11 +122,11 @@ ce.FletCodeField(rules=[...])             ce.EditorRegex(rules=[...])
 
 Because the Dart side changed, **rebuild your app** after upgrading.
 
-### 0.2.0 (from the original `CodeEditor` API)
+### Migrating from the original `CodeEditor` API
 
 The earlier regex-based `CodeEditor` control and its `rule()` / `group()` / `pair()` helpers no longer exist.
 
-| Original API | 0.2.0+ |
+| Original API | 0.3.2 |
 |-------|-------|
 | Control `CodeEditor` | `EditorTokens` (tokenizer) and `EditorRegex` (regex) |
 | `rule()`, `group()` + `rules_json()` | `Language(words=[WordGroup(...)], strings=..., ...)` + `Language.to_json()`; `HighlightRule` list for `EditorRegex` |
@@ -178,17 +180,17 @@ version = "1.0.0"
 requires-python = ">=3.10"
 dependencies = [
   "flet>=0.85.2",
-  "flet-code-editor-dsl>=0.3.0",
+  "flet-code-editor-dsl>=0.3.2",
 ]
 ```
 
-Pin an exact version for reproducible builds: `"flet-code-editor-dsl==0.3.0"`. Upgrade with `pip install --upgrade flet-code-editor-dsl`.
+Pin an exact version for reproducible builds: `"flet-code-editor-dsl==0.3.2"`. Upgrade with `pip install --upgrade flet-code-editor-dsl`.
 
 ### Option 2: GitHub
 
 ```bash
 pip install "git+https://github.com/obgwew/flet-code-editor-dsl.git"
-pip install "git+https://github.com/obgwew/flet-code-editor-dsl.git@v0.3.0"   # pinned
+pip install "git+https://github.com/obgwew/flet-code-editor-dsl.git@v0.3.2"   # pinned
 ```
 
 Inside `pyproject.toml`:
@@ -445,13 +447,13 @@ Changing the language/rules, `syntax_highlighting`, `show_errors` or `code_foldi
 
 ## Mobile / Touch Features
 
-New in 0.3.0. They apply to both controls. Properties that take `None` mean **automatic**: enabled on Android/iOS, disabled elsewhere.
+New in 0.3.2. They apply to both controls. Properties that take `None` mean **automatic**: enabled on Android/iOS, disabled elsewhere.
 
 | Property | Type | Default | Description |
 |----------|------|---------|-------------|
 | `selection_menu` | `bool` | `True` | Show the cut/copy/paste menu at the caret and selection handles (Android/iOS only). |
-| `selection_menu_items` | `list[str]` | `["cut","copy","paste","select_all"]` | Buttons of that menu. Also accepts `"undo"`, `"redo"`. |
-| `mobile_controls` | `bool \| None` | `None` (hidden) | Show the extra toolbar. Opt-in: `True` to show. |
+| `selection_menu_items` | `list[str]` | `["cut","copy","paste","select_all"]` | Buttons of that menu, in order (see `ce.DEFAULT_SELECTION_MENU_ITEMS`). Also accepts `"undo"`, `"redo"`. Unknown ids are ignored. |
+| `mobile_controls` | `bool \| None` | `None` (auto) | Show the extra toolbar. Auto = shown on Android/iOS, hidden elsewhere; `True` / `False` force it. |
 | `toolbar_items` | `list[str]` | all items | Toolbar buttons, see below. |
 | `toolbar_position` | `ToolbarPosition` | `BOTTOM` | `BOTTOM` or `TOP`. |
 | `cursor_pad` | `bool \| None` | `None` (auto) | Draggable pad inside the toolbar. Only visible when the toolbar is shown. |
@@ -474,11 +476,12 @@ ce.EditorTokens(
 
 - *Cut* and *Copy* appear only when something is selected. *Cut*, *Paste*, *Undo* and *Redo* are hidden in `read_only` mode.
 - The menu is shown on **Android and iOS only**. On desktop, the usual keyboard shortcuts apply.
-- Set `selection_menu=False` to disable it.
+- Set `selection_menu=False` to disable it. The menu is rebuilt every time it opens, so changing `selection_menu_items` or `read_only` at runtime takes effect immediately.
+- It works together with the optional toolbar: both use the same cut/copy/paste implementation (see [Paste behavior](#paste-behavior)).
 
 ### Extra toolbar and cursor pad
 
-An optional bar next to the editor, useful when you want explicit controls on a phone:
+An extra bar next to the editor (arrows, undo/redo, home/end, tab, cursor pad). With the default `mobile_controls=None` it is **shown automatically on Android/iOS** and hidden on desktop; pass `True` or `False` to force it:
 
 ```python
 ce.EditorTokens(
@@ -640,7 +643,7 @@ sigils=[ce.Sigil("$", "#9CDCFE"), ce.Sigil("@", "#4FC1FF"), ce.Sigil("%", "#D7BA
 
 ### Numbers, operators, punctuation, identifiers
 
-**Numbers** (`numbers=True`): integers and decimals (`42`, `3.14`, `.5`), digit separators (`1_000_000`), exponents (`1e10`, `2.5E-3`), prefixed literals (`0x1F`, `0b1010`, `0o755`). A number ends where it ends: `10px` is the number `10` followed by the identifier `px`. Identifiers cannot start with a digit. Set `numbers=False` if digits should not be treated specially.
+**Numbers** (`numbers=True`): integers and decimals (`42`, `3.14`, `.5`), digit separators (`1_000_000`), exponents (`1e10`, `2.5E-3`), prefixed literals (`0x1F` hex, `0b1010` binary, `0o755` octal; each prefix accepts only its own digits and `_`). A number ends where it ends: `10px` is the number `10` followed by the identifier `px`. Identifiers cannot start with a digit. Set `numbers=False` if digits should not be treated specially.
 
 **Operators** — each character in `Language.operators` is an operator character; a *run* of operator characters (`==`, `<=`, `&&`) becomes **one** token with `TokenColors.operator`.
 
@@ -711,7 +714,7 @@ errors=ce.ErrorRules(
 )
 ```
 
-> The lexer builds a message for each error (*Unterminated string*, *Unknown word: foo*, *Unmatched ')'*, *Unclosed '('*), but the editor only draws the underline; messages are not shown as tooltips yet. Brackets spanning several lines are **not** matched across lines; for a language where `{` and `}` regularly sit on different lines, leave the `{}` pair out.
+> The lexer builds a message for each error (*Unterminated string*, *Unknown word: foo*, *Not allowed: goto*, *Unmatched ')'*, *Unclosed '('*), but the editor only draws the underline; messages are not shown as tooltips yet. Brackets spanning several lines are **not** matched across lines; for a language where `{` and `}` regularly sit on different lines, leave the `{}` pair out.
 
 ### `FoldRule` and `fold_by_indent` (code folding)
 
@@ -1086,7 +1089,7 @@ page.add(
 | Change | Rebuild needed? |
 |--------|-----------------|
 | Editing Python code, `value`, `language` / `Language(...)`, `rules`, colors, fonts, flags, sizes, layout, mobile options | No — sent to the client at runtime. |
-| Updating `flet-code-editor-dsl` to a version whose Dart code changed (for example 0.2.x → 0.3.0) | **Yes** |
+| Updating `flet-code-editor-dsl` to a version whose Dart code changed (for example when upgrading to 0.3.2) | **Yes** |
 | Upgrading Flet itself to a new major/minor version | Yes |
 | Adding or removing other Flet extensions | Yes |
 
@@ -1133,7 +1136,7 @@ To test the library **before publishing it**:
    ```toml
    dependencies = [
      "flet>=0.85.2",
-     "flet-code-editor-dsl @ file:///C:/path/to/repo/dist/flet_code_editor_dsl-0.3.0-py3-none-any.whl",
+     "flet-code-editor-dsl @ file:///C:/path/to/repo/dist/flet_code_editor_dsl-0.3.2-py3-none-any.whl",
    ]
    ```
 
@@ -1187,7 +1190,7 @@ flet-code-editor-dsl/
         ├── __init__.py
         └── flet_code_editor_dsl/
             ├── __init__.py
-            ├── pubspec.yaml               # Flutter package (v0.3.0)
+            ├── pubspec.yaml               # Flutter package (v0.3.2)
             └── lib/
                 ├── flet_code_editor_dsl.dart      # Exports Extension
                 └── src/
@@ -1221,7 +1224,7 @@ flet-code-editor-dsl/
 
 ## Known Limitations
 
-- **Touch features are new in 0.3.0** and have had limited testing on real devices; please report problems with your device, OS version and Flet version.
+- **Touch features are new in 0.3.2** and have had limited testing on real devices; please report problems with your device, OS version and Flet version.
 - **The magnifier does not follow the selection handles** (they are owned by `re_editor`); it appears on a long press inside the text and follows the finger, not the caret.
 - **The selection menu is Android/iOS only.** Desktop keeps `re_editor`'s keyboard shortcuts.
 - **Pasting with the platform's built-in shortcut/menu inside `re_editor`** still uses its own code path; the library's paste normalization applies to its own menu and toolbar.
@@ -1241,13 +1244,13 @@ flet-code-editor-dsl/
 | Symptom | Likely cause and fix |
 |---------|----------------------|
 | `Unknown control: EditorRegex` / `EditorTokens` | The app is not running with the extension compiled in. Declare the library in `pyproject.toml` and run a build made with `flet build`. |
-| `ImportError: cannot import name 'EditorRegex'` in the built app | The build packaged an older version (for example 0.2.0 from PyPI). See [Developing and Testing Locally](#developing-and-testing-locally): use a wheel file in `dependencies`, delete `build/`, rebuild, and check `build/site-packages/flet_code_editor_dsl/__init__.py`. |
-| `TypeError` about `incremental_highlighting` | The argument was removed in 0.3.0; `EditorRegex` always highlights per line. Remove it. |
+| `ImportError: cannot import name 'EditorRegex'` in the built app | The build packaged an older version (an older release from PyPI). See [Developing and Testing Locally](#developing-and-testing-locally): use a wheel file in `dependencies`, delete `build/`, rebuild, and check `build/site-packages/flet_code_editor_dsl/__init__.py`. |
+| `TypeError` about `incremental_highlighting` | The argument no longer exists; `EditorRegex` always highlights per line. Remove it. |
 | `FletCodeEditor` / `FletCodeField` not found | They remain as deprecated aliases of `EditorTokens` / `EditorRegex`. If you removed the aliases, use the new names. |
-| No cut/copy/paste menu on the phone | Make sure `selection_menu=True` (default), the app was **rebuilt** with 0.3.0, and the app runs on Android/iOS. The menu appears when you tap the caret, long-press, or select text. |
+| No cut/copy/paste menu on the phone | Make sure `selection_menu=True` (default), `selection_menu_items` is not empty, the app was **rebuilt** with 0.3.2 or newer, and the app runs on Android/iOS. The menu appears when you tap the caret, long-press, or select text. |
 | Pasted text does not appear | Use *Paste* from the selection menu or the toolbar (they sanitize the clipboard text). Check that the editor is not `read_only`. |
 | Magnifier does not appear | It is touch-only, needs a ~0.4 s long press inside the text area, and `magnifier` must not be `False`. |
-| Cursor pad is missing | It lives in the toolbar: set `mobile_controls=True` (and keep `cursor_pad` not `False`). |
+| Cursor pad is missing | It lives in the toolbar: the toolbar must be visible (automatic on Android/iOS, or `mobile_controls=True`) and `cursor_pad` must not be `False`. |
 | The page does not scroll when dragging over the editor | Check `scroll_mode`. `PAGE_FIRST` (default) moves the page first; `EDITOR_ONLY` disables hand-off. The editor must be inside a vertical scrollable (`ListView`, `Column(scroll=...)`). |
 | The editor is tiny | `width_level` / `height_level` default to 13 (of 30). Set `expand=True`, `width`/`height`, or levels up to 30. |
 | No colors at all | `EditorTokens`: `language` is empty or not valid JSON — pass `Language(...).to_json()` (a string). `EditorRegex`: `rules` is empty or the patterns are invalid for Dart. Also check `syntax_highlighting=True`. |

{flet_code_editor_dsl-0.3.1 → flet_code_editor_dsl-0.3.2}/src/flutter/flet_code_editor_dsl/lib/src/code_editor.dart

@@ -83,6 +83,8 @@ const List<String> _defaultToolbar = [
   "left", "right", "up", "down", "home", "end", "tab",
 ];
 
+const List<String> _defaultSelectionMenu = ["cut", "copy", "paste", "select_all"];
+
 class _FletEditorControlState extends State<FletEditorControl> {
   late final CodeLineEditingController _controller;
   Timer? _debounce;
@@ -111,6 +113,66 @@ class _FletEditorControlState extends State<FletEditorControl> {
   int? _pointer;
   final ValueNotifier<Offset?> _magnifierAt = ValueNotifier<Offset?>(null);
 
+  // Floating cut/copy/paste menu (re_editor only shows one when it is given a
+  // toolbar controller). Only used on Android/iOS.
+  late final MobileSelectionToolbarController _menuController =
+      MobileSelectionToolbarController(builder: _menuBuilder);
+
+  Widget _menuBuilder({
+    required BuildContext context,
+    required TextSelectionToolbarAnchors anchors,
+    required CodeLineEditingController controller,
+    required VoidCallback onDismiss,
+    required VoidCallback onRefresh,
+  }) {
+    final readOnly = widget.control.getBool("read_only", false)!;
+    final raw = widget.control.get("selection_menu_items");
+    final ids = raw is List
+        ? [for (final i in raw) i.toString()]
+        : _defaultSelectionMenu;
+    final loc = MaterialLocalizations.of(context);
+    final hasSelection = controller.selectedText.isNotEmpty;
+
+    final items = <ContextMenuButtonItem>[];
+    void add(String label, VoidCallback run) {
+      items.add(ContextMenuButtonItem(
+        label: label,
+        onPressed: () {
+          run();
+          onDismiss();
+        },
+      ));
+    }
+
+    for (final id in ids) {
+      switch (id) {
+        case "cut":
+          if (!readOnly && hasSelection) add(loc.cutButtonLabel, () => _cut());
+          break;
+        case "copy":
+          if (hasSelection) add(loc.copyButtonLabel, () => _copy());
+          break;
+        case "paste":
+          if (!readOnly) add(loc.pasteButtonLabel, () => _paste());
+          break;
+        case "select_all":
+          add(loc.selectAllButtonLabel, () => _controller.selectAll());
+          break;
+        case "undo":
+          if (!readOnly) add("Undo", () => _controller.undo());
+          break;
+        case "redo":
+          if (!readOnly) add("Redo", () => _controller.redo());
+          break;
+      }
+    }
+    if (items.isEmpty) return const SizedBox.shrink();
+    return AdaptiveTextSelectionToolbar.buttonItems(
+      anchors: anchors,
+      buttonItems: items,
+    );
+  }
+
   bool get _isMobilePlatform =>
       defaultTargetPlatform == TargetPlatform.android ||
       defaultTargetPlatform == TargetPlatform.iOS;
@@ -132,6 +194,7 @@ class _FletEditorControlState extends State<FletEditorControl> {
   void dispose() {
     _debounce?.cancel();
     _lpTimer?.cancel();
+    _menuController.hide(context);
     _magnifierAt.dispose();
     _controller.removeListener(_onControllerChanged);
     _controller.dispose();
@@ -576,6 +639,7 @@ class _FletEditorControlState extends State<FletEditorControl> {
         ? [for (final i in itemsRaw) i.toString()]
         : _defaultToolbar;
     final scrollMode = control.getString("scroll_mode", "page_first")!;
+    final showMenu = mobile && control.getBool("selection_menu", true)!;
 
     Widget editor = CodeEditor(
       key: ValueKey("editor_$_epoch"),
@@ -584,6 +648,7 @@ class _FletEditorControlState extends State<FletEditorControl> {
       wordWrap: wrap,
       padding: const EdgeInsets.all(4),
       onChanged: _handleChanged,
+      toolbarController: showMenu ? _menuController : null,
       chunkAnalyzer: _chunkAnalyzer,
       style: CodeEditorStyle(
         fontFamily: fontFamily,

{flet_code_editor_dsl-0.3.1 → flet_code_editor_dsl-0.3.2}/src/flutter/flet_code_editor_dsl/lib/src/tokenizer.dart

@@ -460,8 +460,8 @@ class CodeLanguage {
             add(pos, e, s.color);
             pos = e;
             matched = true;
+            break;
           }
-          break;
         }
       }
       if (matched) continue;
@@ -476,7 +476,16 @@ class CodeLanguage {
             (next == 120 || next == 88 || next == 98 || next == 66 ||
                 next == 111 || next == 79)) {
           e += 2;
-          while (e < n && (_isHex(line.codeUnitAt(e)) || line.codeUnitAt(e) == 95)) {
+          final isHexLit = next == 120 || next == 88;
+          final isBinLit = next == 98 || next == 66;
+          bool digitOk(int c) =>
+              c == 95 ||
+              (isHexLit
+                  ? _isHex(c)
+                  : isBinLit
+                      ? (c == 48 || c == 49)
+                      : (c >= 48 && c <= 55));
+          while (e < n && digitOk(line.codeUnitAt(e))) {
             e++;
           }
         } else {

{flet_code_editor_dsl-0.3.1 → flet_code_editor_dsl-0.3.2}/src/flutter/flet_code_editor_dsl/pubspec.yaml

@@ -1,6 +1,6 @@
 name: flet_code_editor_dsl
 description: Flet code editors with syntax highlighting (EditorTokens / EditorRegex)
-version: 0.3.0
+version: 0.3.2
 publish_to: none
 
 environment: