Release v2.2.6

.claude/hooks/cleanup-cs.ps1

@@ -7,27 +7,61 @@
 #   2. dotnet jb cleanupcode (slower, ReSharper-driven; catches what dotnet format misses —
 #      var preferences, expression-bodied members, XML doc spacing, using sorting)
 #
-# Skips itself entirely if the working tree has no modified .cs files outside third_party/.
+# Skips itself entirely if the working tree has no modified .cs files outside third_party/
+# and lifted AvaloniaEdit folders.
 
 $ErrorActionPreference = 'Stop'
 
 $repo = & git rev-parse --show-toplevel 2>$null
 if (-not $repo) { exit 0 }
 Set-Location $repo
 
+$liftedPrefixes = @(
+    'src/Terminal.Gui.Editor/Document/',
+    'src/Terminal.Gui.Editor/Extensions/',
+    'src/Terminal.Gui.Editor/Folding/',
+    'src/Terminal.Gui.Editor/Highlighting/',
+    'src/Terminal.Gui.Editor/Indentation/',
+    'src/Terminal.Gui.Editor/Search/',
+    'src/Terminal.Gui.Editor/Utils/'
+)
+
+function Test-IsLiftedPath ([string] $path) {
+    $normalized = $path -replace '\\', '/'
+    if ($normalized -like 'third_party/*') { return $true }
+
+    foreach ($prefix in $liftedPrefixes) {
+        if ($normalized.StartsWith($prefix, [StringComparison]::Ordinal)) {
+            return $true
+        }
+    }
+
+    return $false
+}
+
 # Modified .cs files (staged + unstaged + untracked), excluding lifted upstream code.
 $changed = & git status --porcelain |
     ForEach-Object { ($_ -replace '^...', '').Trim('"') } |
-    Where-Object { $_ -like '*.cs' -and $_ -notlike 'third_party/*' }
+    Where-Object { $_ -like '*.cs' -and -not (Test-IsLiftedPath $_) }
 
 if (-not $changed) { exit 0 }
 
 # Restore tools quietly. Idempotent; first run downloads jb.
 & dotnet tool restore --tool-manifest .config/dotnet-tools.json *> $null
 
 # dotnet format (whitespace + style + analyzers) on the whole solution. Single pass is faster
-# than per-file invocations because the workspace loads once.
-& dotnet format Terminal.Gui.Editor.slnx --no-restore --exclude third_party/ *> $null
+# than per-file invocations because the workspace loads once. Exclude lifted code so the
+# formatter cannot create upstream-merge-hostile churn as a side effect.
+& dotnet format Terminal.Gui.Editor.slnx `
+    --no-restore `
+    --exclude third_party/ `
+    --exclude src/Terminal.Gui.Editor/Document/ `
+    --exclude src/Terminal.Gui.Editor/Extensions/ `
+    --exclude src/Terminal.Gui.Editor/Folding/ `
+    --exclude src/Terminal.Gui.Editor/Highlighting/ `
+    --exclude src/Terminal.Gui.Editor/Indentation/ `
+    --exclude src/Terminal.Gui.Editor/Search/ `
+    --exclude src/Terminal.Gui.Editor/Utils/ *> $null
 
 # ReSharper code cleanup. Uses the built-in profile name because jb cleanupcode does not
 # always discover custom profile names from team-shared .DotSettings files reliably; the

.github/workflows/ci.yml

@@ -44,10 +44,22 @@ jobs:
       # Style gate runs once (Linux). dotnet format catches whitespace/analyzer drift;
       # jb cleanupcode catches what dotnet format misses (var, expression-bodied members,
       # XML doc spacing, using sorting). Both must produce a clean working tree.
+      #
+      # Keep lifted AvaloniaEdit code out of broad format/cleanup passes. Those files preserve
+      # upstream formatting for manual re-syncs; formatting-only churn there is not actionable
+      # style drift. Keep this exclude list in sync with .claude/hooks/cleanup-cs.ps1.
       - name: Verify code style — dotnet format
         if: matrix.os == 'ubuntu-latest'
         run: |
-          dotnet format Terminal.Gui.Editor.slnx --no-restore --exclude third_party/ --verify-no-changes
+          dotnet format Terminal.Gui.Editor.slnx --no-restore --verify-no-changes \
+            --exclude third_party/ \
+            --exclude src/Terminal.Gui.Editor/Document/ \
+            --exclude src/Terminal.Gui.Editor/Extensions/ \
+            --exclude src/Terminal.Gui.Editor/Folding/ \
+            --exclude src/Terminal.Gui.Editor/Highlighting/ \
+            --exclude src/Terminal.Gui.Editor/Indentation/ \
+            --exclude src/Terminal.Gui.Editor/Search/ \
+            --exclude src/Terminal.Gui.Editor/Utils/
 
       - name: Verify code style — ReSharper cleanupcode
         if: matrix.os == 'ubuntu-latest'
@@ -59,10 +71,10 @@ jobs:
           dotnet jb cleanupcode Terminal.Gui.Editor.slnx \
             --profile="TG.Editor Full Cleanup" \
             --no-build \
-            --exclude="third_party/**/*;src/Terminal.Gui.Editor/Document/**/*;src/Terminal.Gui.Editor/Utils/**/*;src/Terminal.Gui.Editor/Search/**/*" \
+            --exclude="third_party/**/*;src/Terminal.Gui.Editor/Document/**/*;src/Terminal.Gui.Editor/Extensions/**/*;src/Terminal.Gui.Editor/Folding/**/*;src/Terminal.Gui.Editor/Highlighting/**/*;src/Terminal.Gui.Editor/Indentation/**/*;src/Terminal.Gui.Editor/Search/**/*;src/Terminal.Gui.Editor/Utils/**/*" \
             || true
           if ! git diff --exit-code; then
-            echo "::error::ReSharper code cleanup found style drift. Run 'dotnet jb cleanupcode Terminal.Gui.Editor.slnx --profile=\"TG.Editor Full Cleanup\" --no-build --exclude=\"third_party/**/*;src/Terminal.Gui.Editor/Document/**/*;src/Terminal.Gui.Editor/Utils/**/*;src/Terminal.Gui.Editor/Search/**/*\"' locally and commit the result."
+            echo "::error::ReSharper code cleanup found style drift outside lifted AvaloniaEdit code. Run '.claude/hooks/cleanup-cs.ps1' locally and commit the result."
             exit 1
           fi
 
@@ -81,4 +93,3 @@ jobs:
       # NOTE: Performance smoke tests and the BenchmarkDotNet baseline compare live in a
       # dedicated workflow: .github/workflows/perf.yml (ubuntu-latest only). They were split
       # out so this CI workflow stays purely correctness-focused and fast across all three OSes.
-

.github/workflows/release.yml

@@ -65,7 +65,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        include:
+          - os: ubuntu-latest
+            rid: linux-x64
+          - os: macos-latest
+            rid: osx-arm64
+          - os: windows-latest
+            rid: win-x64
     runs-on: ${{ matrix.os }}
     env:
       VERSION: ${{ needs.resolve-version.outputs.version }}
@@ -93,6 +99,22 @@ jobs:
       - name: Terminal.Gui.Editor.IntegrationTests
         run: dotnet run --project tests/Terminal.Gui.Editor.IntegrationTests --no-build -c Release
 
+      - name: Publish ted AOT
+        run: >
+          dotnet publish examples/ted -c Release
+          -r ${{ matrix.rid }}
+          --self-contained
+          -p:PublishAot=true
+          -p:Version=${{ env.VERSION }}
+          -o publish/${{ matrix.rid }}
+
+      - name: Upload ted artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: ted-${{ matrix.rid }}
+          path: publish/${{ matrix.rid }}/
+          retention-days: 30
+
   pack-and-publish:
     needs: [resolve-version, build-and-test]
     runs-on: ubuntu-latest
@@ -124,6 +146,71 @@ jobs:
           --source https://api.nuget.org/v3/index.json
           --skip-duplicate
 
+  # Attach ted AOT binaries to the GitHub Release (tag pushes only).
+  # The Release is created by finalize-release.yml before the tag push triggers this workflow.
+  release-assets:
+    if: github.ref_type == 'tag'
+    needs: [resolve-version, build-and-test]
+    runs-on: ubuntu-latest
+    env:
+      VERSION: ${{ needs.resolve-version.outputs.version }}
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      GH_REPO: ${{ github.repository }}
+    steps:
+      - uses: actions/checkout@v5
+
+      - name: Download all ted artifacts
+        uses: actions/download-artifact@v4
+        with:
+          pattern: ted-*
+          path: artifacts/
+
+      - name: Package release archives
+        shell: bash
+        run: |
+          set -euo pipefail
+          mkdir -p dist
+
+          package_unix() {
+            local rid="$1"
+            local src="artifacts/ted-${rid}"
+            if [ ! -d "$src" ]; then
+              echo "::warning::No artifact for ${rid}, skipping"
+              return 0
+            fi
+            chmod +x "$src/ted" 2>/dev/null || true
+            tar -czf "dist/ted-${VERSION}-${rid}.tar.gz" -C "$src" .
+            echo "Created dist/ted-${VERSION}-${rid}.tar.gz"
+          }
+
+          package_windows() {
+            local rid="$1"
+            local src="artifacts/ted-${rid}"
+            if [ ! -d "$src" ]; then
+              echo "::warning::No artifact for ${rid}, skipping"
+              return 0
+            fi
+            (cd "$src" && zip -r "../../dist/ted-${VERSION}-${rid}.zip" .)
+            echo "Created dist/ted-${VERSION}-${rid}.zip"
+          }
+
+          package_unix   osx-arm64
+          package_unix   linux-x64
+          package_windows win-x64
+
+          ls -la dist/
+
+      - name: Upload to GitHub Release
+        shell: bash
+        run: |
+          TAG="${GITHUB_REF_NAME}"
+          if gh release view "$TAG" >/dev/null 2>&1; then
+            gh release upload "$TAG" dist/* --clobber
+          else
+            echo "::warning::Release $TAG not found; creating one."
+            gh release create "$TAG" --title "ted $TAG" --generate-notes dist/*
+          fi
+
   # Notify downstream repos (gui-cs/clet) so they can rebuild against the new Editor version.
   # Uses a PAT stored as CLET_DISPATCH_TOKEN with `repo` scope on gui-cs/clet.
   notify-downstream:

CLAUDE.md

@@ -51,7 +51,7 @@ Run a single test by passing xUnit.v3 filter args after `--`:
 dotnet run --project tests/Terminal.Gui.Editor.Tests -- -method "*MyTestName*"
 ```
 
-CI verifies formatting with `dotnet format Terminal.Gui.Editor.slnx --verify-no-changes --exclude third_party/`. Run the same locally before pushing if you've touched C# files outside `third_party/`.
+CI verifies formatting with `dotnet format Terminal.Gui.Editor.slnx --verify-no-changes` while excluding `third_party/` and AvaloniaEdit-lifted folders. Run `.claude/hooks/cleanup-cs.ps1` locally before pushing if you've touched C# files outside lifted code.
 
 ### Verifying the *look* (ANSI snapshots) — MANDATORY for render changes
 
@@ -84,15 +84,22 @@ The boundary matters: anything that takes a dependency on `Terminal.Gui` types b
 
 See `specs/00-plan.md` §6 for the planned pipeline and full `Editor` public API sketch.
 
-## AvaloniaEdit fork policy
+## AvaloniaEdit fork policy — do not format lifted code
 
-Code is lifted from AvaloniaEdit into the relevant `src/Terminal.Gui.Editor/` subfolders (`Document/`, `Utils/` so far; `Folding/`, `Search/`, `Indentation/`, `Highlighting/` to follow). The pinned upstream commit and per-file modification log live in `third_party/AvaloniaEdit/UPSTREAM.md` (with the upstream MIT `LICENSE` alongside).
+Code is lifted from AvaloniaEdit into the relevant `src/Terminal.Gui.Editor/` subfolders (`Document/`, `Utils/`, `Folding/`, `Search/`, `Indentation/`, `Highlighting/`, and supporting lifted helpers). The pinned upstream commit and per-file modification log live in `third_party/AvaloniaEdit/UPSTREAM.md` (with the upstream MIT `LICENSE` alongside).
+
+**Do not run broad formatting or cleanup over lifted files.** Treat any file containing
+`// Adapted for Terminal.Gui from AvaloniaEdit ...` as upstream-owned formatting, even when it
+lives outside `third_party/`. `dotnet format`, ReSharper cleanup, Rider "cleanup on save", and
+"format document" can create huge no-op diffs in these files; those diffs make future upstream
+re-syncs painful and must be reverted before finishing work.
 
 For lifted files:
 
 - **Preserve original formatting and copyright headers.** House-style reformatting defeats the merge story.
 - Add the line `// Adapted for Terminal.Gui from AvaloniaEdit <commit-sha>` under the original header.
 - Targeted edits only: strip `using Avalonia.*`, remove `Dispatcher.UIThread.VerifyAccess ()` calls, replace `IBrush`/`Avalonia.Media.Color` with `Terminal.Gui.Color`, drop typeface/font-size from `HighlightingColor`.
+- If a formatter or cleanup tool touches lifted files as a side effect, immediately revert those unrelated formatting-only hunks. Keep only the narrow semantic changes required by the task.
 - Log every modification in `third_party/AvaloniaEdit/UPSTREAM.md` along with the pinned upstream commit.
 
 The fork is **hard** — re-syncs are manual and deliberate, triggered only by upstream fixes we want.
@@ -105,7 +112,7 @@ Adopts Terminal.Gui's house style. Three enforcement layers:
 2. **`Terminal.Gui.Editor.sln.DotSettings` + `dotnet jb cleanupcode`** — ReSharper-driven cleanup ("TG.Editor Full Cleanup" profile). Catches what `dotnet format` misses (XML doc spacing, using sorting, name qualifier removal, expression-bodied conversions). CI runs `dotnet jb cleanupcode` and fails on any diff. The file is named `*.sln.DotSettings` (not `*.slnx.DotSettings`) even though the solution is `.slnx`: ReSharper/Rider/`jb` resolve the team-shared layer using the `.sln.` infix (the IDE writes its companion `.sln.DotSettings.user`). The cleanup profile **must** be stored in the modern single-string serialized-`<Profile>` format — ReSharper/`jb` 2024+ silently ignore the old per-task `…/=Name/CSReformatCode/@EntryIndexedValue` key layout, which makes the profile vanish from the IDE and unresolvable by `jb` (and CI's `|| true` then makes the cleanup gate a silent no-op). Edit the profile only via Rider → Settings | Code Cleanup → "Save to: This Solution Team-Shared".
 3. **A Stop hook in `.claude/settings.json`** that runs both tools on .cs files modified during the session before the agent reports done. Output is suppressed unless the cleanup actually changed something.
 
-**Before declaring work complete, an agent must run `dotnet tool restore && dotnet format Terminal.Gui.Editor.slnx --exclude third_party/ && dotnet jb cleanupcode Terminal.Gui.Editor.slnx --profile="TG.Editor Full Cleanup"` (the Stop hook does this automatically). If the cleanup adjusts files, those changes are part of the work — re-stage and continue.**
+**Before declaring work complete, an agent must run `.claude/hooks/cleanup-cs.ps1` (the Stop hook does this automatically). Then inspect the diff. If cleanup adjusted lifted AvaloniaEdit files (files with the `Adapted for Terminal.Gui from AvaloniaEdit` marker), revert those formatting-only changes before reporting done and fix the cleanup exclude list. Cleanup changes in non-lifted files are part of the work — re-stage and continue.**
 
 ### Formatting and spacing
 

README.md

@@ -4,7 +4,7 @@
 
 A reusable text-editing `View` for [Terminal.Gui](https://github.com/gui-cs/Terminal.Gui). Drop it into your TUI app and you get the editing experience users already expect (caret movement, selection, clipboard, undo/redo, search & replace, folding, syntax highlighting, word wrap) without writing any of it yourself.
 
-Ships as a single NuGet package: **[`Terminal.Gui.Editor`](https://www.nuget.org/packages/Terminal.Gui.Editor)**.
+Ships as a single NuGet package: **[`Terminal.Gui.Editor`](https://www.nuget.org/packages/Terminal.Gui.Editor)**. API documentation is published on the [Terminal.Gui DocFX site](https://gui-cs.github.io/Terminal.Gui/api/Terminal.Gui.Editor.html).
 
 ## What this is, and what it isn't
 

examples/ted/EditorSettingsDialog.cs

@@ -1,17 +1,17 @@
 using Terminal.Gui.Editor;
 using Terminal.Gui.Resources;
-using Terminal.Gui.Text.Indentation;
 using Terminal.Gui.ViewBase;
 using Terminal.Gui.Views;
 
 namespace Ted;
 
+/// <summary>
+///     Settings dialog for the editor clet. Provides tabs for Config and Tab Settings.
+/// </summary>
 internal sealed class EditorSettingsDialog : Dialog
 {
     private readonly CheckBox _autoCompleteCheck;
-    private readonly NumericUpDown<int> _indentSize;
-    private readonly CheckBox _convertTabsCheck;
-    private readonly CheckBox _autoIndentCheck;
+    private readonly EditorTabSettingsTab _tabSettingsTab;
 
     internal EditorSettingsDialog (Editor editor)
     {
@@ -20,44 +20,7 @@ internal EditorSettingsDialog (Editor editor)
         Height = 13;
 
         // --- Tab Settings tab ---
-        View tabSettingsTab = new ()
-        {
-            Title = "_Tab Settings"
-        };
-
-        View label = new Label { Text = "_Indent size:" };
-        _indentSize = new NumericUpDown<int>
-        {
-            X = Pos.Right (label) + 1,
-            Value = editor.IndentationSize
-        };
-        _indentSize.ValueChanging += (_, e) =>
-        {
-            if (e.NewValue < 1)
-            {
-                e.Handled = true;
-            }
-        };
-
-        _convertTabsCheck = new CheckBox
-        {
-            Y = Pos.Bottom (_indentSize),
-            Title = "Con_vert Tabs to Spaces",
-            Value = editor.ConvertTabsToSpaces ? CheckState.Checked : CheckState.UnChecked
-        };
-
-        _autoIndentCheck = new CheckBox
-        {
-            Y = Pos.Bottom (_convertTabsCheck),
-            Title = "_Auto Indent",
-            Value = editor.IndentationStrategy is not null ? CheckState.Checked : CheckState.UnChecked
-        };
-
-        tabSettingsTab.Add (
-            label,
-            _indentSize,
-            _convertTabsCheck,
-            _autoIndentCheck);
+        _tabSettingsTab = new EditorTabSettingsTab (editor);
 
         _autoCompleteCheck = new CheckBox
         {
@@ -77,7 +40,7 @@ internal EditorSettingsDialog (Editor editor)
         Tabs tabs = new ();
 
         tabs.InsertTab (0, configTab);
-        tabs.InsertTab (1, tabSettingsTab);
+        tabs.InsertTab (1, _tabSettingsTab);
 
         Button okBtn = new ()
         {
@@ -104,13 +67,12 @@ internal EditorSettingsDialog (Editor editor)
 
     internal bool WasAccepted { get; private set; }
 
+    /// <summary>
+    ///     Applies the accepted settings to the editor. Call only when <see cref="WasAccepted" /> is true.
+    /// </summary>
     internal void ApplyTo (Editor editor)
     {
-        editor.IndentationSize = Math.Max (1, _indentSize.Value);
-        editor.ConvertTabsToSpaces = _convertTabsCheck.Value == CheckState.Checked;
-        editor.IndentationStrategy = _autoIndentCheck.Value == CheckState.Checked
-            ? new DefaultIndentationStrategy ()
-            : null;
+        _tabSettingsTab.ApplyTo (editor);
         editor.CompletionProvider = _autoCompleteCheck.Value == CheckState.Checked
             ? new WordCompletionProvider ()
             : null;

examples/ted/TedApp.FileOperations.cs

@@ -263,7 +263,7 @@ internal void SetDocument (string text, string? filePath)
     /// <summary>Creates the <see cref="SaveDialog" /> used by <see cref="ShowDefaultSaveDialog" />.</summary>
     internal SaveDialog CreateSaveDialog ()
     {
-        return new SaveDialog { Title = "Save File As", AllowsMultipleSelection = false, OpenMode = OpenMode.File };
+        return new SaveDialog { Title = Strings.fdSaveAs, AllowsMultipleSelection = false, OpenMode = OpenMode.File };
     }
 
     private string? ShowDefaultSaveDialog ()
@@ -292,8 +292,8 @@ private SaveChangesChoice ShowDefaultSaveChangesDialog ()
             "Save changes?",
             "The document has unsaved changes. Save before quitting?",
             Strings.btnCancel,
-            "Do_n't Save",
-            Strings.btnSave);
+            Strings.btnNo,
+            Strings.btnYes);
 
         return result switch
         {

examples/ted/TedApp.cs

@@ -128,7 +128,7 @@ public TedApp (bool readOnly = false, string? configPath = null)
         Menu.ViewMenu.PopoverMenu!.Root!.Add (_previewMarkdownMenuItem);
         Menu.Add (new MenuBarItem ("_Options",
             [new MenuItem ("_Settings...", string.Empty, ShowSettingsDialog)]));
-        Menu.Add (new MenuBarItem ("_Help",
+        Menu.Add (new MenuBarItem (Strings.menuHelp,
             [new MenuItem ("_About", "About ted", ShowAboutDialog)]));
         _fileNameShortcut = new Shortcut (Key.Empty, "<untitled>", Open)
         {