From f153843d010d98f47261616b8a67c7d4a3b4c28e Mon Sep 17 00:00:00 2001
From: JC-Chung <52159296+JC-Chung@users.noreply.github.com>
Date: Fri, 31 Jul 2026 12:22:22 +0800
Subject: [PATCH 01/34] fix: off-by-one in commit message subject length
 calculation (#2596)

---
 src/Views/CommitMessageToolBox.axaml.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Views/CommitMessageToolBox.axaml.cs b/src/Views/CommitMessageToolBox.axaml.cs
index 214f7fd8b..90128444f 100644
--- a/src/Views/CommitMessageToolBox.axaml.cs
+++ b/src/Views/CommitMessageToolBox.axaml.cs
@@ -243,7 +243,7 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
                     }
                 }
 
-                if (lastLineStart < lastNonLineBreakCharIdx)
+                if (lastLineStart <= lastNonLineBreakCharIdx)
                 {
                     var validCharLen = text.Substring(lastLineStart).TrimEnd().Length;
                     if (subjectLen > 0)

From 13a95cd05de575a24748a1d4f22e54a68bd8fee2 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 31 Jul 2026 19:46:38 +0800
Subject: [PATCH 02/34] fix: the last auto-wrap character gets cropped in
 commit message editor (#2597)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/CommitMessageToolBox.axaml.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Views/CommitMessageToolBox.axaml.cs b/src/Views/CommitMessageToolBox.axaml.cs
index 90128444f..b8e8cd4dc 100644
--- a/src/Views/CommitMessageToolBox.axaml.cs
+++ b/src/Views/CommitMessageToolBox.axaml.cs
@@ -335,7 +335,7 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
                 // Sync the actual width to TextPresenter. Otherwise, `TextWrapping` will not work well without
                 // a fixed width. See https://github.com/AvaloniaUI/Avalonia/issues/5819
                 if (_textPresenter != null)
-                    _textPresenter.Width = Bounds.Width;
+                    _textPresenter.Width = Bounds.Width - 10.0;
             }
         }
 

From 18f178e0b314aab493478bfae7d2c66e8cada97a Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 31 Jul 2026 22:47:55 +0800
Subject: [PATCH 03/34] enhance: resize text presenter when scrollbar
 appeared/disappeared

---
 src/Views/CommitMessageToolBox.axaml.cs | 30 ++++++++++++++++---------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/Views/CommitMessageToolBox.axaml.cs b/src/Views/CommitMessageToolBox.axaml.cs
index b8e8cd4dc..efdff3ba4 100644
--- a/src/Views/CommitMessageToolBox.axaml.cs
+++ b/src/Views/CommitMessageToolBox.axaml.cs
@@ -151,7 +151,7 @@ public override void Render(DrawingContext context)
 
             if (y >= 0.05)
             {
-                var w = Bounds.Width;
+                var w = _scrollViewer != null ? (_scrollViewer.Viewport.Width + 10) : Bounds.Width;
                 var subjectEndTip = new FormattedText(
                     "SUBJECT END",
                     CultureInfo.CurrentCulture,
@@ -160,7 +160,7 @@ public override void Render(DrawingContext context)
                     10,
                     Brushes.Gray);
                 context.DrawLine(pen, new Point(0, y), new Point(w, y));
-                context.DrawText(subjectEndTip, new Point(w - subjectEndTip.WidthIncludingTrailingWhitespace - 18, y + 1));
+                context.DrawText(subjectEndTip, new Point(w - subjectEndTip.WidthIncludingTrailingWhitespace - 8, y + 1));
             }
 
             if (y == 0 && _subjectLen == 0)
@@ -330,13 +330,6 @@ protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs chang
                     Suggestions = null;
                 }
             }
-            else if (change.Property == BoundsProperty)
-            {
-                // Sync the actual width to TextPresenter. Otherwise, `TextWrapping` will not work well without
-                // a fixed width. See https://github.com/AvaloniaUI/Avalonia/issues/5819
-                if (_textPresenter != null)
-                    _textPresenter.Width = Bounds.Width - 10.0;
-            }
         }
 
         protected override void OnLostFocus(RoutedEventArgs e)
@@ -386,19 +379,34 @@ protected override void OnKeyDown(KeyEventArgs e)
 
         private void OnLayoutUpdated(object sender, EventArgs e)
         {
+            if (_textPresenter == null)
+            {
+                SubjectEndY = 0;
+                SuggestionPopupY = 0;
+                Suggestions = null;
+                return;
+            }
+
+            var requiredWidth = _scrollViewer?.Viewport.Width ?? Bounds.Width;
+            if (Math.Abs(_textPresenter.Bounds.Width - requiredWidth) >= 0.01)
+            {
+                _textPresenter.Width = requiredWidth;
+                return;
+            }
+
             if (_subjectEndCharIdx < 0)
             {
                 SubjectEndY = 0;
             }
             else
             {
-                var y = _textPresenter?.TextLayout.HitTestTextPosition(_subjectEndCharIdx).Bottom ?? 0.0;
+                var y = _textPresenter.TextLayout.HitTestTextPosition(_subjectEndCharIdx).Bottom;
                 var offset = _scrollViewer?.Offset.Y ?? 0;
                 SubjectEndY = y - offset + 6;
 
                 if (_suggestionMatchStartIdx >= 0)
                 {
-                    var popupY = _textPresenter?.TextLayout.HitTestTextPosition(_suggestionMatchStartIdx).Bottom ?? 0;
+                    var popupY = _textPresenter.TextLayout.HitTestTextPosition(_suggestionMatchStartIdx).Bottom;
                     y = popupY - offset;
                     if (y < 0.05 || y > Bounds.Height - 0.05)
                     {

From fb2a9901939cdc82e893dcf73ddd036bdce460f8 Mon Sep 17 00:00:00 2001
From: Moritz Wieland <81433802+mowi12@users.noreply.github.com>
Date: Mon, 3 Aug 2026 04:19:56 +0200
Subject: [PATCH 04/34] localization: complete German translations (#2600)

---
 src/Resources/Locales/de_DE.axaml | 107 ++++++++++++++++++++++++++++++
 1 file changed, 107 insertions(+)

diff --git a/src/Resources/Locales/de_DE.axaml b/src/Resources/Locales/de_DE.axaml
index 57a344c63..8148d225a 100644
--- a/src/Resources/Locales/de_DE.axaml
+++ b/src/Resources/Locales/de_DE.axaml
@@ -25,10 +25,16 @@
   <x:String x:Key="Text.AIAssistant.Model" xml:space="preserve">Modell</x:String>
   <x:String x:Key="Text.AIAssistant.Regen" xml:space="preserve">NEU GENERIEREN</x:String>
   <x:String x:Key="Text.AIAssistant.Tip" xml:space="preserve">Verwende AI, um Commit-Nachrichten zu generieren</x:String>
+  <x:String x:Key="Text.AIAssistant.Use" xml:space="preserve">Übernehmen</x:String>
   <x:String x:Key="Text.App.Hide" xml:space="preserve">SourceGit minimieren</x:String>
+  <x:String x:Key="Text.App.HideOthers" xml:space="preserve">Andere ausblenden</x:String>
   <x:String x:Key="Text.App.ShowAll" xml:space="preserve">Alles anzeigen</x:String>
+  <x:String x:Key="Text.Apply.3Way" xml:space="preserve">3-Way Merge</x:String>
   <x:String x:Key="Text.Apply.File.Placeholder" xml:space="preserve">Wähle die anzuwendende .patch-Datei</x:String>
   <x:String x:Key="Text.Apply.IgnoreWS" xml:space="preserve">Ignoriere Leerzeichen-Änderungen</x:String>
+  <x:String x:Key="Text.Apply.Source" xml:space="preserve">Quelle:</x:String>
+  <x:String x:Key="Text.Apply.Source.File" xml:space="preserve">Datei</x:String>
+  <x:String x:Key="Text.Apply.Source.Clipboard" xml:space="preserve">Zwischenablage</x:String>
   <x:String x:Key="Text.Apply.Title" xml:space="preserve">Patch anwenden</x:String>
   <x:String x:Key="Text.Apply.WS" xml:space="preserve">Leerzeichen:</x:String>
   <x:String x:Key="Text.ApplyStash" xml:space="preserve">Stash anwenden</x:String>
@@ -52,6 +58,8 @@
   <x:String x:Key="Text.Bisect.Bad">Schlecht</x:String>
   <x:String x:Key="Text.Bisect.Good">Gut</x:String>
   <x:String x:Key="Text.Bisect.Skip">Überspringen</x:String>
+  <x:String x:Key="Text.Bisect.WaitingForCheckoutAnother" xml:space="preserve">Bisecting. Einen anderen Commit auschecken und als gut oder schlecht markieren.</x:String>
+  <x:String x:Key="Text.Bisect.WaitingForFirstBad" xml:space="preserve">Bisecting. Aktuellen Commit als schlecht markieren oder einen anderen auschecken und als schlecht markieren.</x:String>
   <x:String x:Key="Text.Bisect.WaitingForFirstGood">Bisecting. Aktuellen Commit als gut oder schlecht markieren und einen anderen auschecken.</x:String>
   <x:String x:Key="Text.Bisect.WaitingForMark">Bisecting. Ist der aktuelle HEAD gut oder schlecht?</x:String>
   <x:String x:Key="Text.Blame" xml:space="preserve">Blame</x:String>
@@ -62,6 +70,7 @@
   <x:String x:Key="Text.BranchCM.CompareTwo" xml:space="preserve">Ausgewählte 2 Branches vergleichen</x:String>
   <x:String x:Key="Text.BranchCM.CompareWith" xml:space="preserve">Vergleichen mit…</x:String>
   <x:String x:Key="Text.BranchCM.CompareWithHead" xml:space="preserve">Vergleichen mit HEAD</x:String>
+  <x:String x:Key="Text.BranchCM.CompareWithSpecial" xml:space="preserve">Vergleichen mit ${0}$</x:String>
   <x:String x:Key="Text.BranchCM.CopyName" xml:space="preserve">Branch-Namen kopieren</x:String>
   <x:String x:Key="Text.BranchCM.CreatePR" xml:space="preserve">PR erstellen…</x:String>
   <x:String x:Key="Text.BranchCM.CreatePRForUpstream" xml:space="preserve">PR für Upstream ${0}$ erstellen…</x:String>
@@ -113,6 +122,12 @@
   <x:String x:Key="Text.Checkout.WarnUpdatingSubmodules" xml:space="preserve">Die folgenden Submodule müssen aktualisiert werden:{0}Möchtest du sie aktualisieren?</x:String>
   <x:String x:Key="Text.Checkout.WithFastForward" xml:space="preserve">Auschecken &amp; Fast Forward</x:String>
   <x:String x:Key="Text.Checkout.WithFastForward.Upstream" xml:space="preserve">Fast Forward zu:</x:String>
+  <x:String x:Key="Text.CheckoutBranchFromStash" xml:space="preserve">Branch aus Stash auschecken</x:String>
+  <x:String x:Key="Text.CheckoutBranchFromStash.Branch" xml:space="preserve">Neuer Branch:</x:String>
+  <x:String x:Key="Text.CheckoutBranchFromStash.Stash" xml:space="preserve">Stash:</x:String>
+  <x:String x:Key="Text.CheckoutDetached" xml:space="preserve">Commit oder Tag auschecken</x:String>
+  <x:String x:Key="Text.CheckoutDetached.Target" xml:space="preserve">Ziel:</x:String>
+  <x:String x:Key="Text.CheckoutDetached.Warning" xml:space="preserve">Achtung: Danach ist HEAD losgelöst (‚detached‘)</x:String>
   <x:String x:Key="Text.CherryPick" xml:space="preserve">Cherry Pick</x:String>
   <x:String x:Key="Text.CherryPick.AppendSourceToMessage" xml:space="preserve">Quelle an Commit-Nachricht anhängen</x:String>
   <x:String x:Key="Text.CherryPick.Commit" xml:space="preserve">Commit(s):</x:String>
@@ -124,6 +139,8 @@
   <x:String x:Key="Text.Clone" xml:space="preserve">Remote-Repository klonen</x:String>
   <x:String x:Key="Text.Clone.AdditionalParam" xml:space="preserve">Extra-Parameter:</x:String>
   <x:String x:Key="Text.Clone.AdditionalParam.Placeholder" xml:space="preserve">Zusätzliche Argumente für das Klonen des Repositorys. Optional.</x:String>
+  <x:String x:Key="Text.Clone.Bookmark" xml:space="preserve">Lesezeichen:</x:String>
+  <x:String x:Key="Text.Clone.Group" xml:space="preserve">Gruppe:</x:String>
   <x:String x:Key="Text.Clone.LocalName" xml:space="preserve">Lokaler Name:</x:String>
   <x:String x:Key="Text.Clone.LocalName.Placeholder" xml:space="preserve">Repository-Name. Optional.</x:String>
   <x:String x:Key="Text.Clone.ParentFolder" xml:space="preserve">Übergeordnetes Verzeichnis:</x:String>
@@ -131,14 +148,20 @@
   <x:String x:Key="Text.Clone.RemoteURL" xml:space="preserve">Repository-URL:</x:String>
   <x:String x:Key="Text.Close" xml:space="preserve">SCHLIESSEN</x:String>
   <x:String x:Key="Text.CodeEditor" xml:space="preserve">Editor</x:String>
+  <x:String x:Key="Text.CommandPalette.Branches" xml:space="preserve">Branches</x:String>
+  <x:String x:Key="Text.CommandPalette.BranchesAndTags" xml:space="preserve">Branches &amp; Tags</x:String>
+  <x:String x:Key="Text.CommandPalette.RepositoryActions" xml:space="preserve">Benutzerdefinierte Repository-Aktionen</x:String>
+  <x:String x:Key="Text.CommandPalette.RevisionFiles" xml:space="preserve">Dateien der Revision</x:String>
   <x:String x:Key="Text.CommitCM.Checkout" xml:space="preserve">Commit auschecken</x:String>
   <x:String x:Key="Text.CommitCM.CherryPick" xml:space="preserve">Diesen Commit cherry-picken</x:String>
   <x:String x:Key="Text.CommitCM.CherryPickMultiple" xml:space="preserve">Mehrere cherry-picken…</x:String>
   <x:String x:Key="Text.CommitCM.CompareWithHead" xml:space="preserve">Vergleiche mit HEAD</x:String>
   <x:String x:Key="Text.CommitCM.CompareWithWorktree" xml:space="preserve">Vergleiche mit Worktree</x:String>
   <x:String x:Key="Text.CommitCM.CopyAuthor" xml:space="preserve">Autor</x:String>
+  <x:String x:Key="Text.CommitCM.CopyAuthorTime" xml:space="preserve">Autor-Zeitpunkt</x:String>
   <x:String x:Key="Text.CommitCM.CopyCommitMessage" xml:space="preserve">Commit-Nachricht</x:String>
   <x:String x:Key="Text.CommitCM.CopyCommitter" xml:space="preserve">Committer</x:String>
+  <x:String x:Key="Text.CommitCM.CopyCommitterTime" xml:space="preserve">Committer-Zeitpunkt</x:String>
   <x:String x:Key="Text.CommitCM.CopySHA" xml:space="preserve">SHA</x:String>
   <x:String x:Key="Text.CommitCM.CopySubject" xml:space="preserve">Betreff</x:String>
   <x:String x:Key="Text.CommitCM.CustomAction" xml:space="preserve">Benutzerdefinierte Aktion</x:String>
@@ -158,6 +181,7 @@
   <x:String x:Key="Text.CommitDetail.Changes" xml:space="preserve">ÄNDERUNGEN</x:String>
   <x:String x:Key="Text.CommitDetail.Changes.Count" xml:space="preserve">geänderte Datei(en)</x:String>
   <x:String x:Key="Text.CommitDetail.Changes.Search" xml:space="preserve">Änderungen durchsuchen…</x:String>
+  <x:String x:Key="Text.CommitDetail.CollapseToBottom" xml:space="preserve">Details einklappen</x:String>
   <x:String x:Key="Text.CommitDetail.Files" xml:space="preserve">DATEIEN</x:String>
   <x:String x:Key="Text.CommitDetail.Files.LFS" xml:space="preserve">LFS-DATEI</x:String>
   <x:String x:Key="Text.CommitDetail.Files.Search" xml:space="preserve">Dateien durchsuchen…</x:String>
@@ -178,9 +202,15 @@
   <x:String x:Key="Text.CommitDetail.Info.SHA" xml:space="preserve">SHA</x:String>
   <x:String x:Key="Text.CommitDetail.Info.Signer" xml:space="preserve">Unterzeichner:</x:String>
   <x:String x:Key="Text.CommitDetail.Info.WebLinks" xml:space="preserve">Im Browser öffnen</x:String>
+  <x:String x:Key="Text.CommitMessageTextBox.Column" xml:space="preserve">SPALTE</x:String>
   <x:String x:Key="Text.CommitMessageTextBox.Placeholder" xml:space="preserve">Commit-Nachricht eingeben. Leerzeile zum Trennen von Betreff und Beschreibung verwenden!</x:String>
   <x:String x:Key="Text.CommitMessageTextBox.SubjectCount" xml:space="preserve">BETREFF</x:String>
   <x:String x:Key="Text.Compare" xml:space="preserve">Vergleichen</x:String>
+  <x:String x:Key="Text.Compare.Changes" xml:space="preserve">ÄNDERUNGEN</x:String>
+  <x:String x:Key="Text.Compare.Commits" xml:space="preserve">COMMITS</x:String>
+  <x:String x:Key="Text.Compare.Commits.LeftOnly" xml:space="preserve">NUR LINKS VORHANDENE COMMITS</x:String>
+  <x:String x:Key="Text.Compare.Commits.RightOnly" xml:space="preserve">NUR RECHTS VORHANDENE COMMITS</x:String>
+  <x:String x:Key="Text.Compare.Commits.Tips" xml:space="preserve">Tipp: Wenn die andere Seite HEAD ist, kannst du ausgewählte Commits über das Kontextmenü cherry-picken.</x:String>
   <x:String x:Key="Text.Configure" xml:space="preserve">Repository-Einstellungen</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate" xml:space="preserve">COMMIT-VORLAGE</x:String>
   <x:String x:Key="Text.Configure.CommitMessageTemplate.BuiltinVars" xml:space="preserve">Vordefinierte Parameter:
@@ -225,6 +255,7 @@ $1, $2, … Werte der Eingabe-Steuerelemente</x:String>
   <x:String x:Key="Text.Configure.Git.AutoFetchIntervalSuffix" xml:space="preserve">Minute(n)</x:String>
   <x:String x:Key="Text.Configure.Git.ConventionalTypesOverride" xml:space="preserve">Konventionelle Commit-Typen</x:String>
   <x:String x:Key="Text.Configure.Git.DefaultRemote" xml:space="preserve">Standard-Remote</x:String>
+  <x:String x:Key="Text.Configure.Git.EnableRecursiveWhenAutoUpdatingSubmodules" xml:space="preserve">`--recursive` beim Auto-Aktualisieren von Submodulen verwenden</x:String>
   <x:String x:Key="Text.Configure.Git.PreferredMergeMode" xml:space="preserve">Bevorzugter Merge-Modus</x:String>
   <x:String x:Key="Text.Configure.IssueTracker" xml:space="preserve">TICKETSYSTEM</x:String>
   <x:String x:Key="Text.Configure.IssueTracker.AddSampleAzure" xml:space="preserve">Beispiel für Azure-DevOps-Regel hinzufügen</x:String>
@@ -257,8 +288,11 @@ $1, $2, … Werte der Eingabe-Steuerelemente</x:String>
   <x:String x:Key="Text.ConfigureCustomActionControls.Label" xml:space="preserve">Bezeichnung:</x:String>
   <x:String x:Key="Text.ConfigureCustomActionControls.Options" xml:space="preserve">Einträge:</x:String>
   <x:String x:Key="Text.ConfigureCustomActionControls.Options.Tip" xml:space="preserve">Nutze ‚|‘, um Einträge zu trennen</x:String>
+  <x:String x:Key="Text.ConfigureCustomActionControls.StringFormatter" xml:space="preserve">String-Formatierung:</x:String>
+  <x:String x:Key="Text.ConfigureCustomActionControls.StringFormatter.Tip" xml:space="preserve">Optional. Formatiert die Ausgabe. Wird ignoriert, wenn die Eingabe leer ist. Verwende bitte `${VALUE}` als Platzhalter für die Eingabe.</x:String>
   <x:String x:Key="Text.ConfigureCustomActionControls.StringValue.Tip" xml:space="preserve">Die vordefinierten Parameter ${REPO}, ${REMOTE}, ${BRANCH}, ${BRANCH_FRIENDLY_NAME}, ${SHA}, ${FILE} und ${TAG} bleiben hier verwendbar</x:String>
   <x:String x:Key="Text.ConfigureCustomActionControls.Type" xml:space="preserve">Typ:</x:String>
+  <x:String x:Key="Text.ConfigureCustomActionControls.UseFriendlyName" xml:space="preserve">Kurznamen verwenden:</x:String>
   <x:String x:Key="Text.ConfigureWorkspace" xml:space="preserve">Arbeitsumgebungen</x:String>
   <x:String x:Key="Text.ConfigureWorkspace.Color" xml:space="preserve">Farbe</x:String>
   <x:String x:Key="Text.ConfigureWorkspace.Name" xml:space="preserve">Name</x:String>
@@ -266,6 +300,7 @@ $1, $2, … Werte der Eingabe-Steuerelemente</x:String>
   <x:String x:Key="Text.ConfirmEmptyCommit.Continue" xml:space="preserve">WEITER</x:String>
   <x:String x:Key="Text.ConfirmEmptyCommit.NoLocalChanges" xml:space="preserve">Leerer Commit erkannt! Möchtest du trotzdem fortfahren (--allow-empty)?</x:String>
   <x:String x:Key="Text.ConfirmEmptyCommit.StageAllThenCommit" xml:space="preserve">ALLES STAGEN &amp; COMMITTEN</x:String>
+  <x:String x:Key="Text.ConfirmEmptyCommit.StageSelectedThenCommit" xml:space="preserve">AUSGEWÄHLTE STAGEN &amp; COMMITTEN</x:String>
   <x:String x:Key="Text.ConfirmEmptyCommit.WithLocalChanges" xml:space="preserve">Leerer Commit erkannt! Möchtest du trotzdem fortfahren (--allow-empty) oder alle Änderungen stagen und dann committen?</x:String>
   <x:String x:Key="Text.ConfirmRestart.Title" xml:space="preserve">Neustart erforderlich</x:String>
   <x:String x:Key="Text.ConfirmRestart.Message" xml:space="preserve">Du musst dieses Programm neustarten, um die Änderungen zu übernehmen.</x:String>
@@ -278,6 +313,7 @@ $1, $2, … Werte der Eingabe-Steuerelemente</x:String>
   <x:String x:Key="Text.ConventionalCommit.Type" xml:space="preserve">Typ der Änderung:</x:String>
   <x:String x:Key="Text.Copy" xml:space="preserve">Kopieren</x:String>
   <x:String x:Key="Text.CopyAllText" xml:space="preserve">Gesamten Text kopieren</x:String>
+  <x:String x:Key="Text.CopyAsPatch" xml:space="preserve">Als Patch kopieren</x:String>
   <x:String x:Key="Text.CopyFullPath" xml:space="preserve">Ganzen Pfad kopieren</x:String>
   <x:String x:Key="Text.CopyPath" xml:space="preserve">Pfad kopieren</x:String>
   <x:String x:Key="Text.CreateBranch" xml:space="preserve">Branch erstellen…</x:String>
@@ -309,7 +345,9 @@ $1, $2, … Werte der Eingabe-Steuerelemente</x:String>
   <x:String x:Key="Text.DeinitSubmodule.Force" xml:space="preserve">Erzwinge Deinitialisierung, selbst wenn lokale Änderungen enthalten sind.</x:String>
   <x:String x:Key="Text.DeinitSubmodule.Path" xml:space="preserve">Submodul:</x:String>
   <x:String x:Key="Text.DeleteBranch" xml:space="preserve">Branch löschen</x:String>
+  <x:String x:Key="Text.DeleteBranch.AskForRemote" xml:space="preserve">Möchtest du auch den folgenden Remote-Branch löschen?</x:String>
   <x:String x:Key="Text.DeleteBranch.Branch" xml:space="preserve">Branch:</x:String>
+  <x:String x:Key="Text.DeleteBranch.Force" xml:space="preserve">Löschen erzwingen, auch bei nicht gemergten Commits</x:String>
   <x:String x:Key="Text.DeleteBranch.IsRemoteTip" xml:space="preserve">Du bist dabei, einen Remote-Branch zu löschen!!!</x:String>
   <x:String x:Key="Text.DeleteMultiBranch" xml:space="preserve">Mehrere Branches löschen</x:String>
   <x:String x:Key="Text.DeleteMultiBranch.Tip" xml:space="preserve">Du versuchst, mehrere Branches auf einmal zu löschen. Kontrolliere dies sorgfältig, bevor du fortfährst!</x:String>
@@ -330,6 +368,7 @@ $1, $2, … Werte der Eingabe-Steuerelemente</x:String>
   <x:String x:Key="Text.DeleteTag.Tag" xml:space="preserve">Tag:</x:String>
   <x:String x:Key="Text.DeleteTag.WithRemote" xml:space="preserve">Von Remote-Repositorys löschen</x:String>
   <x:String x:Key="Text.Diff.Binary" xml:space="preserve">BINÄRER VERGLEICH</x:String>
+  <x:String x:Key="Text.Diff.EmptyFile" xml:space="preserve">LEERE DATEI</x:String>
   <x:String x:Key="Text.Diff.First" xml:space="preserve">Erster Unterschied</x:String>
   <x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">Ignoriere Leerzeichen-Änderungen</x:String>
   <x:String x:Key="Text.Diff.Image.Blend" xml:space="preserve">ÜBEREINANDER</x:String>
@@ -349,6 +388,7 @@ $1, $2, … Werte der Eingabe-Steuerelemente</x:String>
   <x:String x:Key="Text.Diff.Submodule" xml:space="preserve">SUBMODUL</x:String>
   <x:String x:Key="Text.Diff.Submodule.Deleted" xml:space="preserve">GELÖSCHT</x:String>
   <x:String x:Key="Text.Diff.Submodule.New" xml:space="preserve">NEU</x:String>
+  <x:String x:Key="Text.Diff.Submodule.UncommittedChanges" xml:space="preserve">+ {0} nicht committete Änderungen</x:String>
   <x:String x:Key="Text.Diff.SwapCommits" xml:space="preserve">Seiten tauschen</x:String>
   <x:String x:Key="Text.Diff.SyntaxHighlight" xml:space="preserve">Syntax-Hervorhebung</x:String>
   <x:String x:Key="Text.Diff.ToggleWordWrap" xml:space="preserve">Zeilenumbruch</x:String>
@@ -365,6 +405,7 @@ $1, $2, … Werte der Eingabe-Steuerelemente</x:String>
   <x:String x:Key="Text.Discard.All" xml:space="preserve">Alle Änderungen in der Arbeitskopie.</x:String>
   <x:String x:Key="Text.Discard.Changes" xml:space="preserve">Änderungen:</x:String>
   <x:String x:Key="Text.Discard.IncludeIgnored" xml:space="preserve">Ignorierte Dateien einbeziehen</x:String>
+  <x:String x:Key="Text.Discard.IncludeModified" xml:space="preserve">Geänderte/gelöschte Dateien einbeziehen</x:String>
   <x:String x:Key="Text.Discard.IncludeUntracked" xml:space="preserve">Nicht-verfolgte Dateien einbeziehen</x:String>
   <x:String x:Key="Text.Discard.Total" xml:space="preserve">{0} Änderungen werden verworfen</x:String>
   <x:String x:Key="Text.Discard.Warning" xml:space="preserve">Du kannst das nicht rückgängig machen!!!</x:String>
@@ -400,14 +441,25 @@ $1, $2, … Werte der Eingabe-Steuerelemente</x:String>
   <x:String x:Key="Text.FileHistory" xml:space="preserve">Dateiverlauf</x:String>
   <x:String x:Key="Text.FileHistory.FileChange" xml:space="preserve">ÄNDERUNG</x:String>
   <x:String x:Key="Text.FileHistory.FileContent" xml:space="preserve">INHALT</x:String>
+  <x:String x:Key="Text.FileModeChange" xml:space="preserve">Dateimodus-Änderung: </x:String>
+  <x:String x:Key="Text.FileModeChange.Deleted" xml:space="preserve">Gelöschter Dateimodus: </x:String>
+  <x:String x:Key="Text.FileModeChange.Directory" xml:space="preserve">Verzeichnis</x:String>
+  <x:String x:Key="Text.FileModeChange.Executable" xml:space="preserve">Ausführbar</x:String>
+  <x:String x:Key="Text.FileModeChange.New" xml:space="preserve">Neuer Dateimodus: </x:String>
+  <x:String x:Key="Text.FileModeChange.Normal" xml:space="preserve">Normal</x:String>
+  <x:String x:Key="Text.FileModeChange.Submodule" xml:space="preserve">Submodul</x:String>
+  <x:String x:Key="Text.FileModeChange.Symlink" xml:space="preserve">Symlink</x:String>
+  <x:String x:Key="Text.FileModeChange.Unknown" xml:space="preserve">Unbekannt</x:String>
   <x:String x:Key="Text.GitFlow" xml:space="preserve">Git Flow</x:String>
   <x:String x:Key="Text.GitFlow.DevelopBranch" xml:space="preserve">Development-Branch:</x:String>
   <x:String x:Key="Text.GitFlow.Feature" xml:space="preserve">Feature:</x:String>
   <x:String x:Key="Text.GitFlow.FeaturePrefix" xml:space="preserve">Feature-Präfix:</x:String>
+  <x:String x:Key="Text.GitFlow.Finish" xml:space="preserve">Abschließen ${0}$</x:String>
   <x:String x:Key="Text.GitFlow.FinishFeature" xml:space="preserve">FLOW – Feature fertigstellen</x:String>
   <x:String x:Key="Text.GitFlow.FinishHotfix" xml:space="preserve">FLOW – Hotfix fertigstellen</x:String>
   <x:String x:Key="Text.GitFlow.FinishRelease" xml:space="preserve">FLOW – Release fertigstellen</x:String>
   <x:String x:Key="Text.GitFlow.FinishTarget" xml:space="preserve">Ziel:</x:String>
+  <x:String x:Key="Text.GitFlow.FinishWithRebase" xml:space="preserve">Vor dem Mergen rebasen</x:String>
   <x:String x:Key="Text.GitFlow.FinishWithSquash" xml:space="preserve">Squash beim Merge</x:String>
   <x:String x:Key="Text.GitFlow.Hotfix" xml:space="preserve">Hotfix:</x:String>
   <x:String x:Key="Text.GitFlow.HotfixPrefix" xml:space="preserve">Hotfix-Präfix:</x:String>
@@ -416,10 +468,12 @@ $1, $2, … Werte der Eingabe-Steuerelemente</x:String>
   <x:String x:Key="Text.GitFlow.ProductionBranch" xml:space="preserve">Production-Branch:</x:String>
   <x:String x:Key="Text.GitFlow.Release" xml:space="preserve">Release:</x:String>
   <x:String x:Key="Text.GitFlow.ReleasePrefix" xml:space="preserve">Release-Präfix:</x:String>
+  <x:String x:Key="Text.GitFlow.StartAt" xml:space="preserve">Beginnen bei:</x:String>
   <x:String x:Key="Text.GitFlow.StartFeature" xml:space="preserve">Feature beginnen…</x:String>
   <x:String x:Key="Text.GitFlow.StartFeatureTitle" xml:space="preserve">FLOW – Feature beginnen</x:String>
   <x:String x:Key="Text.GitFlow.StartHotfix" xml:space="preserve">Hotfix beginnen…</x:String>
   <x:String x:Key="Text.GitFlow.StartHotfixTitle" xml:space="preserve">FLOW – Hotfix beginnen</x:String>
+  <x:String x:Key="Text.GitFlow.StartName" xml:space="preserve">Name:</x:String>
   <x:String x:Key="Text.GitFlow.StartPlaceholder" xml:space="preserve">Namen eingeben</x:String>
   <x:String x:Key="Text.GitFlow.StartRelease" xml:space="preserve">Release beginnen…</x:String>
   <x:String x:Key="Text.GitFlow.StartReleaseTitle" xml:space="preserve">FLOW – Release beginnen</x:String>
@@ -453,17 +507,26 @@ $1, $2, … Werte der Eingabe-Steuerelemente</x:String>
   <x:String x:Key="Text.GitLFS.Remote" xml:space="preserve">Remote:</x:String>
   <x:String x:Key="Text.GitLFS.Track" xml:space="preserve">Verfolge alle ‚{0}‘ Dateien</x:String>
   <x:String x:Key="Text.GitLFS.TrackByExtension" xml:space="preserve">Verfolge alle *{0} Dateien</x:String>
+  <x:String x:Key="Text.GotoRevisionSelector" xml:space="preserve">Commit auswählen</x:String>
   <x:String x:Key="Text.Histories" xml:space="preserve">VERLAUF</x:String>
   <x:String x:Key="Text.Histories.Header.Author" xml:space="preserve">AUTOR</x:String>
   <x:String x:Key="Text.Histories.Header.AuthorTime" xml:space="preserve">AUTOR-ZEITPUNKT</x:String>
   <x:String x:Key="Text.Histories.Header.CommitTime" xml:space="preserve">COMMIT-ZEITPUNKT</x:String>
   <x:String x:Key="Text.Histories.Header.GraphAndSubject" xml:space="preserve">VERLAUF &amp; COMMIT-NACHRICHT</x:String>
   <x:String x:Key="Text.Histories.Header.SHA" xml:space="preserve">SHA</x:String>
+  <x:String x:Key="Text.Histories.HighlightsInGraph" xml:space="preserve">HERVORHEBUNGEN IM GRAPHEN</x:String>
+  <x:String x:Key="Text.Histories.HighlightsInGraph.All" xml:space="preserve">Alle</x:String>
+  <x:String x:Key="Text.Histories.HighlightsInGraph.CurrentBranchOnly" xml:space="preserve">Nur aktueller Branch</x:String>
+  <x:String x:Key="Text.Histories.HighlightsInGraph.CurrentBranchAndSelectedCommits" xml:space="preserve">Aktueller Branch &amp; ausgewählte Commits</x:String>
+  <x:String x:Key="Text.Histories.HighlightsInGraph.SelectedCommitsOnly" xml:space="preserve">Nur ausgewählte Commits</x:String>
   <x:String x:Key="Text.Histories.Selected" xml:space="preserve">{0} COMMITS AUSGEWÄHLT</x:String>
   <x:String x:Key="Text.Histories.ShowColumns" xml:space="preserve">SPALTEN ANZEIGEN</x:String>
   <x:String x:Key="Text.Histories.Tips" xml:space="preserve">Halte ‚Strg‘ oder ‚Umschalt‘, um mehrere Commits auszuwählen.</x:String>
   <x:String x:Key="Text.Histories.Tips.MacOS" xml:space="preserve">Halte ⌘ oder ⇧, um mehrere Commits auszuwählen</x:String>
   <x:String x:Key="Text.Histories.Tips.Prefix" xml:space="preserve">TIPPS:</x:String>
+  <x:String x:Key="Text.HistoriesDetailsStandalone" xml:space="preserve">In separatem Fenster öffnen</x:String>
+  <x:String x:Key="Text.HistoriesDetailsStandalone.CommitDetail" xml:space="preserve">Commit-Details</x:String>
+  <x:String x:Key="Text.HistoriesDetailsStandalone.RevisionCompare" xml:space="preserve">Revisionsvergleich</x:String>
   <x:String x:Key="Text.Hotkeys" xml:space="preserve">Tastaturkürzel-Referenz</x:String>
   <x:String x:Key="Text.Hotkeys.Global" xml:space="preserve">GLOBAL</x:String>
   <x:String x:Key="Text.Hotkeys.Global.Clone" xml:space="preserve">Klone neues Repository</x:String>
@@ -471,6 +534,7 @@ $1, $2, … Werte der Eingabe-Steuerelemente</x:String>
   <x:String x:Key="Text.Hotkeys.Global.GotoNextTab" xml:space="preserve">Zur nächsten Registerkarte wechseln</x:String>
   <x:String x:Key="Text.Hotkeys.Global.GotoPrevTab" xml:space="preserve">Zur vorherigen Registerkarte wechseln</x:String>
   <x:String x:Key="Text.Hotkeys.Global.NewTab" xml:space="preserve">Neue Registerkarte erstellen</x:String>
+  <x:String x:Key="Text.Hotkeys.Global.OpenLocalRepository" xml:space="preserve">Lokales Repository öffnen</x:String>
   <x:String x:Key="Text.Hotkeys.Global.OpenPreferences" xml:space="preserve">Einstellungen öffnen</x:String>
   <x:String x:Key="Text.Hotkeys.Global.ShowWorkspaceDropdownMenu" xml:space="preserve">Auswahlmenü für Arbeitsumgebungen anzeigen</x:String>
   <x:String x:Key="Text.Hotkeys.Global.SwitchTab" xml:space="preserve">Aktive Registerkarte wechseln</x:String>
@@ -479,14 +543,17 @@ $1, $2, … Werte der Eingabe-Steuerelemente</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Commit" xml:space="preserve">Gestagte Änderungen committen</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.CommitAndPush" xml:space="preserve">Gestagte Änderungen committen und pushen</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.CommitWithAutoStage" xml:space="preserve">Alle Änderungen stagen und committen</x:String>
+  <x:String x:Key="Text.Hotkeys.Repo.CreateBranch" xml:space="preserve">Neuen Branch erstellen</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Fetch" xml:space="preserve">Fetch, wird direkt ausgeführt</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.GoHome" xml:space="preserve">Dashboard-Modus (Standard)</x:String>
+  <x:String x:Key="Text.Hotkeys.Repo.GoToChild" xml:space="preserve">Springe zum Nachfolger des ausgewählten Commits</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.GoToParent" xml:space="preserve">Springe zum Vorgänger des ausgewählten Commits</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.OpenCommandPalette" xml:space="preserve">Befehlspalette öffnen</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.OpenSearchCommits" xml:space="preserve">Commit-Suchmodus</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Pull" xml:space="preserve">Pull, wird direkt ausgeführt</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Push" xml:space="preserve">Push, wird direkt ausgeführt</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.Refresh" xml:space="preserve">Erzwinge Neuladen des Repositorys</x:String>
+  <x:String x:Key="Text.Hotkeys.Repo.ToggleHistoriesDetailPanel" xml:space="preserve">Detailbereich im ‚VERLAUF‘ ein-/ausklappen</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.ViewChanges" xml:space="preserve">Wechsle zu ‚Änderungen‘</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.ViewHistories" xml:space="preserve">Wechsle zu ‚Verlauf‘</x:String>
   <x:String x:Key="Text.Hotkeys.Repo.ViewStashes" xml:space="preserve">Wechsle zu ‚Stashes‘</x:String>
@@ -494,6 +561,8 @@ $1, $2, … Werte der Eingabe-Steuerelemente</x:String>
   <x:String x:Key="Text.Hunk.Stage" xml:space="preserve">Stagen</x:String>
   <x:String x:Key="Text.Hunk.Unstage" xml:space="preserve">Unstagen</x:String>
   <x:String x:Key="Text.Init" xml:space="preserve">Initialisiere Repository</x:String>
+  <x:String x:Key="Text.Init.CommandTip" xml:space="preserve">Möchtest du `git init` in diesem Pfad ausführen?</x:String>
+  <x:String x:Key="Text.Init.ErrorMessageTip" xml:space="preserve">Öffnen des Repositorys fehlgeschlagen. Grund:  </x:String>
   <x:String x:Key="Text.Init.Path" xml:space="preserve">Pfad:</x:String>
   <x:String x:Key="Text.InProgress.CherryPick" xml:space="preserve">Cherry-Pick wird durchgeführt.</x:String>
   <x:String x:Key="Text.InProgress.CherryPick.Head" xml:space="preserve">Verarbeite Commit</x:String>
@@ -505,6 +574,7 @@ $1, $2, … Werte der Eingabe-Steuerelemente</x:String>
   <x:String x:Key="Text.InProgress.Revert.Head" xml:space="preserve">Reverte Commit</x:String>
   <x:String x:Key="Text.InteractiveRebase" xml:space="preserve">Interaktiver Rebase</x:String>
   <x:String x:Key="Text.InteractiveRebase.AutoStash" xml:space="preserve">Lokale Änderungen stashen &amp; wieder anwenden</x:String>
+  <x:String x:Key="Text.InteractiveRebase.NoVerify" xml:space="preserve">pre-rebase Hook überspringen</x:String>
   <x:String x:Key="Text.InteractiveRebase.On" xml:space="preserve">Auf:</x:String>
   <x:String x:Key="Text.InteractiveRebase.ReorderTip" xml:space="preserve">Drag &amp; Drop zum Anordnen der Commits</x:String>
   <x:String x:Key="Text.InteractiveRebase.Target" xml:space="preserve">Ziel-Branch:</x:String>
@@ -513,6 +583,7 @@ $1, $2, … Werte der Eingabe-Steuerelemente</x:String>
   <x:String x:Key="Text.Launcher.Commands" xml:space="preserve">Befehle</x:String>
   <x:String x:Key="Text.Launcher.Error" xml:space="preserve">FEHLER</x:String>
   <x:String x:Key="Text.Launcher.Info" xml:space="preserve">INFO</x:String>
+  <x:String x:Key="Text.Launcher.NewVersion" xml:space="preserve">Neue Version verfügbar</x:String>
   <x:String x:Key="Text.Launcher.OpenRepository" xml:space="preserve">Repositorys öffnen</x:String>
   <x:String x:Key="Text.Launcher.Pages" xml:space="preserve">Registerkarten</x:String>
   <x:String x:Key="Text.Launcher.Workspaces" xml:space="preserve">Arbeitsumgebungen</x:String>
@@ -521,6 +592,10 @@ $1, $2, … Werte der Eingabe-Steuerelemente</x:String>
   <x:String x:Key="Text.Merge.Into" xml:space="preserve">Ziel-Branch:</x:String>
   <x:String x:Key="Text.Merge.Mode" xml:space="preserve">Merge-Option:</x:String>
   <x:String x:Key="Text.Merge.Source" xml:space="preserve">Quelle:</x:String>
+  <x:String x:Key="Text.Merge.Test" xml:space="preserve">Merge wird geprüft…</x:String>
+  <x:String x:Key="Text.Merge.Test.NoConflicts" xml:space="preserve">Merge ist ohne Konflikte möglich</x:String>
+  <x:String x:Key="Text.Merge.Test.UnknownError" xml:space="preserve">Unbekannter Fehler bei der Merge-Prüfung</x:String>
+  <x:String x:Key="Text.Merge.Test.WillCauseConflicts" xml:space="preserve">Merge wird Konflikte verursachen</x:String>
   <x:String x:Key="Text.MergeConflictEditor.AcceptBoth.MineFirst" xml:space="preserve">Zuerst meine, dann deren</x:String>
   <x:String x:Key="Text.MergeConflictEditor.AcceptBoth.TheirsFirst" xml:space="preserve">Zuerst deren, dann meine</x:String>
   <x:String x:Key="Text.MergeConflictEditor.UseBoth" xml:space="preserve">BEIDE VERWENDEN</x:String>
@@ -554,6 +629,10 @@ $1, $2, … Werte der Eingabe-Steuerelemente</x:String>
   <x:String x:Key="Text.OpenAppDataDir" xml:space="preserve">Programmdaten-Ordner öffnen</x:String>
   <x:String x:Key="Text.OpenFile" xml:space="preserve">Datei öffnen</x:String>
   <x:String x:Key="Text.OpenInExternalMergeTool" xml:space="preserve">Öffnen in externem Merge-Tool</x:String>
+  <x:String x:Key="Text.OpenLocalRepository" xml:space="preserve">Lokales Repository öffnen</x:String>
+  <x:String x:Key="Text.OpenLocalRepository.Bookmark" xml:space="preserve">Lesezeichen:</x:String>
+  <x:String x:Key="Text.OpenLocalRepository.Group" xml:space="preserve">Gruppe:</x:String>
+  <x:String x:Key="Text.OpenLocalRepository.Path" xml:space="preserve">Ordner:</x:String>
   <x:String x:Key="Text.Optional" xml:space="preserve">Optional.</x:String>
   <x:String x:Key="Text.PageTabBar.New" xml:space="preserve">Neue Registerkarte erstellen</x:String>
   <x:String x:Key="Text.PageTabBar.Tab.Close" xml:space="preserve">Registerkarte schließen</x:String>
@@ -577,7 +656,10 @@ $1, $2, … Werte der Eingabe-Steuerelemente</x:String>
   <x:String x:Key="Text.Period.Yesterday" xml:space="preserve">Gestern</x:String>
   <x:String x:Key="Text.Preferences" xml:space="preserve">Einstellungen</x:String>
   <x:String x:Key="Text.Preferences.AI" xml:space="preserve">AI</x:String>
+  <x:String x:Key="Text.Preferences.AI.AdditionalPrompt" xml:space="preserve">Zusätzlicher Prompt (Verwende `-`, um deine Anforderungen aufzulisten)</x:String>
   <x:String x:Key="Text.Preferences.AI.ApiKey" xml:space="preserve">API-Schlüssel</x:String>
+  <x:String x:Key="Text.Preferences.AI.Model" xml:space="preserve">Modell</x:String>
+  <x:String x:Key="Text.Preferences.AI.Model.AutoFetchAvailableModels" xml:space="preserve">Verfügbare Modell-IDs automatisch abrufen</x:String>
   <x:String x:Key="Text.Preferences.AI.Name" xml:space="preserve">Name</x:String>
   <x:String x:Key="Text.Preferences.AI.ReadApiKeyFromEnv" xml:space="preserve">Der eingegebene Wert ist der Name der Umgebungsvariable, aus der der API-Schlüssel gelesen wird</x:String>
   <x:String x:Key="Text.Preferences.AI.Server" xml:space="preserve">Server</x:String>
@@ -609,8 +691,11 @@ $1, $2, … Werte der Eingabe-Steuerelemente</x:String>
   <x:String x:Key="Text.Preferences.General.MaxHistoryCommits" xml:space="preserve">Commit-Historie</x:String>
   <x:String x:Key="Text.Preferences.General.ShowChangesPageByDefault" xml:space="preserve">Standardmäßig ‚ÄNDERUNGEN‘-Ansicht anzeigen</x:String>
   <x:String x:Key="Text.Preferences.General.ShowChangesTabInCommitDetailByDefault" xml:space="preserve">Standardmäßig Registerkarte ‚ÄNDERUNGEN‘ in Commit-Details anzeigen</x:String>
+  <x:String x:Key="Text.Preferences.General.ShowRelativeTimeInGraph" xml:space="preserve">Relative Zeitangaben im Commit-Graphen anzeigen</x:String>
   <x:String x:Key="Text.Preferences.General.ShowTagsInGraph" xml:space="preserve">Zeige Tags im Commit-Verlauf</x:String>
   <x:String x:Key="Text.Preferences.General.SubjectGuideLength" xml:space="preserve">Längenvorgabe für Commit-Nachrichten</x:String>
+  <x:String x:Key="Text.Preferences.General.Use24Hours" xml:space="preserve">24-Stunden-Format</x:String>
+  <x:String x:Key="Text.Preferences.General.UseCompactBranchNames" xml:space="preserve">Kompakte Branch-Namen im Commit-Graphen verwenden</x:String>
   <x:String x:Key="Text.Preferences.General.UseGitHubStyleAvatar" xml:space="preserve">Standard-Avatar im GitHub-Stil generieren</x:String>
   <x:String x:Key="Text.Preferences.Git" xml:space="preserve">GIT</x:String>
   <x:String x:Key="Text.Preferences.Git.CRLF" xml:space="preserve">Aktiviere Auto-CRLF</x:String>
@@ -625,6 +710,7 @@ $1, $2, … Werte der Eingabe-Steuerelemente</x:String>
   <x:String x:Key="Text.Preferences.Git.UseLibsecret" xml:space="preserve">git-credential-libsecret statt git-credential-manager verwenden</x:String>
   <x:String x:Key="Text.Preferences.Git.User" xml:space="preserve">Benutzername</x:String>
   <x:String x:Key="Text.Preferences.Git.User.Placeholder" xml:space="preserve">Globaler Git-Benutzername</x:String>
+  <x:String x:Key="Text.Preferences.Git.UseStashAndReapplyByDefault" xml:space="preserve">Änderungen beim Auschecken oder Mergen von Branches standardmäßig stashen &amp; wieder anwenden</x:String>
   <x:String x:Key="Text.Preferences.Git.Version" xml:space="preserve">Git-Version</x:String>
   <x:String x:Key="Text.Preferences.GPG" xml:space="preserve">GPG-SIGNIERUNG</x:String>
   <x:String x:Key="Text.Preferences.GPG.CommitEnabled" xml:space="preserve">Commit-Signierung</x:String>
@@ -672,7 +758,12 @@ $1, $2, … Werte der Eingabe-Steuerelemente</x:String>
   <x:String x:Key="Text.Quit" xml:space="preserve">Schließen</x:String>
   <x:String x:Key="Text.Rebase" xml:space="preserve">Aktuellen Branch rebasen</x:String>
   <x:String x:Key="Text.Rebase.AutoStash" xml:space="preserve">Lokale Änderungen stashen &amp; wieder anwenden</x:String>
+  <x:String x:Key="Text.Rebase.NoVerify" xml:space="preserve">pre-rebase Hook überspringen</x:String>
   <x:String x:Key="Text.Rebase.On" xml:space="preserve">Auf:</x:String>
+  <x:String x:Key="Text.Rebase.Test" xml:space="preserve">Rebase wird geprüft…</x:String>
+  <x:String x:Key="Text.Rebase.Test.OK" xml:space="preserve">Rebase ist ohne Konflikte möglich</x:String>
+  <x:String x:Key="Text.Rebase.Test.UnknownError" xml:space="preserve">Unbekannter Fehler bei der Rebase-Prüfung</x:String>
+  <x:String x:Key="Text.Rebase.Test.WillCauseConflicts" xml:space="preserve">Rebase wird Konflikte verursachen</x:String>
   <x:String x:Key="Text.Remote.AddTitle" xml:space="preserve">Remote hinzufügen</x:String>
   <x:String x:Key="Text.Remote.EditTitle" xml:space="preserve">Remote bearbeiten</x:String>
   <x:String x:Key="Text.Remote.Name" xml:space="preserve">Name:</x:String>
@@ -683,6 +774,7 @@ $1, $2, … Werte der Eingabe-Steuerelemente</x:String>
   <x:String x:Key="Text.RemoteCM.CustomAction" xml:space="preserve">Benutzerdefinierte Aktion</x:String>
   <x:String x:Key="Text.RemoteCM.Delete" xml:space="preserve">Löschen…</x:String>
   <x:String x:Key="Text.RemoteCM.Edit" xml:space="preserve">Bearbeiten…</x:String>
+  <x:String x:Key="Text.RemoteCM.EnableAutoFetch" xml:space="preserve">Auto-Fetch aktivieren</x:String>
   <x:String x:Key="Text.RemoteCM.Fetch" xml:space="preserve">Fetch</x:String>
   <x:String x:Key="Text.RemoteCM.OpenInBrowser" xml:space="preserve">Im Browser öffnen</x:String>
   <x:String x:Key="Text.RemoteCM.Prune" xml:space="preserve">Prune</x:String>
@@ -711,9 +803,12 @@ $1, $2, … Werte der Eingabe-Steuerelemente</x:String>
   <x:String x:Key="Text.Repository.Explore" xml:space="preserve">Öffne im Datei-Browser</x:String>
   <x:String x:Key="Text.Repository.Filter" xml:space="preserve">Suche Branches / Tags / Submodule</x:String>
   <x:String x:Key="Text.Repository.FilterCommits" xml:space="preserve">Sichtbarkeit im Verlauf</x:String>
+  <x:String x:Key="Text.Repository.FilterCommits.Collapse" xml:space="preserve">Filter einklappen</x:String>
   <x:String x:Key="Text.Repository.FilterCommits.Default" xml:space="preserve">Aufheben</x:String>
   <x:String x:Key="Text.Repository.FilterCommits.Exclude" xml:space="preserve">Im Verlauf ausblenden</x:String>
+  <x:String x:Key="Text.Repository.FilterCommits.Expand" xml:space="preserve">Filter ausklappen</x:String>
   <x:String x:Key="Text.Repository.FilterCommits.Include" xml:space="preserve">Im Verlauf filtern</x:String>
+  <x:String x:Key="Text.Repository.FilterCommits.Summary" xml:space="preserve">Filter aktiv</x:String>
   <x:String x:Key="Text.Repository.HistoriesLayout" xml:space="preserve">LAYOUT</x:String>
   <x:String x:Key="Text.Repository.HistoriesLayout.Horizontal" xml:space="preserve">Horizontal</x:String>
   <x:String x:Key="Text.Repository.HistoriesLayout.Vertical" xml:space="preserve">Vertikal</x:String>
@@ -811,6 +906,8 @@ $1, $2, … Werte der Eingabe-Steuerelemente</x:String>
   <x:String x:Key="Text.Stash.TipForSelectedFiles" xml:space="preserve">Gestagte und ungestagte Änderungen der ausgewählten Datei(en) werden gestasht!!!</x:String>
   <x:String x:Key="Text.Stash.Title" xml:space="preserve">Lokale Änderungen stashen</x:String>
   <x:String x:Key="Text.StashCM.Apply" xml:space="preserve">Anwenden</x:String>
+  <x:String x:Key="Text.StashCM.ApplyFileChanges" xml:space="preserve">Änderungen anwenden</x:String>
+  <x:String x:Key="Text.StashCM.Branch" xml:space="preserve">Neuen Branch auschecken</x:String>
   <x:String x:Key="Text.StashCM.CopyMessage" xml:space="preserve">Kopiere Nachricht</x:String>
   <x:String x:Key="Text.StashCM.Drop" xml:space="preserve">Entfernen</x:String>
   <x:String x:Key="Text.StashCM.SaveAsPatch" xml:space="preserve">Als Patch speichern…</x:String>
@@ -847,9 +944,12 @@ $1, $2, … Werte der Eingabe-Steuerelemente</x:String>
   <x:String x:Key="Text.Submodule.Status.Unmerged" xml:space="preserve">nicht gemerged</x:String>
   <x:String x:Key="Text.Submodule.Update" xml:space="preserve">Aktualisieren</x:String>
   <x:String x:Key="Text.Submodule.URL" xml:space="preserve">URL</x:String>
+  <x:String x:Key="Text.SubmoduleRevisionCompare" xml:space="preserve">Details der Submodul-Änderung</x:String>
+  <x:String x:Key="Text.SubmoduleRevisionCompare.OpenDetails" xml:space="preserve">DETAILS ÖFFNEN</x:String>
   <x:String x:Key="Text.Sure" xml:space="preserve">OK</x:String>
   <x:String x:Key="Text.Tag.Tagger" xml:space="preserve">TAGGER</x:String>
   <x:String x:Key="Text.Tag.Time" xml:space="preserve">ZEIT</x:String>
+  <x:String x:Key="Text.TagCM.Checkout" xml:space="preserve">Tag auschecken…</x:String>
   <x:String x:Key="Text.TagCM.CompareTwo" xml:space="preserve">Vergleiche 2 Tags</x:String>
   <x:String x:Key="Text.TagCM.CompareWith" xml:space="preserve">Vergleichen mit…</x:String>
   <x:String x:Key="Text.TagCM.CompareWithHead" xml:space="preserve">Vergleichen mit HEAD</x:String>
@@ -860,11 +960,13 @@ $1, $2, … Werte der Eingabe-Steuerelemente</x:String>
   <x:String x:Key="Text.TagCM.CustomAction" xml:space="preserve">Benutzerdefinierte Aktion</x:String>
   <x:String x:Key="Text.TagCM.Delete" xml:space="preserve">Lösche ${0}$…</x:String>
   <x:String x:Key="Text.TagCM.DeleteMultiple" xml:space="preserve">Lösche ausgewählte {0} Tags…</x:String>
+  <x:String x:Key="Text.TagCM.Merge" xml:space="preserve">Merge ${0}$ in ${1}$ hinein…</x:String>
   <x:String x:Key="Text.TagCM.Push" xml:space="preserve">Pushe ${0}$…</x:String>
   <x:String x:Key="Text.UpdateSubmodules" xml:space="preserve">Submodule aktualisieren</x:String>
   <x:String x:Key="Text.UpdateSubmodules.All" xml:space="preserve">Alle Submodule</x:String>
   <x:String x:Key="Text.UpdateSubmodules.Init" xml:space="preserve">Bei Bedarf initialisieren</x:String>
   <x:String x:Key="Text.UpdateSubmodules.Target" xml:space="preserve">Submodul:</x:String>
+  <x:String x:Key="Text.UpdateSubmodules.Recursive" xml:space="preserve">Verschachtelte Submodule aktualisieren</x:String>
   <x:String x:Key="Text.UpdateSubmodules.UpdateToRemoteTrackingBranch" xml:space="preserve">Auf verfolgten Remote-Branch des Submoduls aktualisieren</x:String>
   <x:String x:Key="Text.URL" xml:space="preserve">URL:</x:String>
   <x:String x:Key="Text.ViewLogs" xml:space="preserve">Logs</x:String>
@@ -891,6 +993,7 @@ $1, $2, … Werte der Eingabe-Steuerelemente</x:String>
   <x:String x:Key="Text.WorkingCopy.AddToGitIgnore.ExtensionInSameFolder" xml:space="preserve">Ignoriere *{0} Dateien im selben Ordner</x:String>
   <x:String x:Key="Text.WorkingCopy.AddToGitIgnore.InFolder" xml:space="preserve">Ignoriere nicht-verfolgte Dateien in diesem Ordner</x:String>
   <x:String x:Key="Text.WorkingCopy.AddToGitIgnore.SingleFile" xml:space="preserve">Ignoriere nur diese Datei</x:String>
+  <x:String x:Key="Text.WorkingCopy.AddToGitIgnore.UntrackedInSameFolder" xml:space="preserve">Ignoriere alle nicht-verfolgten Dateien im selben Ordner</x:String>
   <x:String x:Key="Text.WorkingCopy.Amend" xml:space="preserve">Nachbesserung</x:String>
   <x:String x:Key="Text.WorkingCopy.CanStageTip" xml:space="preserve">Du kannst diese Datei jetzt stagen.</x:String>
   <x:String x:Key="Text.WorkingCopy.ClearCommitHistories" xml:space="preserve">Verlauf löschen</x:String>
@@ -910,6 +1013,7 @@ $1, $2, … Werte der Eingabe-Steuerelemente</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts.Resolved" xml:space="preserve">DATEI-KONFLIKTE SIND GELÖST</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts.UseMine" xml:space="preserve">MEINE VERSION VERWENDEN</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts.UseTheirs" xml:space="preserve">DEREN VERSION VERWENDEN</x:String>
+  <x:String x:Key="Text.WorkingCopy.FilterChanges" xml:space="preserve">Änderungen filtern…</x:String>
   <x:String x:Key="Text.WorkingCopy.IncludeUntracked" xml:space="preserve">NICHT-VERFOLGTE DATEIEN EINBEZIEHEN</x:String>
   <x:String x:Key="Text.WorkingCopy.NoCommitHistories" xml:space="preserve">KEINE BISHERIGEN COMMIT-NACHRICHTEN</x:String>
   <x:String x:Key="Text.WorkingCopy.NoCommitTemplates" xml:space="preserve">KEINE COMMIT-VORLAGEN</x:String>
@@ -927,9 +1031,12 @@ $1, $2, … Werte der Eingabe-Steuerelemente</x:String>
   <x:String x:Key="Text.Workspace" xml:space="preserve">ARBEITSUMGEBUNG: </x:String>
   <x:String x:Key="Text.Workspace.Configure" xml:space="preserve">Arbeitsumgebungen konfigurieren…</x:String>
   <x:String x:Key="Text.Worktree" xml:space="preserve">WORKTREE</x:String>
+  <x:String x:Key="Text.Worktree.Branch" xml:space="preserve">BRANCH</x:String>
   <x:String x:Key="Text.Worktree.CopyPath" xml:space="preserve">Pfad kopieren</x:String>
+  <x:String x:Key="Text.Worktree.Head" xml:space="preserve">HEAD</x:String>
   <x:String x:Key="Text.Worktree.Lock" xml:space="preserve">Sperren</x:String>
   <x:String x:Key="Text.Worktree.Open" xml:space="preserve">Öffnen</x:String>
+  <x:String x:Key="Text.Worktree.Path" xml:space="preserve">PFAD</x:String>
   <x:String x:Key="Text.Worktree.Remove" xml:space="preserve">Entfernen</x:String>
   <x:String x:Key="Text.Worktree.Unlock" xml:space="preserve">Entsperren</x:String>
   <x:String x:Key="Text.Yes" xml:space="preserve">JA</x:String>

From 4ade74dd848d347f023548dcc9dc527f9e03bd2b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 3 Aug 2026 02:20:05 +0000
Subject: [PATCH 05/34] doc: Update translation status and sort locale files

---
 TRANSLATION.md | 115 +------------------------------------------------
 1 file changed, 1 insertion(+), 114 deletions(-)

diff --git a/TRANSLATION.md b/TRANSLATION.md
index 47960c547..949216104 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -6,120 +6,7 @@ This document shows the translation status of each locale file in the repository
 
 ### ![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)
 
-### ![de__DE](https://img.shields.io/badge/de__DE-89.52%25-yellow)
-
-<details>
-<summary>Missing keys in de_DE.axaml</summary>
-
-- Text.AIAssistant.Use
-- Text.App.HideOthers
-- Text.Apply.3Way
-- Text.Apply.Source
-- Text.Apply.Source.File
-- Text.Apply.Source.Clipboard
-- Text.Bisect.WaitingForCheckoutAnother
-- Text.Bisect.WaitingForFirstBad
-- Text.BranchCM.CompareWithSpecial
-- Text.CheckoutBranchFromStash
-- Text.CheckoutBranchFromStash.Branch
-- Text.CheckoutBranchFromStash.Stash
-- Text.CheckoutDetached
-- Text.CheckoutDetached.Target
-- Text.CheckoutDetached.Warning
-- Text.Clone.Bookmark
-- Text.Clone.Group
-- Text.CommandPalette.Branches
-- Text.CommandPalette.BranchesAndTags
-- Text.CommandPalette.RepositoryActions
-- Text.CommandPalette.RevisionFiles
-- Text.CommitCM.CopyAuthorTime
-- Text.CommitCM.CopyCommitterTime
-- Text.CommitDetail.CollapseToBottom
-- Text.CommitMessageTextBox.Column
-- Text.Compare.Changes
-- Text.Compare.Commits
-- Text.Compare.Commits.LeftOnly
-- Text.Compare.Commits.RightOnly
-- Text.Compare.Commits.Tips
-- Text.Configure.Git.EnableRecursiveWhenAutoUpdatingSubmodules
-- Text.ConfigureCustomActionControls.StringFormatter
-- Text.ConfigureCustomActionControls.StringFormatter.Tip
-- Text.ConfigureCustomActionControls.UseFriendlyName
-- Text.ConfirmEmptyCommit.StageSelectedThenCommit
-- Text.CopyAsPatch
-- Text.DeleteBranch.AskForRemote
-- Text.DeleteBranch.Force
-- Text.Diff.EmptyFile
-- Text.Diff.Submodule.UncommittedChanges
-- Text.Discard.IncludeModified
-- Text.FileModeChange
-- Text.FileModeChange.Deleted
-- Text.FileModeChange.Directory
-- Text.FileModeChange.Executable
-- Text.FileModeChange.New
-- Text.FileModeChange.Normal
-- Text.FileModeChange.Submodule
-- Text.FileModeChange.Symlink
-- Text.FileModeChange.Unknown
-- Text.GitFlow.Finish
-- Text.GitFlow.FinishWithRebase
-- Text.GitFlow.StartAt
-- Text.GitFlow.StartName
-- Text.GotoRevisionSelector
-- Text.Histories.HighlightsInGraph
-- Text.Histories.HighlightsInGraph.All
-- Text.Histories.HighlightsInGraph.CurrentBranchOnly
-- Text.Histories.HighlightsInGraph.CurrentBranchAndSelectedCommits
-- Text.Histories.HighlightsInGraph.SelectedCommitsOnly
-- Text.HistoriesDetailsStandalone
-- Text.HistoriesDetailsStandalone.CommitDetail
-- Text.HistoriesDetailsStandalone.RevisionCompare
-- Text.Hotkeys.Global.OpenLocalRepository
-- Text.Hotkeys.Repo.CreateBranch
-- Text.Hotkeys.Repo.GoToChild
-- Text.Hotkeys.Repo.ToggleHistoriesDetailPanel
-- Text.Init.CommandTip
-- Text.Init.ErrorMessageTip
-- Text.InteractiveRebase.NoVerify
-- Text.Launcher.NewVersion
-- Text.Merge.Test
-- Text.Merge.Test.NoConflicts
-- Text.Merge.Test.UnknownError
-- Text.Merge.Test.WillCauseConflicts
-- Text.OpenLocalRepository
-- Text.OpenLocalRepository.Bookmark
-- Text.OpenLocalRepository.Group
-- Text.OpenLocalRepository.Path
-- Text.Preferences.AI.AdditionalPrompt
-- Text.Preferences.AI.Model
-- Text.Preferences.AI.Model.AutoFetchAvailableModels
-- Text.Preferences.General.ShowRelativeTimeInGraph
-- Text.Preferences.General.Use24Hours
-- Text.Preferences.General.UseCompactBranchNames
-- Text.Preferences.Git.UseStashAndReapplyByDefault
-- Text.Rebase.NoVerify
-- Text.Rebase.Test
-- Text.Rebase.Test.OK
-- Text.Rebase.Test.UnknownError
-- Text.Rebase.Test.WillCauseConflicts
-- Text.RemoteCM.EnableAutoFetch
-- Text.Repository.FilterCommits.Collapse
-- Text.Repository.FilterCommits.Expand
-- Text.Repository.FilterCommits.Summary
-- Text.StashCM.ApplyFileChanges
-- Text.StashCM.Branch
-- Text.SubmoduleRevisionCompare
-- Text.SubmoduleRevisionCompare.OpenDetails
-- Text.TagCM.Checkout
-- Text.TagCM.Merge
-- Text.UpdateSubmodules.Recursive
-- Text.WorkingCopy.AddToGitIgnore.UntrackedInSameFolder
-- Text.WorkingCopy.FilterChanges
-- Text.Worktree.Branch
-- Text.Worktree.Head
-- Text.Worktree.Path
-
-</details>
+### ![de__DE](https://img.shields.io/badge/de__DE-%E2%88%9A-brightgreen)
 
 ### ![el__GR](https://img.shields.io/badge/el__GR-99.51%25-yellow)
 

From 4a970e67d7af37e482e92ab33a207381110e0539 Mon Sep 17 00:00:00 2001
From: Moritz Wieland <81433802+mowi12@users.noreply.github.com>
Date: Mon, 3 Aug 2026 04:20:15 +0200
Subject: [PATCH 06/34] fix: remove stray placeholder in de_DE
 MergeConflictEditor.Title translation (#2601)

---
 src/Resources/Locales/de_DE.axaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Resources/Locales/de_DE.axaml b/src/Resources/Locales/de_DE.axaml
index 8148d225a..2fbc94c69 100644
--- a/src/Resources/Locales/de_DE.axaml
+++ b/src/Resources/Locales/de_DE.axaml
@@ -607,7 +607,7 @@ $1, $2, … Werte der Eingabe-Steuerelemente</x:String>
   <x:String x:Key="Text.MergeConflictEditor.Result" xml:space="preserve">ERGEBNIS</x:String>
   <x:String x:Key="Text.MergeConflictEditor.SaveAndStage" xml:space="preserve">SPEICHERN &amp; STAGEN</x:String>
   <x:String x:Key="Text.MergeConflictEditor.Theirs" xml:space="preserve">DEREN</x:String>
-  <x:String x:Key="Text.MergeConflictEditor.Title" xml:space="preserve">Merge-Konflikt – {0}</x:String>
+  <x:String x:Key="Text.MergeConflictEditor.Title" xml:space="preserve">Merge-Konflikte</x:String>
   <x:String x:Key="Text.MergeConflictEditor.UnsavedChanges" xml:space="preserve">Ungespeicherte Änderungen verwerfen?</x:String>
   <x:String x:Key="Text.MergeConflictEditor.UseMine" xml:space="preserve">MEINE VERWENDEN</x:String>
   <x:String x:Key="Text.MergeConflictEditor.UseTheirs" xml:space="preserve">DEREN VERWENDEN</x:String>

From 22dbdf72c300a4998f7063fb70a4b3d9b5714c83 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 3 Aug 2026 10:55:21 +0800
Subject: [PATCH 07/34] feature: add syntax highlighting for `erlang` and
 `OCaml` (#2598) (#2602)

Signed-off-by: leo <longshuang@msn.cn>
---
 THIRD-PARTY-LICENSES.md            |   14 +
 src/Models/TextMateHelper.cs       |    2 +
 src/Resources/Grammars/erlang.json | 1753 ++++++++++++++++
 src/Resources/Grammars/ocaml.json  | 2961 ++++++++++++++++++++++++++++
 4 files changed, 4730 insertions(+)
 create mode 100644 src/Resources/Grammars/erlang.json
 create mode 100644 src/Resources/Grammars/ocaml.json

diff --git a/THIRD-PARTY-LICENSES.md b/THIRD-PARTY-LICENSES.md
index e2600fb4f..d10d08be2 100644
--- a/THIRD-PARTY-LICENSES.md
+++ b/THIRD-PARTY-LICENSES.md
@@ -112,3 +112,17 @@ The project uses the following third-party libraries or assets
 - **Commit**: 68d98dc57f8486c2946ae28dc86bf8e91d45da4d
 - **License**: MIT License
 - **License Link**: https://github.com/vuejs/language-tools/blob/68d98dc57f8486c2946ae28dc86bf8e91d45da4d/LICENSE
+
+### OCaml
+
+- **Source**: https://github.com/shentao/vue-multiselect/blob/master/docs/shiki/languages/ocaml.tmLanguage.json
+- **Commit**: 8092917041f0ae02cbe4c6982deddc931c6adecd
+- **License**: MIT License
+- **License Link**: https://github.com/shentao/vue-multiselect/blob/master/LICENSE
+
+### Erlang
+
+- **Source**: https://github.com/shentao/vue-multiselect/blob/master/docs/shiki/languages/erlang.tmLanguage.json
+- **Commit**: 8092917041f0ae02cbe4c6982deddc931c6adecd
+- **License**: MIT License
+- **License Link**: https://github.com/shentao/vue-multiselect/blob/master/LICENSE
\ No newline at end of file
diff --git a/src/Models/TextMateHelper.cs b/src/Models/TextMateHelper.cs
index 5bb50da69..0dd3b5ac7 100644
--- a/src/Models/TextMateHelper.cs
+++ b/src/Models/TextMateHelper.cs
@@ -27,6 +27,8 @@ public static class GrammarUtility
             new ExtraGrammar("source.hxml", [".hxml"], "hxml.json"),
             new ExtraGrammar("text.html.jsp", [".jsp", ".jspf", ".tag"], "jsp.json"),
             new ExtraGrammar("source.vue", [".vue"], "vue.json"),
+            new ExtraGrammar("source.erlang", [".erl", ".escript", ".hrl"], "erlang.json"),
+            new ExtraGrammar("source.ocaml", [".ml", ".mli"], "ocaml.json"),
         ];
 
         private static readonly Dictionary<string, IRawGrammar> s_cachedRawGrammars = new();
diff --git a/src/Resources/Grammars/erlang.json b/src/Resources/Grammars/erlang.json
new file mode 100644
index 000000000..216086ce5
--- /dev/null
+++ b/src/Resources/Grammars/erlang.json
@@ -0,0 +1,1753 @@
+{
+  "comment": "The recognition of function definitions and compiler directives (such as module, record and macro definitions) requires that each of the aforementioned constructs must be the first string inside a line (except for whitespace).  Also, the function/module/record/macro names must be given unquoted.  -- desp",
+  "fileTypes": ["erl", "escript", "hrl", "xrl", "yrl"],
+  "keyEquivalent": "^~E",
+  "name": "erlang",
+  "patterns": [
+    {
+      "include": "#module-directive"
+    },
+    {
+      "include": "#import-export-directive"
+    },
+    {
+      "include": "#behaviour-directive"
+    },
+    {
+      "include": "#record-directive"
+    },
+    {
+      "include": "#define-directive"
+    },
+    {
+      "include": "#macro-directive"
+    },
+    {
+      "include": "#directive"
+    },
+    {
+      "include": "#function"
+    },
+    {
+      "include": "#everything-else"
+    }
+  ],
+  "repository": {
+    "atom": {
+      "patterns": [
+        {
+          "begin": "(')",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.definition.symbol.begin.erlang"
+            }
+          },
+          "end": "(')",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.symbol.end.erlang"
+            }
+          },
+          "name": "constant.other.symbol.quoted.single.erlang",
+          "patterns": [
+            {
+              "captures": {
+                "1": {
+                  "name": "punctuation.definition.escape.erlang"
+                },
+                "3": {
+                  "name": "punctuation.definition.escape.erlang"
+                }
+              },
+              "match": "(\\\\)([bdefnrstv\\\\'\"]|(\\^)[@-_a-z]|[0-7]{1,3}|x[\\da-fA-F]{2})",
+              "name": "constant.other.symbol.escape.erlang"
+            },
+            {
+              "match": "\\\\\\^?.?",
+              "name": "invalid.illegal.atom.erlang"
+            }
+          ]
+        },
+        {
+          "match": "[a-z][a-zA-Z\\d@_]*+",
+          "name": "constant.other.symbol.unquoted.erlang"
+        }
+      ]
+    },
+    "behaviour-directive": {
+      "captures": {
+        "1": {
+          "name": "punctuation.section.directive.begin.erlang"
+        },
+        "2": {
+          "name": "keyword.control.directive.behaviour.erlang"
+        },
+        "3": {
+          "name": "punctuation.definition.parameters.begin.erlang"
+        },
+        "4": {
+          "name": "entity.name.type.class.behaviour.definition.erlang"
+        },
+        "5": {
+          "name": "punctuation.definition.parameters.end.erlang"
+        },
+        "6": {
+          "name": "punctuation.section.directive.end.erlang"
+        }
+      },
+      "match": "^\\s*+(-)\\s*+(behaviour)\\s*+(\\()\\s*+([a-z][a-zA-Z\\d@_]*+)\\s*+(\\))\\s*+(\\.)",
+      "name": "meta.directive.behaviour.erlang"
+    },
+    "binary": {
+      "begin": "(<<)",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.definition.binary.begin.erlang"
+        }
+      },
+      "end": "(>>)",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.binary.end.erlang"
+        }
+      },
+      "name": "meta.structure.binary.erlang",
+      "patterns": [
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.binary.erlang"
+            },
+            "2": {
+              "name": "punctuation.separator.value-size.erlang"
+            }
+          },
+          "match": "(,)|(:)"
+        },
+        {
+          "include": "#internal-type-specifiers"
+        },
+        {
+          "include": "#everything-else"
+        }
+      ]
+    },
+    "character": {
+      "patterns": [
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.character.erlang"
+            },
+            "2": {
+              "name": "constant.character.escape.erlang"
+            },
+            "3": {
+              "name": "punctuation.definition.escape.erlang"
+            },
+            "5": {
+              "name": "punctuation.definition.escape.erlang"
+            }
+          },
+          "match": "(\\$)((\\\\)([bdefnrstv\\\\'\"]|(\\^)[@-_a-z]|[0-7]{1,3}|x[\\da-fA-F]{2}))",
+          "name": "constant.character.erlang"
+        },
+        {
+          "match": "\\$\\\\\\^?.?",
+          "name": "invalid.illegal.character.erlang"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.character.erlang"
+            }
+          },
+          "match": "(\\$)[ \\S]",
+          "name": "constant.character.erlang"
+        },
+        {
+          "match": "\\$.?",
+          "name": "invalid.illegal.character.erlang"
+        }
+      ]
+    },
+    "comment": {
+      "begin": "(^[ \\t]+)?(?=%)",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.whitespace.comment.leading.erlang"
+        }
+      },
+      "end": "(?!\\G)",
+      "patterns": [
+        {
+          "begin": "%",
+          "beginCaptures": {
+            "0": {
+              "name": "punctuation.definition.comment.erlang"
+            }
+          },
+          "end": "\\n",
+          "name": "comment.line.percentage.erlang"
+        }
+      ]
+    },
+    "define-directive": {
+      "patterns": [
+        {
+          "begin": "^\\s*+(-)\\s*+(define)\\s*+(\\()\\s*+([a-zA-Z\\d@_]++)\\s*+",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.section.directive.begin.erlang"
+            },
+            "2": {
+              "name": "keyword.control.directive.define.erlang"
+            },
+            "3": {
+              "name": "punctuation.definition.parameters.begin.erlang"
+            },
+            "4": {
+              "name": "entity.name.function.macro.definition.erlang"
+            }
+          },
+          "end": "(\\))\\s*+(\\.)",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.parameters.end.erlang"
+            },
+            "2": {
+              "name": "punctuation.section.directive.end.erlang"
+            }
+          },
+          "name": "meta.directive.define.erlang",
+          "patterns": [
+            {
+              "include": "#everything-else"
+            }
+          ]
+        },
+        {
+          "begin": "(?=^\\s*+-\\s*+define\\s*+\\(\\s*+[a-zA-Z\\d@_]++\\s*+\\()",
+          "end": "(\\))\\s*+(\\.)",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.parameters.end.erlang"
+            },
+            "2": {
+              "name": "punctuation.section.directive.end.erlang"
+            }
+          },
+          "name": "meta.directive.define.erlang",
+          "patterns": [
+            {
+              "begin": "^\\s*+(-)\\s*+(define)\\s*+(\\()\\s*+([a-zA-Z\\d@_]++)\\s*+(\\()",
+              "beginCaptures": {
+                "1": {
+                  "name": "punctuation.section.directive.begin.erlang"
+                },
+                "2": {
+                  "name": "keyword.control.directive.define.erlang"
+                },
+                "3": {
+                  "name": "punctuation.definition.parameters.begin.erlang"
+                },
+                "4": {
+                  "name": "entity.name.function.macro.definition.erlang"
+                },
+                "5": {
+                  "name": "punctuation.definition.parameters.begin.erlang"
+                }
+              },
+              "end": "(\\))\\s*(,)",
+              "endCaptures": {
+                "1": {
+                  "name": "punctuation.definition.parameters.end.erlang"
+                },
+                "2": {
+                  "name": "punctuation.separator.parameters.erlang"
+                }
+              },
+              "patterns": [
+                {
+                  "match": ",",
+                  "name": "punctuation.separator.parameters.erlang"
+                },
+                {
+                  "include": "#everything-else"
+                }
+              ]
+            },
+            {
+              "match": "\\|\\||\\||:|;|,|\\.|->",
+              "name": "punctuation.separator.define.erlang"
+            },
+            {
+              "include": "#everything-else"
+            }
+          ]
+        }
+      ]
+    },
+    "directive": {
+      "patterns": [
+        {
+          "begin": "^\\s*+(-)\\s*+([a-z][a-zA-Z\\d@_]*+)\\s*+(\\(?)",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.section.directive.begin.erlang"
+            },
+            "2": {
+              "name": "keyword.control.directive.erlang"
+            },
+            "3": {
+              "name": "punctuation.definition.parameters.begin.erlang"
+            }
+          },
+          "end": "(\\)?)\\s*+(\\.)",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.parameters.end.erlang"
+            },
+            "2": {
+              "name": "punctuation.section.directive.end.erlang"
+            }
+          },
+          "name": "meta.directive.erlang",
+          "patterns": [
+            {
+              "include": "#everything-else"
+            }
+          ]
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.section.directive.begin.erlang"
+            },
+            "2": {
+              "name": "keyword.control.directive.erlang"
+            },
+            "3": {
+              "name": "punctuation.section.directive.end.erlang"
+            }
+          },
+          "match": "^\\s*+(-)\\s*+([a-z][a-zA-Z\\d@_]*+)\\s*+(\\.)",
+          "name": "meta.directive.erlang"
+        }
+      ]
+    },
+    "everything-else": {
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#record-usage"
+        },
+        {
+          "include": "#macro-usage"
+        },
+        {
+          "include": "#expression"
+        },
+        {
+          "include": "#keyword"
+        },
+        {
+          "include": "#textual-operator"
+        },
+        {
+          "include": "#language-constant"
+        },
+        {
+          "include": "#function-call"
+        },
+        {
+          "include": "#tuple"
+        },
+        {
+          "include": "#list"
+        },
+        {
+          "include": "#binary"
+        },
+        {
+          "include": "#parenthesized-expression"
+        },
+        {
+          "include": "#character"
+        },
+        {
+          "include": "#number"
+        },
+        {
+          "include": "#atom"
+        },
+        {
+          "include": "#string"
+        },
+        {
+          "include": "#symbolic-operator"
+        },
+        {
+          "include": "#variable"
+        }
+      ]
+    },
+    "expression": {
+      "patterns": [
+        {
+          "begin": "\\b(if)\\b",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.if.erlang"
+            }
+          },
+          "end": "\\b(end)\\b",
+          "endCaptures": {
+            "1": {
+              "name": "keyword.control.end.erlang"
+            }
+          },
+          "name": "meta.expression.if.erlang",
+          "patterns": [
+            {
+              "include": "#internal-expression-punctuation"
+            },
+            {
+              "include": "#everything-else"
+            }
+          ]
+        },
+        {
+          "begin": "\\b(case)\\b",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.case.erlang"
+            }
+          },
+          "end": "\\b(end)\\b",
+          "endCaptures": {
+            "1": {
+              "name": "keyword.control.end.erlang"
+            }
+          },
+          "name": "meta.expression.case.erlang",
+          "patterns": [
+            {
+              "include": "#internal-expression-punctuation"
+            },
+            {
+              "include": "#everything-else"
+            }
+          ]
+        },
+        {
+          "begin": "\\b(receive)\\b",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.receive.erlang"
+            }
+          },
+          "end": "\\b(end)\\b",
+          "endCaptures": {
+            "1": {
+              "name": "keyword.control.end.erlang"
+            }
+          },
+          "name": "meta.expression.receive.erlang",
+          "patterns": [
+            {
+              "include": "#internal-expression-punctuation"
+            },
+            {
+              "include": "#everything-else"
+            }
+          ]
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "keyword.control.fun.erlang"
+            },
+            "4": {
+              "name": "entity.name.type.class.module.erlang"
+            },
+            "5": {
+              "name": "variable.other.erlang"
+            },
+            "6": {
+              "name": "punctuation.separator.module-function.erlang"
+            },
+            "8": {
+              "name": "entity.name.function.erlang"
+            },
+            "9": {
+              "name": "variable.other.erlang"
+            },
+            "10": {
+              "name": "punctuation.separator.function-arity.erlang"
+            }
+          },
+          "comment": "Implicit function expression with optional module qualifier when both module and function can be atom or variable",
+          "match": "\\b(fun)\\s+((([a-z][a-zA-Z\\d@_]*+)|(_[a-zA-Z\\d@_]++|[A-Z][a-zA-Z\\d@_]*+))\\s*+(:)\\s*+)?(([a-z][a-zA-Z\\d@_]*+|'[^']*+')|(_[a-zA-Z\\d@_]++|[A-Z][a-zA-Z\\d@_]*+))\\s*(/)",
+          "name": "meta.expression.fun.implicit.erlang"
+        },
+        {
+          "begin": "\\b(fun)\\s+(([a-z][a-zA-Z\\d@_]*+)|(_[a-zA-Z\\d@_]++|[A-Z][a-zA-Z\\d@_]*+))\\s*+(:)",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.fun.erlang"
+            },
+            "3": {
+              "name": "entity.name.type.class.module.erlang"
+            },
+            "4": {
+              "name": "variable.other.erlang"
+            },
+            "5": {
+              "name": "punctuation.separator.module-function.erlang"
+            }
+          },
+          "comment": "Implicit function expression with module qualifier when module can be atom or variable and function can by anything",
+          "end": "(/)",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.separator.function-arity.erlang"
+            }
+          },
+          "name": "meta.expression.fun.implicit.erlang",
+          "patterns": [
+            {
+              "include": "#everything-else"
+            }
+          ]
+        },
+        {
+          "begin": "\\b(fun)\\s+(?!\\()",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.fun.erlang"
+            }
+          },
+          "comment": "Implicit function expression when both module and function can by anything",
+          "end": "(/)",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.separator.function-arity.erlang"
+            }
+          },
+          "name": "meta.expression.fun.implicit.erlang",
+          "patterns": [
+            {
+              "include": "#everything-else"
+            }
+          ]
+        },
+        {
+          "begin": "\\b(fun)\\s*+(\\()(?=(\\s*+\\())",
+          "beginCaptures": {
+            "1": {
+              "name": "entity.name.function.erlang"
+            },
+            "2": {
+              "name": "punctuation.definition.parameters.begin.erlang"
+            }
+          },
+          "comment": "Function type in type specification",
+          "end": "(\\))",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.parameters.end.erlang"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#everything-else"
+            }
+          ]
+        },
+        {
+          "begin": "\\b(fun)\\b",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.fun.erlang"
+            }
+          },
+          "comment": "Explicit function expression",
+          "end": "\\b(end)\\b",
+          "endCaptures": {
+            "1": {
+              "name": "keyword.control.end.erlang"
+            }
+          },
+          "name": "meta.expression.fun.erlang",
+          "patterns": [
+            {
+              "begin": "(?=\\()",
+              "end": "(;)|(?=\\bend\\b)",
+              "endCaptures": {
+                "1": {
+                  "name": "punctuation.separator.clauses.erlang"
+                }
+              },
+              "patterns": [
+                {
+                  "include": "#internal-function-parts"
+                }
+              ]
+            },
+            {
+              "include": "#everything-else"
+            }
+          ]
+        },
+        {
+          "begin": "\\b(try)\\b",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.try.erlang"
+            }
+          },
+          "end": "\\b(end)\\b",
+          "endCaptures": {
+            "1": {
+              "name": "keyword.control.end.erlang"
+            }
+          },
+          "name": "meta.expression.try.erlang",
+          "patterns": [
+            {
+              "include": "#internal-expression-punctuation"
+            },
+            {
+              "include": "#everything-else"
+            }
+          ]
+        },
+        {
+          "begin": "\\b(begin)\\b",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.begin.erlang"
+            }
+          },
+          "end": "\\b(end)\\b",
+          "endCaptures": {
+            "1": {
+              "name": "keyword.control.end.erlang"
+            }
+          },
+          "name": "meta.expression.begin.erlang",
+          "patterns": [
+            {
+              "include": "#internal-expression-punctuation"
+            },
+            {
+              "include": "#everything-else"
+            }
+          ]
+        },
+        {
+          "begin": "\\b(maybe)\\b",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.control.maybe.erlang"
+            }
+          },
+          "end": "\\b(end)\\b",
+          "endCaptures": {
+            "1": {
+              "name": "keyword.control.end.erlang"
+            }
+          },
+          "name": "meta.expression.maybe.erlang",
+          "patterns": [
+            {
+              "include": "#internal-expression-punctuation"
+            },
+            {
+              "include": "#everything-else"
+            }
+          ]
+        }
+      ]
+    },
+    "function": {
+      "begin": "^\\s*+([a-z][a-zA-Z\\d@_]*+|'[^']*+')\\s*+(?=\\()",
+      "beginCaptures": {
+        "1": {
+          "name": "entity.name.function.definition.erlang"
+        }
+      },
+      "end": "(\\.)",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.terminator.function.erlang"
+        }
+      },
+      "name": "meta.function.erlang",
+      "patterns": [
+        {
+          "captures": {
+            "1": {
+              "name": "entity.name.function.erlang"
+            }
+          },
+          "match": "^\\s*+([a-z][a-zA-Z\\d@_]*+|'[^']*+')\\s*+(?=\\()"
+        },
+        {
+          "begin": "(?=\\()",
+          "end": "(;)|(?=\\.)",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.separator.clauses.erlang"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#parenthesized-expression"
+            },
+            {
+              "include": "#internal-function-parts"
+            }
+          ]
+        },
+        {
+          "include": "#everything-else"
+        }
+      ]
+    },
+    "function-call": {
+      "begin": "(?=([a-z][a-zA-Z\\d@_]*+|'[^']*+'|_[a-zA-Z\\d@_]++|[A-Z][a-zA-Z\\d@_]*+)\\s*+(\\(|:\\s*+([a-z][a-zA-Z\\d@_]*+|'[^']*+'|_[a-zA-Z\\d@_]++|[A-Z][a-zA-Z\\d@_]*+)\\s*+\\())",
+      "end": "(\\))",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.parameters.end.erlang"
+        }
+      },
+      "name": "meta.function-call.erlang",
+      "patterns": [
+        {
+          "begin": "((erlang)\\s*+(:)\\s*+)?(is_atom|is_binary|is_constant|is_float|is_function|is_integer|is_list|is_number|is_pid|is_port|is_reference|is_tuple|is_record|abs|element|hd|length|node|round|self|size|tl|trunc)\\s*+(\\()",
+          "beginCaptures": {
+            "2": {
+              "name": "entity.name.type.class.module.erlang"
+            },
+            "3": {
+              "name": "punctuation.separator.module-function.erlang"
+            },
+            "4": {
+              "name": "entity.name.function.guard.erlang"
+            },
+            "5": {
+              "name": "punctuation.definition.parameters.begin.erlang"
+            }
+          },
+          "end": "(?=\\))",
+          "patterns": [
+            {
+              "match": ",",
+              "name": "punctuation.separator.parameters.erlang"
+            },
+            {
+              "include": "#everything-else"
+            }
+          ]
+        },
+        {
+          "begin": "((([a-z][a-zA-Z\\d@_]*+|'[^']*+')|(_[a-zA-Z\\d@_]++|[A-Z][a-zA-Z\\d@_]*+))\\s*+(:)\\s*+)?(([a-z][a-zA-Z\\d@_]*+|'[^']*+')|(_[a-zA-Z\\d@_]++|[A-Z][a-zA-Z\\d@_]*+))\\s*+(\\()",
+          "beginCaptures": {
+            "3": {
+              "name": "entity.name.type.class.module.erlang"
+            },
+            "4": {
+              "name": "variable.other.erlang"
+            },
+            "5": {
+              "name": "punctuation.separator.module-function.erlang"
+            },
+            "7": {
+              "name": "entity.name.function.erlang"
+            },
+            "8": {
+              "name": "variable.other.erlang"
+            },
+            "9": {
+              "name": "punctuation.definition.parameters.begin.erlang"
+            }
+          },
+          "end": "(?=\\))",
+          "patterns": [
+            {
+              "match": ",",
+              "name": "punctuation.separator.parameters.erlang"
+            },
+            {
+              "include": "#everything-else"
+            }
+          ]
+        }
+      ]
+    },
+    "import-export-directive": {
+      "patterns": [
+        {
+          "begin": "^\\s*+(-)\\s*+(import)\\s*+(\\()\\s*+([a-z][a-zA-Z\\d@_]*+|'[^']*+')\\s*+(,)",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.section.directive.begin.erlang"
+            },
+            "2": {
+              "name": "keyword.control.directive.import.erlang"
+            },
+            "3": {
+              "name": "punctuation.definition.parameters.begin.erlang"
+            },
+            "4": {
+              "name": "entity.name.type.class.module.erlang"
+            },
+            "5": {
+              "name": "punctuation.separator.parameters.erlang"
+            }
+          },
+          "end": "(\\))\\s*+(\\.)",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.parameters.end.erlang"
+            },
+            "2": {
+              "name": "punctuation.section.directive.end.erlang"
+            }
+          },
+          "name": "meta.directive.import.erlang",
+          "patterns": [
+            {
+              "include": "#internal-function-list"
+            }
+          ]
+        },
+        {
+          "begin": "^\\s*+(-)\\s*+(export)\\s*+(\\()",
+          "beginCaptures": {
+            "1": {
+              "name": "punctuation.section.directive.begin.erlang"
+            },
+            "2": {
+              "name": "keyword.control.directive.export.erlang"
+            },
+            "3": {
+              "name": "punctuation.definition.parameters.begin.erlang"
+            }
+          },
+          "end": "(\\))\\s*+(\\.)",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.definition.parameters.end.erlang"
+            },
+            "2": {
+              "name": "punctuation.section.directive.end.erlang"
+            }
+          },
+          "name": "meta.directive.export.erlang",
+          "patterns": [
+            {
+              "include": "#internal-function-list"
+            }
+          ]
+        }
+      ]
+    },
+    "internal-expression-punctuation": {
+      "captures": {
+        "1": {
+          "name": "punctuation.separator.clause-head-body.erlang"
+        },
+        "2": {
+          "name": "punctuation.separator.clauses.erlang"
+        },
+        "3": {
+          "name": "punctuation.separator.expressions.erlang"
+        }
+      },
+      "match": "(->)|(;)|(,)"
+    },
+    "internal-function-list": {
+      "begin": "(\\[)",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.definition.list.begin.erlang"
+        }
+      },
+      "end": "(\\])",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.list.end.erlang"
+        }
+      },
+      "name": "meta.structure.list.function.erlang",
+      "patterns": [
+        {
+          "begin": "([a-z][a-zA-Z\\d@_]*+|'[^']*+')\\s*+(/)",
+          "beginCaptures": {
+            "1": {
+              "name": "entity.name.function.erlang"
+            },
+            "2": {
+              "name": "punctuation.separator.function-arity.erlang"
+            }
+          },
+          "end": "(,)|(?=\\])",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.separator.list.erlang"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#everything-else"
+            }
+          ]
+        },
+        {
+          "include": "#everything-else"
+        }
+      ]
+    },
+    "internal-function-parts": {
+      "patterns": [
+        {
+          "begin": "(?=\\()",
+          "end": "(->)",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.separator.clause-head-body.erlang"
+            }
+          },
+          "patterns": [
+            {
+              "begin": "(\\()",
+              "beginCaptures": {
+                "1": {
+                  "name": "punctuation.definition.parameters.begin.erlang"
+                }
+              },
+              "end": "(\\))",
+              "endCaptures": {
+                "1": {
+                  "name": "punctuation.definition.parameters.end.erlang"
+                }
+              },
+              "patterns": [
+                {
+                  "match": ",",
+                  "name": "punctuation.separator.parameters.erlang"
+                },
+                {
+                  "include": "#everything-else"
+                }
+              ]
+            },
+            {
+              "match": ",|;",
+              "name": "punctuation.separator.guards.erlang"
+            },
+            {
+              "include": "#everything-else"
+            }
+          ]
+        },
+        {
+          "match": ",",
+          "name": "punctuation.separator.expressions.erlang"
+        },
+        {
+          "include": "#everything-else"
+        }
+      ]
+    },
+    "internal-record-body": {
+      "begin": "(\\{)",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.definition.class.record.begin.erlang"
+        }
+      },
+      "end": "(\\})",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.class.record.end.erlang"
+        }
+      },
+      "name": "meta.structure.record.erlang",
+      "patterns": [
+        {
+          "begin": "(([a-z][a-zA-Z\\d@_]*+|'[^']*+')|(_))",
+          "beginCaptures": {
+            "2": {
+              "name": "variable.other.field.erlang"
+            },
+            "3": {
+              "name": "variable.language.omitted.field.erlang"
+            }
+          },
+          "end": "(,)|(?=\\})",
+          "endCaptures": {
+            "1": {
+              "name": "punctuation.separator.class.record.erlang"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#everything-else"
+            }
+          ]
+        },
+        {
+          "include": "#everything-else"
+        }
+      ]
+    },
+    "internal-type-specifiers": {
+      "begin": "(/)",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.separator.value-type.erlang"
+        }
+      },
+      "end": "(?=,|:|>>)",
+      "patterns": [
+        {
+          "captures": {
+            "1": {
+              "name": "storage.type.erlang"
+            },
+            "2": {
+              "name": "storage.modifier.signedness.erlang"
+            },
+            "3": {
+              "name": "storage.modifier.endianness.erlang"
+            },
+            "4": {
+              "name": "storage.modifier.unit.erlang"
+            },
+            "5": {
+              "name": "punctuation.separator.unit-specifiers.erlang"
+            },
+            "6": {
+              "name": "constant.numeric.integer.decimal.erlang"
+            },
+            "7": {
+              "name": "punctuation.separator.type-specifiers.erlang"
+            }
+          },
+          "match": "(integer|float|binary|bytes|bitstring|bits|utf8|utf16|utf32)|(signed|unsigned)|(big|little|native)|(unit)(:)(\\d++)|(-)"
+        }
+      ]
+    },
+    "keyword": {
+      "match": "\\b(after|begin|case|catch|cond|end|fun|if|let|of|try|receive|when|maybe|else)\\b",
+      "name": "keyword.control.erlang"
+    },
+    "language-constant": {
+      "match": "\\b(false|true|undefined)\\b",
+      "name": "constant.language"
+    },
+    "list": {
+      "begin": "(\\[)",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.definition.list.begin.erlang"
+        }
+      },
+      "end": "(\\])",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.list.end.erlang"
+        }
+      },
+      "name": "meta.structure.list.erlang",
+      "patterns": [
+        {
+          "match": "\\||\\|\\||,",
+          "name": "punctuation.separator.list.erlang"
+        },
+        {
+          "include": "#everything-else"
+        }
+      ]
+    },
+    "macro-directive": {
+      "patterns": [
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.section.directive.begin.erlang"
+            },
+            "2": {
+              "name": "keyword.control.directive.ifdef.erlang"
+            },
+            "3": {
+              "name": "punctuation.definition.parameters.begin.erlang"
+            },
+            "4": {
+              "name": "entity.name.function.macro.erlang"
+            },
+            "5": {
+              "name": "punctuation.definition.parameters.end.erlang"
+            },
+            "6": {
+              "name": "punctuation.section.directive.end.erlang"
+            }
+          },
+          "match": "^\\s*+(-)\\s*+(ifdef)\\s*+(\\()\\s*+([a-zA-z\\d@_]++)\\s*+(\\))\\s*+(\\.)",
+          "name": "meta.directive.ifdef.erlang"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.section.directive.begin.erlang"
+            },
+            "2": {
+              "name": "keyword.control.directive.ifndef.erlang"
+            },
+            "3": {
+              "name": "punctuation.definition.parameters.begin.erlang"
+            },
+            "4": {
+              "name": "entity.name.function.macro.erlang"
+            },
+            "5": {
+              "name": "punctuation.definition.parameters.end.erlang"
+            },
+            "6": {
+              "name": "punctuation.section.directive.end.erlang"
+            }
+          },
+          "match": "^\\s*+(-)\\s*+(ifndef)\\s*+(\\()\\s*+([a-zA-z\\d@_]++)\\s*+(\\))\\s*+(\\.)",
+          "name": "meta.directive.ifndef.erlang"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.section.directive.begin.erlang"
+            },
+            "2": {
+              "name": "keyword.control.directive.undef.erlang"
+            },
+            "3": {
+              "name": "punctuation.definition.parameters.begin.erlang"
+            },
+            "4": {
+              "name": "entity.name.function.macro.erlang"
+            },
+            "5": {
+              "name": "punctuation.definition.parameters.end.erlang"
+            },
+            "6": {
+              "name": "punctuation.section.directive.end.erlang"
+            }
+          },
+          "match": "^\\s*+(-)\\s*+(undef)\\s*+(\\()\\s*+([a-zA-z\\d@_]++)\\s*+(\\))\\s*+(\\.)",
+          "name": "meta.directive.undef.erlang"
+        }
+      ]
+    },
+    "macro-usage": {
+      "captures": {
+        "1": {
+          "name": "keyword.operator.macro.erlang"
+        },
+        "2": {
+          "name": "entity.name.function.macro.erlang"
+        }
+      },
+      "match": "(\\?\\??)\\s*+([a-zA-Z\\d@_]++)",
+      "name": "meta.macro-usage.erlang"
+    },
+    "module-directive": {
+      "captures": {
+        "1": {
+          "name": "punctuation.section.directive.begin.erlang"
+        },
+        "2": {
+          "name": "keyword.control.directive.module.erlang"
+        },
+        "3": {
+          "name": "punctuation.definition.parameters.begin.erlang"
+        },
+        "4": {
+          "name": "entity.name.type.class.module.definition.erlang"
+        },
+        "5": {
+          "name": "punctuation.definition.parameters.end.erlang"
+        },
+        "6": {
+          "name": "punctuation.section.directive.end.erlang"
+        }
+      },
+      "match": "^\\s*+(-)\\s*+(module)\\s*+(\\()\\s*+([a-z][a-zA-Z\\d@_]*+)\\s*+(\\))\\s*+(\\.)",
+      "name": "meta.directive.module.erlang"
+    },
+    "number": {
+      "begin": "(?=\\d)",
+      "end": "(?!\\d)",
+      "patterns": [
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.integer-float.erlang"
+            },
+            "2": {
+              "name": "punctuation.separator.float-exponent.erlang"
+            }
+          },
+          "match": "\\d++(\\.)\\d++([eE][\\+\\-]?\\d++)?",
+          "name": "constant.numeric.float.erlang"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.base-integer.erlang"
+            }
+          },
+          "match": "2(#)([0-1]++_)*[0-1]++",
+          "name": "constant.numeric.integer.binary.erlang"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.base-integer.erlang"
+            }
+          },
+          "match": "3(#)([0-2]++_)*[0-2]++",
+          "name": "constant.numeric.integer.base-3.erlang"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.base-integer.erlang"
+            }
+          },
+          "match": "4(#)([0-3]++_)*[0-3]++",
+          "name": "constant.numeric.integer.base-4.erlang"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.base-integer.erlang"
+            }
+          },
+          "match": "5(#)([0-4]++_)*[0-4]++",
+          "name": "constant.numeric.integer.base-5.erlang"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.base-integer.erlang"
+            }
+          },
+          "match": "6(#)([0-5]++_)*[0-5]++",
+          "name": "constant.numeric.integer.base-6.erlang"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.base-integer.erlang"
+            }
+          },
+          "match": "7(#)([0-6]++_)*[0-6]++",
+          "name": "constant.numeric.integer.base-7.erlang"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.base-integer.erlang"
+            }
+          },
+          "match": "8(#)([0-7]++_)*[0-7]++",
+          "name": "constant.numeric.integer.octal.erlang"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.base-integer.erlang"
+            }
+          },
+          "match": "9(#)([0-8]++_)*[0-8]++",
+          "name": "constant.numeric.integer.base-9.erlang"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.base-integer.erlang"
+            }
+          },
+          "match": "10(#)(\\d++_)*\\d++",
+          "name": "constant.numeric.integer.decimal.erlang"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.base-integer.erlang"
+            }
+          },
+          "match": "11(#)([\\daA]++_)*[\\daA]++",
+          "name": "constant.numeric.integer.base-11.erlang"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.base-integer.erlang"
+            }
+          },
+          "match": "12(#)([\\da-bA-B]++_)*[\\da-bA-B]++",
+          "name": "constant.numeric.integer.base-12.erlang"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.base-integer.erlang"
+            }
+          },
+          "match": "13(#)([\\da-cA-C]++_)*[\\da-cA-C]++",
+          "name": "constant.numeric.integer.base-13.erlang"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.base-integer.erlang"
+            }
+          },
+          "match": "14(#)([\\da-dA-D]++_)*[\\da-dA-D]++",
+          "name": "constant.numeric.integer.base-14.erlang"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.base-integer.erlang"
+            }
+          },
+          "match": "15(#)([\\da-eA-E]++_)*[\\da-eA-E]++",
+          "name": "constant.numeric.integer.base-15.erlang"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.base-integer.erlang"
+            }
+          },
+          "match": "16(#)([\\da-fA-F]++_)*[\\da-fA-F]++",
+          "name": "constant.numeric.integer.hexadecimal.erlang"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.base-integer.erlang"
+            }
+          },
+          "match": "17(#)([\\da-gA-G]++_)*[\\da-gA-G]++",
+          "name": "constant.numeric.integer.base-17.erlang"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.base-integer.erlang"
+            }
+          },
+          "match": "18(#)([\\da-hA-H]++_)*[\\da-hA-H]++",
+          "name": "constant.numeric.integer.base-18.erlang"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.base-integer.erlang"
+            }
+          },
+          "match": "19(#)([\\da-iA-I]++_)*[\\da-iA-I]++",
+          "name": "constant.numeric.integer.base-19.erlang"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.base-integer.erlang"
+            }
+          },
+          "match": "20(#)([\\da-jA-J]++_)*[\\da-jA-J]++",
+          "name": "constant.numeric.integer.base-20.erlang"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.base-integer.erlang"
+            }
+          },
+          "match": "21(#)([\\da-kA-K]++_)*[\\da-kA-K]++",
+          "name": "constant.numeric.integer.base-21.erlang"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.base-integer.erlang"
+            }
+          },
+          "match": "22(#)([\\da-lA-L]++_)*[\\da-lA-L]++",
+          "name": "constant.numeric.integer.base-22.erlang"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.base-integer.erlang"
+            }
+          },
+          "match": "23(#)([\\da-mA-M]++_)*[\\da-mA-M]++",
+          "name": "constant.numeric.integer.base-23.erlang"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.base-integer.erlang"
+            }
+          },
+          "match": "24(#)([\\da-nA-N]++_)*[\\da-nA-N]++",
+          "name": "constant.numeric.integer.base-24.erlang"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.base-integer.erlang"
+            }
+          },
+          "match": "25(#)([\\da-oA-O]++_)*[\\da-oA-O]++",
+          "name": "constant.numeric.integer.base-25.erlang"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.base-integer.erlang"
+            }
+          },
+          "match": "26(#)([\\da-pA-P]++_)*[\\da-pA-P]++",
+          "name": "constant.numeric.integer.base-26.erlang"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.base-integer.erlang"
+            }
+          },
+          "match": "27(#)([\\da-qA-Q]++_)*[\\da-qA-Q]++",
+          "name": "constant.numeric.integer.base-27.erlang"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.base-integer.erlang"
+            }
+          },
+          "match": "28(#)([\\da-rA-R]++_)*[\\da-rA-R]++",
+          "name": "constant.numeric.integer.base-28.erlang"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.base-integer.erlang"
+            }
+          },
+          "match": "29(#)([\\da-sA-S]++_)*[\\da-sA-S]++",
+          "name": "constant.numeric.integer.base-29.erlang"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.base-integer.erlang"
+            }
+          },
+          "match": "30(#)([\\da-tA-T]++_)*[\\da-tA-T]++",
+          "name": "constant.numeric.integer.base-30.erlang"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.base-integer.erlang"
+            }
+          },
+          "match": "31(#)([\\da-uA-U]++_)*[\\da-uA-U]++",
+          "name": "constant.numeric.integer.base-31.erlang"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.base-integer.erlang"
+            }
+          },
+          "match": "32(#)([\\da-vA-V]++_)*[\\da-vA-V]++",
+          "name": "constant.numeric.integer.base-32.erlang"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.base-integer.erlang"
+            }
+          },
+          "match": "33(#)([\\da-wA-W]++_)*[\\da-wA-W]++",
+          "name": "constant.numeric.integer.base-33.erlang"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.base-integer.erlang"
+            }
+          },
+          "match": "34(#)([\\da-xA-X]++_)*[\\da-xA-X]++",
+          "name": "constant.numeric.integer.base-34.erlang"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.base-integer.erlang"
+            }
+          },
+          "match": "35(#)([\\da-yA-Y]++_)*[\\da-yA-Y]++",
+          "name": "constant.numeric.integer.base-35.erlang"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.separator.base-integer.erlang"
+            }
+          },
+          "match": "36(#)([\\da-zA-Z]++_)*[\\da-zA-Z]++",
+          "name": "constant.numeric.integer.base-36.erlang"
+        },
+        {
+          "match": "\\d++#([\\da-zA-Z]++_)*[\\da-zA-Z]++",
+          "name": "invalid.illegal.integer.erlang"
+        },
+        {
+          "match": "(\\d++_)*\\d++",
+          "name": "constant.numeric.integer.decimal.erlang"
+        }
+      ]
+    },
+    "parenthesized-expression": {
+      "begin": "(\\()",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.section.expression.begin.erlang"
+        }
+      },
+      "end": "(\\))",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.section.expression.end.erlang"
+        }
+      },
+      "name": "meta.expression.parenthesized",
+      "patterns": [
+        {
+          "include": "#everything-else"
+        }
+      ]
+    },
+    "record-directive": {
+      "begin": "^\\s*+(-)\\s*+(record)\\s*+(\\()\\s*+([a-z][a-zA-Z\\d@_]*+|'[^']*+')\\s*+(,)",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.section.directive.begin.erlang"
+        },
+        "2": {
+          "name": "keyword.control.directive.import.erlang"
+        },
+        "3": {
+          "name": "punctuation.definition.parameters.begin.erlang"
+        },
+        "4": {
+          "name": "entity.name.type.class.record.definition.erlang"
+        },
+        "5": {
+          "name": "punctuation.separator.parameters.erlang"
+        }
+      },
+      "end": "(\\))\\s*+(\\.)",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.parameters.end.erlang"
+        },
+        "2": {
+          "name": "punctuation.section.directive.end.erlang"
+        }
+      },
+      "name": "meta.directive.record.erlang",
+      "patterns": [
+        {
+          "include": "#internal-record-body"
+        },
+        {
+          "include": "#comment"
+        }
+      ]
+    },
+    "record-usage": {
+      "patterns": [
+        {
+          "captures": {
+            "1": {
+              "name": "keyword.operator.record.erlang"
+            },
+            "2": {
+              "name": "entity.name.type.class.record.erlang"
+            },
+            "3": {
+              "name": "punctuation.separator.record-field.erlang"
+            },
+            "4": {
+              "name": "variable.other.field.erlang"
+            }
+          },
+          "match": "(#)\\s*+([a-z][a-zA-Z\\d@_]*+|'[^']*+')\\s*+(\\.)\\s*+([a-z][a-zA-Z\\d@_]*+|'[^']*+')",
+          "name": "meta.record-usage.erlang"
+        },
+        {
+          "begin": "(#)\\s*+([a-z][a-zA-Z\\d@_]*+|'[^']*+')",
+          "beginCaptures": {
+            "1": {
+              "name": "keyword.operator.record.erlang"
+            },
+            "2": {
+              "name": "entity.name.type.class.record.erlang"
+            }
+          },
+          "end": "(?<=\\})",
+          "name": "meta.record-usage.erlang",
+          "patterns": [
+            {
+              "include": "#internal-record-body"
+            }
+          ]
+        }
+      ]
+    },
+    "string": {
+      "begin": "(\")",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.definition.string.begin.erlang"
+        }
+      },
+      "end": "(\")",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.string.end.erlang"
+        }
+      },
+      "name": "string.quoted.double.erlang",
+      "patterns": [
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.escape.erlang"
+            },
+            "3": {
+              "name": "punctuation.definition.escape.erlang"
+            }
+          },
+          "match": "(\\\\)([bdefnrstv\\\\'\"]|(\\^)[@-_a-z]|[0-7]{1,3}|x[\\da-fA-F]{2})",
+          "name": "constant.character.escape.erlang"
+        },
+        {
+          "match": "\\\\\\^?.?",
+          "name": "invalid.illegal.string.erlang"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.placeholder.erlang"
+            },
+            "3": {
+              "name": "punctuation.separator.placeholder-parts.erlang"
+            },
+            "4": {
+              "name": "punctuation.separator.placeholder-parts.erlang"
+            },
+            "6": {
+              "name": "punctuation.separator.placeholder-parts.erlang"
+            },
+            "8": {
+              "name": "punctuation.separator.placeholder-parts.erlang"
+            },
+            "10": {
+              "name": "punctuation.separator.placeholder-parts.erlang"
+            },
+            "12": {
+              "name": "punctuation.separator.placeholder-parts.erlang"
+            }
+          },
+          "match": "(~)((\\-)?\\d++|(\\*))?((\\.)(\\d++|(\\*)))?((\\.)((\\*)|.))?[~cfegswpWPBX#bx\\+ni]",
+          "name": "constant.other.placeholder.erlang"
+        },
+        {
+          "captures": {
+            "1": {
+              "name": "punctuation.definition.placeholder.erlang"
+            },
+            "2": {
+              "name": "punctuation.separator.placeholder-parts.erlang"
+            }
+          },
+          "match": "(~)(\\*)?(\\d++)?[~du\\-#fsacl]",
+          "name": "constant.other.placeholder.erlang"
+        },
+        {
+          "match": "~[^\"]?",
+          "name": "invalid.illegal.string.erlang"
+        }
+      ]
+    },
+    "symbolic-operator": {
+      "match": "\\+\\+|\\+|--|-|\\*|/=|/|=/=|=:=|==|=<|=|<-|<|>=|>|!|::|\\?=",
+      "name": "keyword.operator.symbolic.erlang"
+    },
+    "textual-operator": {
+      "match": "\\b(andalso|band|and|bxor|xor|bor|orelse|or|bnot|not|bsl|bsr|div|rem)\\b",
+      "name": "keyword.operator.textual.erlang"
+    },
+    "tuple": {
+      "begin": "(\\{)",
+      "beginCaptures": {
+        "1": {
+          "name": "punctuation.definition.tuple.begin.erlang"
+        }
+      },
+      "end": "(\\})",
+      "endCaptures": {
+        "1": {
+          "name": "punctuation.definition.tuple.end.erlang"
+        }
+      },
+      "name": "meta.structure.tuple.erlang",
+      "patterns": [
+        {
+          "match": ",",
+          "name": "punctuation.separator.tuple.erlang"
+        },
+        {
+          "include": "#everything-else"
+        }
+      ]
+    },
+    "variable": {
+      "captures": {
+        "1": {
+          "name": "variable.other.erlang"
+        },
+        "2": {
+          "name": "variable.language.omitted.erlang"
+        }
+      },
+      "match": "(_[a-zA-Z\\d@_]++|[A-Z][a-zA-Z\\d@_]*+)|(_)"
+    }
+  },
+  "scopeName": "source.erlang",
+  "uuid": "58EA597D-5158-4BF7-9FB2-B05135D1E166"
+}
\ No newline at end of file
diff --git a/src/Resources/Grammars/ocaml.json b/src/Resources/Grammars/ocaml.json
new file mode 100644
index 000000000..84d6f82f3
--- /dev/null
+++ b/src/Resources/Grammars/ocaml.json
@@ -0,0 +1,2961 @@
+{
+  "name": "ocaml",
+  "scopeName": "source.ocaml",
+  "fileTypes": [".ml", ".mli"],
+  "patterns": [
+    {
+      "include": "#comment"
+    },
+    {
+      "include": "#pragma"
+    },
+    {
+      "include": "#decl"
+    }
+  ],
+  "repository": {
+    "attribute": {
+      "begin": "(\\[)[[:space:]]*((?<![#\\-:!?.@*/&%^+<=>|~$])@{1,3}(?![#\\-:!?.@*/&%^+<=>|~$]))",
+      "end": "\\]",
+      "beginCaptures": {
+        "1": {
+          "name": "constant.language constant.numeric entity.other.attribute-name.id.css strong"
+        },
+        "2": {
+          "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "constant.language constant.numeric entity.other.attribute-name.id.css strong"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#attributePayload"
+        }
+      ]
+    },
+    "attributeIdentifier": {
+      "match": "((?<![#\\-:!?.@*/&%^+<=>|~$])%(?![#\\-:!?.@*/&%^+<=>|~$]))((?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*))",
+      "captures": {
+        "1": {
+          "name": "variable.other.class.js message.error variable.interpolation string.regexp strong"
+        },
+        "2": {
+          "name": "punctuation.definition.tag"
+        }
+      }
+    },
+    "attributePayload": {
+      "patterns": [
+        {
+          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]%|^%))(?![#\\-:!?.@*/&%^+<=>|~$]))",
+          "end": "((?<![#\\-:!?.@*/&%^+<=>|~$])[:\\?](?![#\\-:!?.@*/&%^+<=>|~$]))|(?<=[[:space:]])|(?=\\])",
+          "endCaptures": {
+            "1": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#pathModuleExtended"
+            },
+            {
+              "include": "#pathRecord"
+            }
+          ]
+        },
+        {
+          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]:|^:))(?![#\\-:!?.@*/&%^+<=>|~$]))",
+          "end": "(?=\\])",
+          "patterns": [
+            {
+              "include": "#signature"
+            },
+            {
+              "include": "#type"
+            }
+          ]
+        },
+        {
+          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]\\?|^\\?))(?![#\\-:!?.@*/&%^+<=>|~$]))",
+          "end": "(?=\\])",
+          "patterns": [
+            {
+              "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]\\?|^\\?))(?![#\\-:!?.@*/&%^+<=>|~$]))",
+              "end": "(?=\\])|\\bwhen\\b",
+              "endCaptures": {
+                "1": {}
+              },
+              "patterns": [
+                {
+                  "include": "#pattern"
+                }
+              ]
+            },
+            {
+              "begin": "(?:(?<=(?:[^[:word:]]when|^when))(?![[:word:]]))",
+              "end": "(?=\\])",
+              "patterns": [
+                {
+                  "include": "#term"
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "include": "#term"
+        }
+      ]
+    },
+    "bindClassTerm": {
+      "patterns": [
+        {
+          "begin": "(?:(?<=(?:[^[:word:]]and|^and|[^[:word:]]class|^class|[^[:word:]]type|^type))(?![[:word:]]))",
+          "end": "(?<![#\\-:!?.@*/&%^+<=>|~$])(:)|(=)(?![#\\-:!?.@*/&%^+<=>|~$])|(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "endCaptures": {
+            "1": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp strong"
+            },
+            "2": {
+              "name": "support.type strong"
+            }
+          },
+          "patterns": [
+            {
+              "begin": "(?:(?<=(?:[^[:word:]]and|^and|[^[:word:]]class|^class|[^[:word:]]type|^type))(?![[:word:]]))",
+              "end": "(?=(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)[[:space:]]*,|[^[:space:][:lower:]%])|(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)|(?=\\btype\\b)",
+              "endCaptures": {
+                "0": {
+                  "name": "entity.name.function strong emphasis"
+                }
+              },
+              "patterns": [
+                {
+                  "include": "#attributeIdentifier"
+                }
+              ]
+            },
+            {
+              "begin": "\\[",
+              "end": "\\]",
+              "captures": {
+                "0": {
+                  "name": "punctuation.definition.tag"
+                }
+              },
+              "patterns": [
+                {
+                  "include": "#type"
+                }
+              ]
+            },
+            {
+              "include": "#bindTermArgs"
+            }
+          ]
+        },
+        {
+          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]:|^:))(?![#\\-:!?.@*/&%^+<=>|~$]))",
+          "end": "(?<![#\\-:!?.@*/&%^+<=>|~$])=(?![#\\-:!?.@*/&%^+<=>|~$])|(?=\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|val)\\b)",
+          "endCaptures": {
+            "0": {
+              "name": "support.type strong"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#literalClassType"
+            }
+          ]
+        },
+        {
+          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]=|^=))(?![#\\-:!?.@*/&%^+<=>|~$]))",
+          "end": "\\band\\b|(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "endCaptures": {
+            "0": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp markup.underline"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#term"
+            }
+          ]
+        }
+      ]
+    },
+    "bindClassType": {
+      "patterns": [
+        {
+          "begin": "(?:(?<=(?:[^[:word:]]and|^and|[^[:word:]]class|^class|[^[:word:]]type|^type))(?![[:word:]]))",
+          "end": "(?<![#\\-:!?.@*/&%^+<=>|~$])(:)|(=)(?![#\\-:!?.@*/&%^+<=>|~$])|(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "endCaptures": {
+            "1": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp strong"
+            },
+            "2": {
+              "name": "support.type strong"
+            }
+          },
+          "patterns": [
+            {
+              "begin": "(?:(?<=(?:[^[:word:]]and|^and|[^[:word:]]class|^class|[^[:word:]]type|^type))(?![[:word:]]))",
+              "end": "(?=(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)[[:space:]]*,|[^[:space:][:lower:]%])|(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)|(?=\\btype\\b)",
+              "endCaptures": {
+                "0": {
+                  "name": "entity.name.function strong emphasis"
+                }
+              },
+              "patterns": [
+                {
+                  "include": "#attributeIdentifier"
+                }
+              ]
+            },
+            {
+              "begin": "\\[",
+              "end": "\\]",
+              "captures": {
+                "0": {
+                  "name": "punctuation.definition.tag"
+                }
+              },
+              "patterns": [
+                {
+                  "include": "#type"
+                }
+              ]
+            },
+            {
+              "include": "#bindTermArgs"
+            }
+          ]
+        },
+        {
+          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]:|^:))(?![#\\-:!?.@*/&%^+<=>|~$]))",
+          "end": "(?<![#\\-:!?.@*/&%^+<=>|~$])=(?![#\\-:!?.@*/&%^+<=>|~$])|(?=\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|val)\\b)",
+          "endCaptures": {
+            "0": {
+              "name": "support.type strong"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#literalClassType"
+            }
+          ]
+        },
+        {
+          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]=|^=))(?![#\\-:!?.@*/&%^+<=>|~$]))",
+          "end": "\\band\\b|(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "endCaptures": {
+            "0": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp markup.underline"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#literalClassType"
+            }
+          ]
+        }
+      ]
+    },
+    "bindConstructor": {
+      "patterns": [
+        {
+          "begin": "(?:(?<=(?:[^[:word:]]exception|^exception))(?![[:word:]]))|(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]\\+=|^\\+=|[^#\\-:!?.@*/&%^+<=>|~$]=|^=|[^#\\-:!?.@*/&%^+<=>|~$]\\||^\\|))(?![#\\-:!?.@*/&%^+<=>|~$]))",
+          "end": "(:)|(\\bof\\b)|((?<![#\\-:!?.@*/&%^+<=>|~$])\\|(?![#\\-:!?.@*/&%^+<=>|~$]))|(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "endCaptures": {
+            "1": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp strong"
+            },
+            "2": {
+              "name": "punctuation.definition.tag"
+            },
+            "3": {
+              "name": "support.type strong"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#attributeIdentifier"
+            },
+            {
+              "match": "\\.\\.",
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+            },
+            {
+              "match": "\\b(?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)\\b(?![[:space:]]*(?:\\.|\\([^\\*]))",
+              "name": "constant.language constant.numeric entity.other.attribute-name.id.css strong"
+            },
+            {
+              "include": "#type"
+            }
+          ]
+        },
+        {
+          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]:|^:))(?![#\\-:!?.@*/&%^+<=>|~$]))|(?:(?<=(?:[^[:word:]]of|^of))(?![[:word:]]))",
+          "end": "(?<![#\\-:!?.@*/&%^+<=>|~$])\\|(?![#\\-:!?.@*/&%^+<=>|~$])|(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "endCaptures": {
+            "0": {
+              "name": "support.type strong"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#type"
+            }
+          ]
+        }
+      ]
+    },
+    "bindSignature": {
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "begin": "(?:(?<=(?:[^[:word:]]type|^type))(?![[:word:]]))",
+          "end": "(?<![#\\-:!?.@*/&%^+<=>|~$])=(?![#\\-:!?.@*/&%^+<=>|~$])",
+          "endCaptures": {
+            "0": {
+              "name": "support.type strong"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#comment"
+            },
+            {
+              "include": "#pathModuleExtended"
+            }
+          ]
+        },
+        {
+          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]=|^=))(?![#\\-:!?.@*/&%^+<=>|~$]))",
+          "end": "\\band\\b|(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "endCaptures": {
+            "0": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp markup.underline"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#signature"
+            }
+          ]
+        }
+      ]
+    },
+    "bindStructure": {
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "begin": "(?:(?<=(?:[^[:word:]]and|^and))(?![[:word:]]))|(?=[[:upper:]])",
+          "end": "(?<![#\\-:!?.@*/&%^+<=>|~$])(:(?!=))|(:?=)(?![#\\-:!?.@*/&%^+<=>|~$])|(?=\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|open|type|val)\\b)",
+          "endCaptures": {
+            "1": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp strong"
+            },
+            "2": {
+              "name": "support.type strong"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#comment"
+            },
+            {
+              "match": "\\bmodule\\b",
+              "name": "markup.inserted constant.language support.constant.property-value entity.name.filename"
+            },
+            {
+              "match": "(?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)",
+              "name": "entity.name.function strong emphasis"
+            },
+            {
+              "begin": "\\((?!\\))",
+              "end": "\\)",
+              "captures": {
+                "0": {
+                  "name": "punctuation.definition.tag"
+                }
+              },
+              "patterns": [
+                {
+                  "include": "#comment"
+                },
+                {
+                  "begin": "(?<![#\\-:!?.@*/&%^+<=>|~$]):(?![#\\-:!?.@*/&%^+<=>|~$])",
+                  "end": "(?=\\))",
+                  "beginCaptures": {
+                    "0": {
+                      "name": "variable.other.class.js message.error variable.interpolation string.regexp strong"
+                    }
+                  },
+                  "patterns": [
+                    {
+                      "include": "#signature"
+                    }
+                  ]
+                },
+                {
+                  "include": "#variableModule"
+                }
+              ]
+            },
+            {
+              "include": "#literalUnit"
+            }
+          ]
+        },
+        {
+          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]:|^:))(?![#\\-:!?.@*/&%^+<=>|~$]))",
+          "end": "\\b(and)\\b|((?<![#\\-:!?.@*/&%^+<=>|~$])=(?![#\\-:!?.@*/&%^+<=>|~$]))|(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "endCaptures": {
+            "1": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp markup.underline"
+            },
+            "2": {
+              "name": "support.type strong"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#signature"
+            }
+          ]
+        },
+        {
+          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]:=|^:=|[^#\\-:!?.@*/&%^+<=>|~$]=|^=))(?![#\\-:!?.@*/&%^+<=>|~$]))",
+          "end": "\\b(?:(and)|(with))\\b|(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "endCaptures": {
+            "1": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp markup.underline"
+            },
+            "2": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp markup.underline"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#structure"
+            }
+          ]
+        }
+      ]
+    },
+    "bindTerm": {
+      "patterns": [
+        {
+          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]!|^!))(?![#\\-:!?.@*/&%^+<=>|~$]))|(?:(?<=(?:[^[:word:]]and|^and|[^[:word:]]external|^external|[^[:word:]]let|^let|[^[:word:]]method|^method|[^[:word:]]val|^val))(?![[:word:]]))",
+          "end": "(\\bmodule\\b)|(\\bopen\\b)|(?<![#\\-:!?.@*/&%^+<=>|~$])(:)|((?<![#\\-:!?.@*/&%^+<=>|~$])=(?![#\\-:!?.@*/&%^+<=>|~$]))(?![#\\-:!?.@*/&%^+<=>|~$])|(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "endCaptures": {
+            "1": {
+              "name": "markup.inserted constant.language support.constant.property-value entity.name.filename"
+            },
+            "2": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+            },
+            "3": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp strong"
+            },
+            "4": {
+              "name": "support.type strong"
+            }
+          },
+          "patterns": [
+            {
+              "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]!|^!))(?![#\\-:!?.@*/&%^+<=>|~$]))|(?:(?<=(?:[^[:word:]]and|^and|[^[:word:]]external|^external|[^[:word:]]let|^let|[^[:word:]]method|^method|[^[:word:]]val|^val))(?![[:word:]]))",
+              "end": "(?=\\b(?:module|open)\\b)|(?=(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)[[:space:]]*,|[^[:space:][:lower:]%])|(\\brec\\b)|((?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*))",
+              "endCaptures": {
+                "1": {
+                  "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+                },
+                "2": {
+                  "name": "entity.name.function strong emphasis"
+                }
+              },
+              "patterns": [
+                {
+                  "include": "#attributeIdentifier"
+                },
+                {
+                  "include": "#comment"
+                }
+              ]
+            },
+            {
+              "begin": "(?:(?<=(?:[^[:word:]]rec|^rec))(?![[:word:]]))",
+              "end": "((?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*))|(?=[^[:space:][:alpha:]])",
+              "endCaptures": {
+                "0": {
+                  "name": "entity.name.function strong emphasis"
+                }
+              },
+              "patterns": [
+                {
+                  "include": "#bindTermArgs"
+                }
+              ]
+            },
+            {
+              "include": "#bindTermArgs"
+            }
+          ]
+        },
+        {
+          "begin": "(?:(?<=(?:[^[:word:]]module|^module))(?![[:word:]]))",
+          "end": "(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "patterns": [
+            {
+              "include": "#declModule"
+            }
+          ]
+        },
+        {
+          "begin": "(?:(?<=(?:[^[:word:]]open|^open))(?![[:word:]]))",
+          "end": "(?=\\bin\\b)|(?=\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "patterns": [
+            {
+              "include": "#pathModuleSimple"
+            }
+          ]
+        },
+        {
+          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]:|^:))(?![#\\-:!?.@*/&%^+<=>|~$]))",
+          "end": "(?<![#\\-:!?.@*/&%^+<=>|~$])=(?![#\\-:!?.@*/&%^+<=>|~$])|(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "endCaptures": {
+            "0": {
+              "name": "support.type strong"
+            }
+          },
+          "patterns": [
+            {
+              "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]:|^:))(?![#\\-:!?.@*/&%^+<=>|~$]))",
+              "end": "\\btype\\b|(?=[^[:space:]])",
+              "endCaptures": {
+                "0": {
+                  "name": "keyword.control"
+                }
+              }
+            },
+            {
+              "begin": "(?:(?<=(?:[^[:word:]]type|^type))(?![[:word:]]))",
+              "end": "(?<![#\\-:!?.@*/&%^+<=>|~$])\\.(?![#\\-:!?.@*/&%^+<=>|~$])",
+              "endCaptures": {
+                "0": {
+                  "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+                }
+              },
+              "patterns": [
+                {
+                  "include": "#pattern"
+                }
+              ]
+            },
+            {
+              "include": "#type"
+            }
+          ]
+        },
+        {
+          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]=|^=))(?![#\\-:!?.@*/&%^+<=>|~$]))",
+          "end": "\\band\\b|(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "endCaptures": {
+            "0": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp markup.underline"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#term"
+            }
+          ]
+        }
+      ]
+    },
+    "bindTermArgs": {
+      "patterns": [
+        {
+          "begin": "~|\\?",
+          "end": ":|(?=[^[:space:]])",
+          "applyEndPatternLast": true,
+          "beginCaptures": {
+            "0": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "keyword"
+            }
+          },
+          "patterns": [
+            {
+              "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]~|^~|[^#\\-:!?.@*/&%^+<=>|~$]\\?|^\\?))(?![#\\-:!?.@*/&%^+<=>|~$]))",
+              "end": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)|(?<=\\))",
+              "endCaptures": {
+                "0": {
+                  "name": "markup.inserted constant.language support.constant.property-value entity.name.filename"
+                }
+              },
+              "patterns": [
+                {
+                  "include": "#comment"
+                },
+                {
+                  "begin": "\\((?!\\*)",
+                  "end": "\\)",
+                  "captures": {
+                    "0": {
+                      "name": "punctuation.definition.tag"
+                    }
+                  },
+                  "patterns": [
+                    {
+                      "begin": "(?<=\\()",
+                      "end": ":|=",
+                      "endCaptures": {
+                        "0": {
+                          "name": "keyword"
+                        }
+                      },
+                      "patterns": [
+                        {
+                          "match": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)",
+                          "name": "markup.inserted constant.language support.constant.property-value entity.name.filename"
+                        }
+                      ]
+                    },
+                    {
+                      "begin": "(?<=:)",
+                      "end": "=|(?=\\))",
+                      "endCaptures": {
+                        "0": {
+                          "name": "keyword"
+                        }
+                      },
+                      "patterns": [
+                        {
+                          "include": "#type"
+                        }
+                      ]
+                    },
+                    {
+                      "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]=|^=))(?![#\\-:!?.@*/&%^+<=>|~$]))",
+                      "end": "(?=\\))",
+                      "patterns": [
+                        {
+                          "include": "#term"
+                        }
+                      ]
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "include": "#pattern"
+        }
+      ]
+    },
+    "bindType": {
+      "patterns": [
+        {
+          "begin": "(?:(?<=(?:[^[:word:]]and|^and|[^[:word:]]type|^type))(?![[:word:]]))",
+          "end": "(?<![#\\-:!?.@*/&%^+<=>|~$])\\+=|=(?![#\\-:!?.@*/&%^+<=>|~$])|(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "endCaptures": {
+            "0": {
+              "name": "support.type strong"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#attributeIdentifier"
+            },
+            {
+              "include": "#pathType"
+            },
+            {
+              "match": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)",
+              "name": "entity.name.function strong"
+            },
+            {
+              "include": "#type"
+            }
+          ]
+        },
+        {
+          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]\\+=|^\\+=|[^#\\-:!?.@*/&%^+<=>|~$]=|^=))(?![#\\-:!?.@*/&%^+<=>|~$]))",
+          "end": "\\band\\b|(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "endCaptures": {
+            "0": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp markup.underline"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#bindConstructor"
+            }
+          ]
+        }
+      ]
+    },
+    "comment": {
+      "patterns": [
+        {
+          "include": "#attribute"
+        },
+        {
+          "include": "#extension"
+        },
+        {
+          "include": "#commentBlock"
+        },
+        {
+          "include": "#commentDoc"
+        }
+      ]
+    },
+    "commentBlock": {
+      "begin": "\\(\\*(?!\\*[^\\)])",
+      "end": "\\*\\)",
+      "name": "comment constant.regexp meta.separator.markdown",
+      "contentName": "emphasis",
+      "patterns": [
+        {
+          "include": "#commentBlock"
+        },
+        {
+          "include": "#commentDoc"
+        }
+      ]
+    },
+    "commentDoc": {
+      "begin": "\\(\\*\\*",
+      "end": "\\*\\)",
+      "name": "comment constant.regexp meta.separator.markdown",
+      "patterns": [
+        {
+          "match": "\\*"
+        },
+        {
+          "include": "#comment"
+        }
+      ]
+    },
+    "decl": {
+      "patterns": [
+        {
+          "include": "#declClass"
+        },
+        {
+          "include": "#declException"
+        },
+        {
+          "include": "#declInclude"
+        },
+        {
+          "include": "#declModule"
+        },
+        {
+          "include": "#declOpen"
+        },
+        {
+          "include": "#declTerm"
+        },
+        {
+          "include": "#declType"
+        }
+      ]
+    },
+    "declClass": {
+      "begin": "\\bclass\\b",
+      "end": ";;|(?=\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+      "beginCaptures": {
+        "0": {
+          "name": "entity.name.class constant.numeric markup.underline"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.tag"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#pragma"
+        },
+        {
+          "begin": "(?:(?<=(?:[^[:word:]]class|^class))(?![[:word:]]))",
+          "end": "\\btype\\b|(?=\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|val)\\b)",
+          "beginCaptures": {
+            "0": {
+              "name": "entity.name.class constant.numeric markup.underline"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "keyword"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#bindClassTerm"
+            }
+          ]
+        },
+        {
+          "begin": "(?:(?<=(?:[^[:word:]]type|^type))(?![[:word:]]))",
+          "end": "(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "patterns": [
+            {
+              "include": "#bindClassType"
+            }
+          ]
+        }
+      ]
+    },
+    "declException": {
+      "begin": "\\bexception\\b",
+      "end": ";;|(?=\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+      "beginCaptures": {
+        "0": {
+          "name": "keyword markup.underline"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.tag"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#attributeIdentifier"
+        },
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#pragma"
+        },
+        {
+          "include": "#bindConstructor"
+        }
+      ]
+    },
+    "declInclude": {
+      "begin": "\\binclude\\b",
+      "end": ";;|(?=\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+      "beginCaptures": {
+        "0": {
+          "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.tag"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#attributeIdentifier"
+        },
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#pragma"
+        },
+        {
+          "include": "#signature"
+        }
+      ]
+    },
+    "declModule": {
+      "begin": "(?:(?<=(?:[^[:word:]]module|^module))(?![[:word:]]))|\\bmodule\\b",
+      "end": ";;|(?=\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+      "beginCaptures": {
+        "0": {
+          "name": "markup.inserted constant.language support.constant.property-value entity.name.filename markup.underline"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.tag"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#pragma"
+        },
+        {
+          "begin": "(?:(?<=(?:[^[:word:]]module|^module))(?![[:word:]]))",
+          "end": "(\\btype\\b)|(?=[[:upper:]])",
+          "endCaptures": {
+            "0": {
+              "name": "keyword"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#attributeIdentifier"
+            },
+            {
+              "include": "#comment"
+            },
+            {
+              "match": "\\brec\\b",
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+            }
+          ]
+        },
+        {
+          "begin": "(?:(?<=(?:[^[:word:]]type|^type))(?![[:word:]]))",
+          "end": "(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "patterns": [
+            {
+              "include": "#bindSignature"
+            }
+          ]
+        },
+        {
+          "begin": "(?=[[:upper:]])",
+          "end": "(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "patterns": [
+            {
+              "include": "#bindStructure"
+            }
+          ]
+        }
+      ]
+    },
+    "declOpen": {
+      "begin": "\\bopen\\b",
+      "end": ";;|(?=\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+      "beginCaptures": {
+        "0": {
+          "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.tag"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#attributeIdentifier"
+        },
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#pragma"
+        },
+        {
+          "include": "#pathModuleExtended"
+        }
+      ]
+    },
+    "declTerm": {
+      "begin": "\\b(?:(external|val)|(method)|(let))\\b(!?)",
+      "end": ";;|(?=\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+      "beginCaptures": {
+        "1": {
+          "name": "support.type markup.underline"
+        },
+        "2": {
+          "name": "storage.type markup.underline"
+        },
+        "3": {
+          "name": "keyword.control markup.underline"
+        },
+        "4": {
+          "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.tag"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#pragma"
+        },
+        {
+          "include": "#bindTerm"
+        }
+      ]
+    },
+    "declType": {
+      "begin": "(?:(?<=(?:[^[:word:]]type|^type))(?![[:word:]]))|\\btype\\b",
+      "end": ";;|(?=\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+      "beginCaptures": {
+        "0": {
+          "name": "keyword markup.underline"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "punctuation.definition.tag"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#pragma"
+        },
+        {
+          "include": "#bindType"
+        }
+      ]
+    },
+    "extension": {
+      "begin": "(\\[)((?<![#\\-:!?.@*/&%^+<=>|~$])%{1,3}(?![#\\-:!?.@*/&%^+<=>|~$]))",
+      "end": "\\]",
+      "beginCaptures": {
+        "1": {
+          "name": "constant.language constant.numeric entity.other.attribute-name.id.css strong"
+        },
+        "2": {
+          "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "constant.language constant.numeric entity.other.attribute-name.id.css strong"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#attributePayload"
+        }
+      ]
+    },
+    "literal": {
+      "patterns": [
+        {
+          "include": "#termConstructor"
+        },
+        {
+          "include": "#literalArray"
+        },
+        {
+          "include": "#literalBoolean"
+        },
+        {
+          "include": "#literalCharacter"
+        },
+        {
+          "include": "#literalList"
+        },
+        {
+          "include": "#literalNumber"
+        },
+        {
+          "include": "#literalObjectTerm"
+        },
+        {
+          "include": "#literalString"
+        },
+        {
+          "include": "#literalRecord"
+        },
+        {
+          "include": "#literalUnit"
+        }
+      ]
+    },
+    "literalArray": {
+      "begin": "\\[\\|",
+      "end": "\\|\\]",
+      "captures": {
+        "0": {
+          "name": "constant.language constant.numeric entity.other.attribute-name.id.css strong"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#term"
+        }
+      ]
+    },
+    "literalBoolean": {
+      "match": "\\bfalse|true\\b",
+      "name": "constant.language constant.numeric entity.other.attribute-name.id.css strong"
+    },
+    "literalCharacter": {
+      "begin": "(?<![[:word:]])'",
+      "end": "'",
+      "name": "markup.punctuation.quote.beginning",
+      "patterns": [
+        {
+          "include": "#literalCharacterEscape"
+        }
+      ]
+    },
+    "literalCharacterEscape": {
+      "match": "\\\\(?:[\\\\\"'ntbr]|[[:digit:]][[:digit:]][[:digit:]]|x[[:xdigit:]][[:xdigit:]]|o[0-3][0-7][0-7])"
+    },
+    "literalClassType": {
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "begin": "\\bobject\\b",
+          "end": "\\bend\\b",
+          "captures": {
+            "0": {
+              "name": "punctuation.definition.tag emphasis"
+            }
+          },
+          "patterns": [
+            {
+              "begin": "\\binherit\\b",
+              "end": ";;|(?=\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+              "beginCaptures": {
+                "0": {
+                  "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+                }
+              },
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.definition.tag"
+                }
+              },
+              "patterns": [
+                {
+                  "begin": "\\bas\\b",
+                  "end": ";;|(?=\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+                  "beginCaptures": {
+                    "0": {
+                      "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+                    }
+                  },
+                  "patterns": [
+                    {
+                      "include": "#variablePattern"
+                    }
+                  ]
+                },
+                {
+                  "include": "#type"
+                }
+              ]
+            },
+            {
+              "include": "#pattern"
+            },
+            {
+              "include": "#declTerm"
+            }
+          ]
+        },
+        {
+          "begin": "\\[",
+          "end": "\\]"
+        }
+      ]
+    },
+    "literalList": {
+      "patterns": [
+        {
+          "begin": "\\[",
+          "end": "\\]",
+          "captures": {
+            "0": {
+              "name": "constant.language constant.numeric entity.other.attribute-name.id.css strong"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#term"
+            }
+          ]
+        }
+      ]
+    },
+    "literalNumber": {
+      "match": "(?<![[:alpha:]])[[:digit:]][[:digit:]]*(\\.[[:digit:]][[:digit:]]*)?",
+      "name": "constant.numeric"
+    },
+    "literalObjectTerm": {
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "begin": "\\bobject\\b",
+          "end": "\\bend\\b",
+          "captures": {
+            "0": {
+              "name": "punctuation.definition.tag emphasis"
+            }
+          },
+          "patterns": [
+            {
+              "begin": "\\binherit\\b",
+              "end": ";;|(?=\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+              "beginCaptures": {
+                "0": {
+                  "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+                }
+              },
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.definition.tag"
+                }
+              },
+              "patterns": [
+                {
+                  "begin": "\\bas\\b",
+                  "end": ";;|(?=\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+                  "beginCaptures": {
+                    "0": {
+                      "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+                    }
+                  },
+                  "patterns": [
+                    {
+                      "include": "#variablePattern"
+                    }
+                  ]
+                },
+                {
+                  "include": "#term"
+                }
+              ]
+            },
+            {
+              "include": "#pattern"
+            },
+            {
+              "include": "#declTerm"
+            }
+          ]
+        },
+        {
+          "begin": "\\[",
+          "end": "\\]"
+        }
+      ]
+    },
+    "literalRecord": {
+      "begin": "\\{",
+      "end": "\\}",
+      "captures": {
+        "0": {
+          "name": "constant.language constant.numeric entity.other.attribute-name.id.css strong strong"
+        }
+      },
+      "patterns": [
+        {
+          "begin": "(?<=\\{|;)",
+          "end": "(:)|(=)|(;)|(with)|(?=\\})",
+          "endCaptures": {
+            "1": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp strong"
+            },
+            "2": {
+              "name": "support.type strong"
+            },
+            "3": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+            },
+            "4": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#comment"
+            },
+            {
+              "include": "#pathModulePrefixSimple"
+            },
+            {
+              "match": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)",
+              "name": "markup.inserted constant.language support.constant.property-value entity.name.filename emphasis"
+            }
+          ]
+        },
+        {
+          "begin": "(?:(?<=(?:[^[:word:]]with|^with))(?![[:word:]]))",
+          "end": "(:)|(=)|(;)|(?=\\})",
+          "endCaptures": {
+            "1": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp strong"
+            },
+            "2": {
+              "name": "support.type strong"
+            },
+            "3": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+            }
+          },
+          "patterns": [
+            {
+              "match": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)",
+              "name": "markup.inserted constant.language support.constant.property-value entity.name.filename emphasis"
+            }
+          ]
+        },
+        {
+          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]:|^:))(?![#\\-:!?.@*/&%^+<=>|~$]))",
+          "end": "(;)|(=)|(?=\\})",
+          "endCaptures": {
+            "1": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+            },
+            "2": {
+              "name": "support.type strong"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#type"
+            }
+          ]
+        },
+        {
+          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]=|^=))(?![#\\-:!?.@*/&%^+<=>|~$]))",
+          "end": ";|(?=\\})",
+          "endCaptures": {
+            "0": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#term"
+            }
+          ]
+        }
+      ]
+    },
+    "literalString": {
+      "patterns": [
+        {
+          "begin": "\"",
+          "end": "\"",
+          "name": "string beginning.punctuation.definition.quote.markdown",
+          "patterns": [
+            {
+              "include": "#literalStringEscape"
+            }
+          ]
+        },
+        {
+          "begin": "(\\{)([_[:lower:]]*?)(\\|)",
+          "end": "(\\|)(\\2)(\\})",
+          "name": "string beginning.punctuation.definition.quote.markdown",
+          "patterns": [
+            {
+              "include": "#literalStringEscape"
+            }
+          ]
+        }
+      ]
+    },
+    "literalStringEscape": {
+      "match": "\\\\(?:[\\\\\"ntbr]|[[:digit:]][[:digit:]][[:digit:]]|x[[:xdigit:]][[:xdigit:]]|o[0-3][0-7][0-7])"
+    },
+    "literalUnit": {
+      "match": "\\(\\)",
+      "name": "constant.language constant.numeric entity.other.attribute-name.id.css strong"
+    },
+    "pathModuleExtended": {
+      "patterns": [
+        {
+          "include": "#pathModulePrefixExtended"
+        },
+        {
+          "match": "(?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)",
+          "name": "entity.name.class constant.numeric"
+        }
+      ]
+    },
+    "pathModulePrefixExtended": {
+      "begin": "(?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)(?=[[:space:]]*\\.|$|\\()",
+      "end": "(?![[:space:]\\.]|$|\\()",
+      "beginCaptures": {
+        "0": {
+          "name": "entity.name.class constant.numeric"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "begin": "\\(",
+          "end": "\\)",
+          "captures": {
+            "0": {
+              "name": "keyword.control"
+            }
+          },
+          "patterns": [
+            {
+              "match": "((?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)(?=[[:space:]]*\\)))",
+              "name": "string.other.link variable.language variable.parameter emphasis"
+            },
+            {
+              "include": "#structure"
+            }
+          ]
+        },
+        {
+          "begin": "(?<![#\\-:!?.@*/&%^+<=>|~$])\\.(?![#\\-:!?.@*/&%^+<=>|~$])",
+          "end": "((?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)(?=[[:space:]]*\\.|$))|((?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)(?=[[:space:]]*(?:$|\\()))|((?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)(?=[[:space:]]*\\)))|(?![[:space:]\\.[:upper:]]|$|\\()",
+          "beginCaptures": {
+            "0": {
+              "name": "keyword strong"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "entity.name.class constant.numeric"
+            },
+            "2": {
+              "name": "entity.name.function strong"
+            },
+            "3": {
+              "name": "string.other.link variable.language variable.parameter emphasis"
+            }
+          }
+        }
+      ]
+    },
+    "pathModulePrefixExtendedParens": {
+      "begin": "\\(",
+      "end": "\\)",
+      "captures": {
+        "0": {
+          "name": "keyword.control"
+        }
+      },
+      "patterns": [
+        {
+          "match": "((?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)(?=[[:space:]]*\\)))",
+          "name": "string.other.link variable.language variable.parameter emphasis"
+        },
+        {
+          "include": "#structure"
+        }
+      ]
+    },
+    "pathModulePrefixSimple": {
+      "begin": "(?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)(?=[[:space:]]*\\.)",
+      "end": "(?![[:space:]\\.])",
+      "beginCaptures": {
+        "0": {
+          "name": "entity.name.class constant.numeric"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "begin": "(?<![#\\-:!?.@*/&%^+<=>|~$])\\.(?![#\\-:!?.@*/&%^+<=>|~$])",
+          "end": "((?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)(?=[[:space:]]*\\.))|((?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)(?=[[:space:]]*))|(?![[:space:]\\.[:upper:]])",
+          "beginCaptures": {
+            "0": {
+              "name": "keyword strong"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "entity.name.class constant.numeric"
+            },
+            "2": {
+              "name": "constant.language constant.numeric entity.other.attribute-name.id.css strong"
+            }
+          }
+        }
+      ]
+    },
+    "pathModuleSimple": {
+      "patterns": [
+        {
+          "include": "#pathModulePrefixSimple"
+        },
+        {
+          "match": "(?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)",
+          "name": "entity.name.class constant.numeric"
+        }
+      ]
+    },
+    "pathRecord": {
+      "patterns": [
+        {
+          "begin": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)",
+          "end": "(?=[^[:space:]\\.])(?!\\(\\*)",
+          "patterns": [
+            {
+              "include": "#comment"
+            },
+            {
+              "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]\\.|^\\.))(?![#\\-:!?.@*/&%^+<=>|~$]))|(?<![#\\-:!?.@*/&%^+<=>|~$])\\.(?![#\\-:!?.@*/&%^+<=>|~$])",
+              "end": "((?<![#\\-:!?.@*/&%^+<=>|~$])\\.(?![#\\-:!?.@*/&%^+<=>|~$]))|((?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|mutable|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*))|(?<=\\))|(?<=\\])",
+              "beginCaptures": {
+                "0": {
+                  "name": "keyword strong"
+                }
+              },
+              "endCaptures": {
+                "1": {
+                  "name": "keyword strong"
+                },
+                "2": {
+                  "name": "markup.inserted constant.language support.constant.property-value entity.name.filename"
+                }
+              },
+              "patterns": [
+                {
+                  "include": "#comment"
+                },
+                {
+                  "include": "#pathModulePrefixSimple"
+                },
+                {
+                  "begin": "\\((?!\\*)",
+                  "end": "\\)",
+                  "captures": {
+                    "0": {
+                      "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+                    }
+                  },
+                  "patterns": [
+                    {
+                      "include": "#term"
+                    }
+                  ]
+                },
+                {
+                  "begin": "\\[",
+                  "end": "\\]",
+                  "captures": {
+                    "0": {
+                      "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+                    }
+                  },
+                  "patterns": [
+                    {
+                      "include": "#pattern"
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    },
+    "pattern": {
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#patternArray"
+        },
+        {
+          "include": "#patternLazy"
+        },
+        {
+          "include": "#patternList"
+        },
+        {
+          "include": "#patternMisc"
+        },
+        {
+          "include": "#patternModule"
+        },
+        {
+          "include": "#patternRecord"
+        },
+        {
+          "include": "#literal"
+        },
+        {
+          "include": "#patternParens"
+        },
+        {
+          "include": "#patternType"
+        },
+        {
+          "include": "#variablePattern"
+        },
+        {
+          "include": "#termOperator"
+        }
+      ]
+    },
+    "patternArray": {
+      "begin": "\\[\\|",
+      "end": "\\|\\]",
+      "captures": {
+        "0": {
+          "name": "constant.language constant.numeric entity.other.attribute-name.id.css strong"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#pattern"
+        }
+      ]
+    },
+    "patternLazy": {
+      "match": "lazy",
+      "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+    },
+    "patternList": {
+      "begin": "\\[",
+      "end": "\\]",
+      "captures": {
+        "0": {
+          "name": "constant.language constant.numeric entity.other.attribute-name.id.css strong"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#pattern"
+        }
+      ]
+    },
+    "patternMisc": {
+      "match": "((?<![#\\-:!?.@*/&%^+<=>|~$]),(?![#\\-:!?.@*/&%^+<=>|~$]))|([#\\-:!?.@*/&%^+<=>|~$]+)|\\b(as)\\b",
+      "captures": {
+        "1": {
+          "name": "string.regexp strong"
+        },
+        "2": {
+          "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+        },
+        "3": {
+          "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+        }
+      }
+    },
+    "patternModule": {
+      "begin": "\\bmodule\\b",
+      "end": "(?=\\))",
+      "beginCaptures": {
+        "0": {
+          "name": "markup.inserted constant.language support.constant.property-value entity.name.filename"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#declModule"
+        }
+      ]
+    },
+    "patternParens": {
+      "begin": "\\((?!\\))",
+      "end": "\\)",
+      "captures": {
+        "0": {
+          "name": "punctuation.definition.tag"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "begin": "(?<![#\\-:!?.@*/&%^+<=>|~$]):(?![#\\-:!?.@*/&%^+<=>|~$])",
+          "end": "(?=\\))",
+          "beginCaptures": {
+            "0": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp strong"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#type"
+            }
+          ]
+        },
+        {
+          "include": "#pattern"
+        }
+      ]
+    },
+    "patternRecord": {
+      "begin": "\\{",
+      "end": "\\}",
+      "captures": {
+        "0": {
+          "name": "constant.language constant.numeric entity.other.attribute-name.id.css strong strong"
+        }
+      },
+      "patterns": [
+        {
+          "begin": "(?<=\\{|;)",
+          "end": "(:)|(=)|(;)|(with)|(?=\\})",
+          "endCaptures": {
+            "1": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp strong"
+            },
+            "2": {
+              "name": "support.type strong"
+            },
+            "3": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+            },
+            "4": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#comment"
+            },
+            {
+              "include": "#pathModulePrefixSimple"
+            },
+            {
+              "match": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)",
+              "name": "markup.inserted constant.language support.constant.property-value entity.name.filename emphasis"
+            }
+          ]
+        },
+        {
+          "begin": "(?:(?<=(?:[^[:word:]]with|^with))(?![[:word:]]))",
+          "end": "(:)|(=)|(;)|(?=\\})",
+          "endCaptures": {
+            "1": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp strong"
+            },
+            "2": {
+              "name": "support.type strong"
+            },
+            "3": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+            }
+          },
+          "patterns": [
+            {
+              "match": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)",
+              "name": "markup.inserted constant.language support.constant.property-value entity.name.filename emphasis"
+            }
+          ]
+        },
+        {
+          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]:|^:))(?![#\\-:!?.@*/&%^+<=>|~$]))",
+          "end": "(;)|(=)|(?=\\})",
+          "endCaptures": {
+            "1": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+            },
+            "2": {
+              "name": "support.type strong"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#type"
+            }
+          ]
+        },
+        {
+          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]=|^=))(?![#\\-:!?.@*/&%^+<=>|~$]))",
+          "end": ";|(?=\\})",
+          "endCaptures": {
+            "0": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#pattern"
+            }
+          ]
+        }
+      ]
+    },
+    "patternType": {
+      "begin": "\\btype\\b",
+      "end": "(?=\\))",
+      "beginCaptures": {
+        "0": {
+          "name": "keyword"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#declType"
+        }
+      ]
+    },
+    "pragma": {
+      "begin": "(?<![#\\-:!?.@*/&%^+<=>|~$])#(?![#\\-:!?.@*/&%^+<=>|~$])",
+      "end": "(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+      "beginCaptures": {
+        "0": {
+          "name": "punctuation.definition.tag"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#literalNumber"
+        },
+        {
+          "include": "#literalString"
+        }
+      ]
+    },
+    "signature": {
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#signatureLiteral"
+        },
+        {
+          "include": "#signatureFunctor"
+        },
+        {
+          "include": "#pathModuleExtended"
+        },
+        {
+          "include": "#signatureParens"
+        },
+        {
+          "include": "#signatureRecovered"
+        },
+        {
+          "include": "#signatureConstraints"
+        }
+      ]
+    },
+    "signatureConstraints": {
+      "begin": "\\bwith\\b",
+      "end": "(?=\\))|(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+      "beginCaptures": {
+        "0": {
+          "name": "variable.other.class.js message.error variable.interpolation string.regexp markup.underline"
+        }
+      },
+      "patterns": [
+        {
+          "begin": "(?:(?<=(?:[^[:word:]]with|^with))(?![[:word:]]))",
+          "end": "\\b(?:(module)|(type))\\b",
+          "endCaptures": {
+            "1": {
+              "name": "markup.inserted constant.language support.constant.property-value entity.name.filename"
+            },
+            "2": {
+              "name": "keyword"
+            }
+          }
+        },
+        {
+          "include": "#declModule"
+        },
+        {
+          "include": "#declType"
+        }
+      ]
+    },
+    "signatureFunctor": {
+      "patterns": [
+        {
+          "begin": "\\bfunctor\\b",
+          "end": "(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "beginCaptures": {
+            "0": {
+              "name": "keyword"
+            }
+          },
+          "patterns": [
+            {
+              "begin": "(?:(?<=(?:[^[:word:]]functor|^functor))(?![[:word:]]))",
+              "end": "(\\(\\))|(\\((?!\\)))",
+              "endCaptures": {
+                "1": {
+                  "name": "constant.language constant.numeric entity.other.attribute-name.id.css strong"
+                },
+                "2": {
+                  "name": "punctuation.definition.tag"
+                }
+              }
+            },
+            {
+              "begin": "(?<=\\()",
+              "end": "(:)|(\\))",
+              "endCaptures": {
+                "1": {
+                  "name": "variable.other.class.js message.error variable.interpolation string.regexp strong"
+                },
+                "2": {
+                  "name": "punctuation.definition.tag"
+                }
+              },
+              "patterns": [
+                {
+                  "include": "#variableModule"
+                }
+              ]
+            },
+            {
+              "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]:|^:))(?![#\\-:!?.@*/&%^+<=>|~$]))",
+              "end": "\\)",
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.definition.tag"
+                }
+              },
+              "patterns": [
+                {
+                  "include": "#signature"
+                }
+              ]
+            },
+            {
+              "begin": "(?<=\\))",
+              "end": "(\\()|((?<![#\\-:!?.@*/&%^+<=>|~$])->(?![#\\-:!?.@*/&%^+<=>|~$]))",
+              "endCaptures": {
+                "1": {
+                  "name": "punctuation.definition.tag"
+                },
+                "2": {
+                  "name": "support.type strong"
+                }
+              }
+            },
+            {
+              "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]->|^->))(?![#\\-:!?.@*/&%^+<=>|~$]))",
+              "end": "(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+              "patterns": [
+                {
+                  "include": "#signature"
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "match": "(?<![#\\-:!?.@*/&%^+<=>|~$])->(?![#\\-:!?.@*/&%^+<=>|~$])",
+          "name": "support.type strong"
+        }
+      ]
+    },
+    "signatureLiteral": {
+      "begin": "\\bsig\\b",
+      "end": "\\bend\\b",
+      "captures": {
+        "0": {
+          "name": "punctuation.definition.tag emphasis"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#pragma"
+        },
+        {
+          "include": "#decl"
+        }
+      ]
+    },
+    "signatureParens": {
+      "begin": "\\((?!\\))",
+      "end": "\\)",
+      "captures": {
+        "0": {
+          "name": "punctuation.definition.tag"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "begin": "(?<![#\\-:!?.@*/&%^+<=>|~$]):(?![#\\-:!?.@*/&%^+<=>|~$])",
+          "end": "(?=\\))",
+          "beginCaptures": {
+            "0": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp strong"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#signature"
+            }
+          ]
+        },
+        {
+          "include": "#signature"
+        }
+      ]
+    },
+    "signatureRecovered": {
+      "patterns": [
+        {
+          "begin": "\\(|(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]:|^:|[^#\\-:!?.@*/&%^+<=>|~$]->|^->))(?![#\\-:!?.@*/&%^+<=>|~$]))|(?:(?<=(?:[^[:word:]]include|^include|[^[:word:]]open|^open))(?![[:word:]]))",
+          "end": "\\bmodule\\b|(?!$|[[:space:]]|\\bmodule\\b)",
+          "endCaptures": {
+            "0": {
+              "name": "markup.inserted constant.language support.constant.property-value entity.name.filename"
+            }
+          }
+        },
+        {
+          "begin": "(?:(?<=(?:[^[:word:]]module|^module))(?![[:word:]]))",
+          "end": "(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "patterns": [
+            {
+              "begin": "(?:(?<=(?:[^[:word:]]module|^module))(?![[:word:]]))",
+              "end": "\\btype\\b",
+              "endCaptures": {
+                "0": {
+                  "name": "keyword"
+                }
+              }
+            },
+            {
+              "begin": "(?:(?<=(?:[^[:word:]]type|^type))(?![[:word:]]))",
+              "end": "\\bof\\b",
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.definition.tag"
+                }
+              }
+            },
+            {
+              "begin": "(?:(?<=(?:[^[:word:]]of|^of))(?![[:word:]]))",
+              "end": "(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+              "patterns": [
+                {
+                  "include": "#signature"
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    },
+    "structure": {
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#structureLiteral"
+        },
+        {
+          "include": "#structureFunctor"
+        },
+        {
+          "include": "#pathModuleExtended"
+        },
+        {
+          "include": "#structureParens"
+        }
+      ]
+    },
+    "structureFunctor": {
+      "patterns": [
+        {
+          "begin": "\\bfunctor\\b",
+          "end": "(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "beginCaptures": {
+            "0": {
+              "name": "keyword"
+            }
+          },
+          "patterns": [
+            {
+              "begin": "(?:(?<=(?:[^[:word:]]functor|^functor))(?![[:word:]]))",
+              "end": "(\\(\\))|(\\((?!\\)))",
+              "endCaptures": {
+                "1": {
+                  "name": "constant.language constant.numeric entity.other.attribute-name.id.css strong"
+                },
+                "2": {
+                  "name": "punctuation.definition.tag"
+                }
+              }
+            },
+            {
+              "begin": "(?<=\\()",
+              "end": "(:)|(\\))",
+              "endCaptures": {
+                "1": {
+                  "name": "variable.other.class.js message.error variable.interpolation string.regexp strong"
+                },
+                "2": {
+                  "name": "punctuation.definition.tag"
+                }
+              },
+              "patterns": [
+                {
+                  "include": "#variableModule"
+                }
+              ]
+            },
+            {
+              "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]:|^:))(?![#\\-:!?.@*/&%^+<=>|~$]))",
+              "end": "\\)",
+              "endCaptures": {
+                "0": {
+                  "name": "punctuation.definition.tag"
+                }
+              },
+              "patterns": [
+                {
+                  "include": "#signature"
+                }
+              ]
+            },
+            {
+              "begin": "(?<=\\))",
+              "end": "(\\()|((?<![#\\-:!?.@*/&%^+<=>|~$])->(?![#\\-:!?.@*/&%^+<=>|~$]))",
+              "endCaptures": {
+                "1": {
+                  "name": "punctuation.definition.tag"
+                },
+                "2": {
+                  "name": "support.type strong"
+                }
+              }
+            },
+            {
+              "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]->|^->))(?![#\\-:!?.@*/&%^+<=>|~$]))",
+              "end": "(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+              "patterns": [
+                {
+                  "include": "#structure"
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "match": "(?<![#\\-:!?.@*/&%^+<=>|~$])->(?![#\\-:!?.@*/&%^+<=>|~$])",
+          "name": "support.type strong"
+        }
+      ]
+    },
+    "structureLiteral": {
+      "begin": "\\bstruct\\b",
+      "end": "\\bend\\b",
+      "captures": {
+        "0": {
+          "name": "punctuation.definition.tag emphasis"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#pragma"
+        },
+        {
+          "include": "#decl"
+        }
+      ]
+    },
+    "structureParens": {
+      "begin": "\\(",
+      "end": "\\)",
+      "captures": {
+        "0": {
+          "name": "punctuation.definition.tag"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#structureUnpack"
+        },
+        {
+          "include": "#structure"
+        }
+      ]
+    },
+    "structureUnpack": {
+      "begin": "\\bval\\b",
+      "end": "(?=\\))",
+      "beginCaptures": {
+        "0": {
+          "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+        }
+      }
+    },
+    "term": {
+      "patterns": [
+        {
+          "include": "#termLet"
+        },
+        {
+          "include": "#termAtomic"
+        }
+      ]
+    },
+    "termAtomic": {
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "include": "#termConditional"
+        },
+        {
+          "include": "#termConstructor"
+        },
+        {
+          "include": "#termDelim"
+        },
+        {
+          "include": "#termFor"
+        },
+        {
+          "include": "#termFunction"
+        },
+        {
+          "include": "#literal"
+        },
+        {
+          "include": "#termMatch"
+        },
+        {
+          "include": "#termMatchRule"
+        },
+        {
+          "include": "#termPun"
+        },
+        {
+          "include": "#termOperator"
+        },
+        {
+          "include": "#termTry"
+        },
+        {
+          "include": "#termWhile"
+        },
+        {
+          "include": "#pathRecord"
+        }
+      ]
+    },
+    "termConditional": {
+      "match": "\\b(?:if|then|else)\\b",
+      "name": "keyword.control"
+    },
+    "termConstructor": {
+      "patterns": [
+        {
+          "include": "#pathModulePrefixSimple"
+        },
+        {
+          "match": "(?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)",
+          "name": "constant.language constant.numeric entity.other.attribute-name.id.css strong"
+        }
+      ]
+    },
+    "termDelim": {
+      "patterns": [
+        {
+          "begin": "\\((?!\\))",
+          "end": "\\)",
+          "captures": {
+            "0": {
+              "name": "punctuation.definition.tag"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#term"
+            }
+          ]
+        },
+        {
+          "begin": "\\bbegin\\b",
+          "end": "\\bend\\b",
+          "captures": {
+            "0": {
+              "name": "punctuation.definition.tag"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#attributeIdentifier"
+            },
+            {
+              "include": "#term"
+            }
+          ]
+        }
+      ]
+    },
+    "termFor": {
+      "patterns": [
+        {
+          "begin": "\\bfor\\b",
+          "end": "\\bdone\\b",
+          "beginCaptures": {
+            "0": {
+              "name": "keyword.control"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "keyword.control"
+            }
+          },
+          "patterns": [
+            {
+              "begin": "(?:(?<=(?:[^[:word:]]for|^for))(?![[:word:]]))",
+              "end": "(?<![#\\-:!?.@*/&%^+<=>|~$])=(?![#\\-:!?.@*/&%^+<=>|~$])",
+              "endCaptures": {
+                "0": {
+                  "name": "support.type strong"
+                }
+              },
+              "patterns": [
+                {
+                  "include": "#pattern"
+                }
+              ]
+            },
+            {
+              "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]=|^=))(?![#\\-:!?.@*/&%^+<=>|~$]))",
+              "end": "\\b(?:downto|to)\\b",
+              "endCaptures": {
+                "0": {
+                  "name": "keyword.control"
+                }
+              },
+              "patterns": [
+                {
+                  "include": "#term"
+                }
+              ]
+            },
+            {
+              "begin": "(?:(?<=(?:[^[:word:]]to|^to))(?![[:word:]]))",
+              "end": "\\bdo\\b",
+              "endCaptures": {
+                "0": {
+                  "name": "keyword.control"
+                }
+              },
+              "patterns": [
+                {
+                  "include": "#term"
+                }
+              ]
+            },
+            {
+              "begin": "(?:(?<=(?:[^[:word:]]do|^do))(?![[:word:]]))",
+              "end": "(?=\\bdone\\b)",
+              "patterns": [
+                {
+                  "include": "#term"
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    },
+    "termFunction": {
+      "match": "\\b(?:(fun)|(function))\\b",
+      "captures": {
+        "1": {
+          "name": "storage.type"
+        },
+        "2": {
+          "name": "storage.type"
+        }
+      }
+    },
+    "termLet": {
+      "patterns": [
+        {
+          "begin": "(?:(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]=|^=|[^#\\-:!?.@*/&%^+<=>|~$]->|^->))(?![#\\-:!?.@*/&%^+<=>|~$]))|(?<=;|\\())(?=[[:space:]]|\\blet\\b)|(?:(?<=(?:[^[:word:]]begin|^begin|[^[:word:]]do|^do|[^[:word:]]else|^else|[^[:word:]]in|^in|[^[:word:]]struct|^struct|[^[:word:]]then|^then|[^[:word:]]try|^try))(?![[:word:]]))|(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]@@|^@@))(?![#\\-:!?.@*/&%^+<=>|~$]))[[:space:]]+",
+          "end": "\\b(?:(and)|(let))\\b|(?=[^[:space:]])(?!\\(\\*)",
+          "endCaptures": {
+            "1": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp markup.underline"
+            },
+            "2": {
+              "name": "storage.type markup.underline"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#comment"
+            }
+          ]
+        },
+        {
+          "begin": "(?:(?<=(?:[^[:word:]]and|^and|[^[:word:]]let|^let))(?![[:word:]]))|(let)",
+          "end": "\\b(?:(and)|(in))\\b|(?=\\}|\\)|\\]|\\b(?:end|class|exception|external|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "beginCaptures": {
+            "1": {
+              "name": "storage.type markup.underline"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp markup.underline"
+            },
+            "2": {
+              "name": "storage.type markup.underline"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#bindTerm"
+            }
+          ]
+        }
+      ]
+    },
+    "termMatch": {
+      "begin": "\\bmatch\\b",
+      "end": "\\bwith\\b",
+      "captures": {
+        "0": {
+          "name": "keyword.control"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#term"
+        }
+      ]
+    },
+    "termMatchRule": {
+      "patterns": [
+        {
+          "begin": "(?:(?<=(?:[^[:word:]]fun|^fun|[^[:word:]]function|^function|[^[:word:]]with|^with))(?![[:word:]]))",
+          "end": "(?<![#\\-:!?.@*/&%^+<=>|~$])(\\|)|(->)(?![#\\-:!?.@*/&%^+<=>|~$])",
+          "endCaptures": {
+            "1": {
+              "name": "support.type strong"
+            },
+            "2": {
+              "name": "support.type strong"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#comment"
+            },
+            {
+              "include": "#attributeIdentifier"
+            },
+            {
+              "include": "#pattern"
+            }
+          ]
+        },
+        {
+          "begin": "(?:(?<=(?:[^\\[#\\-:!?.@*/&%^+<=>|~$]\\||^\\|))(?![#\\-:!?.@*/&%^+<=>|~$]))|(?<![#\\-:!?.@*/&%^+<=>|~$])\\|(?![#\\-:!?.@*/&%^+<=>|~$])",
+          "end": "(?<![#\\-:!?.@*/&%^+<=>|~$])(\\|)|(->)(?![#\\-:!?.@*/&%^+<=>|~$])",
+          "beginCaptures": {
+            "0": {
+              "name": "support.type strong"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "support.type strong"
+            },
+            "2": {
+              "name": "support.type strong"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#pattern"
+            },
+            {
+              "begin": "\\bwhen\\b",
+              "end": "(?=(?<![#\\-:!?.@*/&%^+<=>|~$])->(?![#\\-:!?.@*/&%^+<=>|~$]))",
+              "beginCaptures": {
+                "0": {
+                  "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+                }
+              },
+              "patterns": [
+                {
+                  "include": "#term"
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    },
+    "termOperator": {
+      "patterns": [
+        {
+          "begin": "(?<![#\\-:!?.@*/&%^+<=>|~$])#(?![#\\-:!?.@*/&%^+<=>|~$])",
+          "end": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)",
+          "beginCaptures": {
+            "0": {
+              "name": "keyword"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "entity.name.function"
+            }
+          }
+        },
+        {
+          "match": "<-",
+          "captures": {
+            "0": {
+              "name": "keyword.control strong"
+            }
+          }
+        },
+        {
+          "match": "(,|[#\\-:!?.@*/&%^+<=>|~$]+)|(;)",
+          "captures": {
+            "1": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+            },
+            "2": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+            }
+          }
+        },
+        {
+          "match": "\\b(?:and|assert|asr|land|lazy|lsr|lxor|mod|new|or)\\b",
+          "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+        }
+      ]
+    },
+    "termPun": {
+      "begin": "(?<![#\\-:!?.@*/&%^+<=>|~$])\\?|~(?![#\\-:!?.@*/&%^+<=>|~$])",
+      "end": ":|(?=[^[:space:]:])",
+      "applyEndPatternLast": true,
+      "beginCaptures": {
+        "0": {
+          "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+        }
+      },
+      "endCaptures": {
+        "0": {
+          "name": "keyword"
+        }
+      },
+      "patterns": [
+        {
+          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]\\?|^\\?|[^#\\-:!?.@*/&%^+<=>|~$]~|^~))(?![#\\-:!?.@*/&%^+<=>|~$]))",
+          "end": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)",
+          "endCaptures": {
+            "0": {
+              "name": "markup.inserted constant.language support.constant.property-value entity.name.filename"
+            }
+          }
+        }
+      ]
+    },
+    "termTry": {
+      "begin": "\\btry\\b",
+      "end": "\\bwith\\b",
+      "captures": {
+        "0": {
+          "name": "keyword.control"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#term"
+        }
+      ]
+    },
+    "termWhile": {
+      "patterns": [
+        {
+          "begin": "\\bwhile\\b",
+          "end": "\\bdone\\b",
+          "beginCaptures": {
+            "0": {
+              "name": "keyword.control"
+            }
+          },
+          "endCaptures": {
+            "0": {
+              "name": "keyword.control"
+            }
+          },
+          "patterns": [
+            {
+              "begin": "(?:(?<=(?:[^[:word:]]while|^while))(?![[:word:]]))",
+              "end": "\\bdo\\b",
+              "endCaptures": {
+                "0": {
+                  "name": "keyword.control"
+                }
+              },
+              "patterns": [
+                {
+                  "include": "#term"
+                }
+              ]
+            },
+            {
+              "begin": "(?:(?<=(?:[^[:word:]]do|^do))(?![[:word:]]))",
+              "end": "(?=\\bdone\\b)",
+              "patterns": [
+                {
+                  "include": "#term"
+                }
+              ]
+            }
+          ]
+        }
+      ]
+    },
+    "type": {
+      "patterns": [
+        {
+          "include": "#comment"
+        },
+        {
+          "match": "\\bnonrec\\b",
+          "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+        },
+        {
+          "include": "#pathModulePrefixExtended"
+        },
+        {
+          "include": "#typeLabel"
+        },
+        {
+          "include": "#typeObject"
+        },
+        {
+          "include": "#typeOperator"
+        },
+        {
+          "include": "#typeParens"
+        },
+        {
+          "include": "#typePolymorphicVariant"
+        },
+        {
+          "include": "#typeRecord"
+        },
+        {
+          "include": "#typeConstructor"
+        }
+      ]
+    },
+    "typeConstructor": {
+      "patterns": [
+        {
+          "begin": "(_)|((?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*))|(')((?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*))|(?<=[^\\*]\\)|\\])",
+          "end": "(?=\\((?!\\*)|\\*|:|,|=|\\.|>|-|\\{|\\[|\\+|\\}|\\)|\\]|;|\\|)|((?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*))[:space:]*(?!\\(\\*|[[:word:]])|(?=;;|\\}|\\)|\\]|\\b(?:end|and|class|exception|external|in|include|inherit|initializer|let|method|module|open|type|val)\\b)",
+          "beginCaptures": {
+            "1": {
+              "name": "comment constant.regexp meta.separator.markdown"
+            },
+            "3": {
+              "name": "string.other.link variable.language variable.parameter emphasis strong emphasis"
+            },
+            "4": {
+              "name": "keyword.control emphasis"
+            }
+          },
+          "endCaptures": {
+            "1": {
+              "name": "entity.name.function strong"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#comment"
+            },
+            {
+              "include": "#pathModulePrefixExtended"
+            }
+          ]
+        }
+      ]
+    },
+    "typeLabel": {
+      "patterns": [
+        {
+          "begin": "(\\??)((?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*))[[:space:]]*((?<![#\\-:!?.@*/&%^+<=>|~$]):(?![#\\-:!?.@*/&%^+<=>|~$]))",
+          "end": "(?=(?<![#\\-:!?.@*/&%^+<=>|~$])->(?![#\\-:!?.@*/&%^+<=>|~$]))",
+          "captures": {
+            "1": {
+              "name": "keyword strong emphasis"
+            },
+            "2": {
+              "name": "markup.inserted constant.language support.constant.property-value entity.name.filename emphasis"
+            },
+            "3": {
+              "name": "keyword"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#type"
+            }
+          ]
+        }
+      ]
+    },
+    "typeModule": {
+      "begin": "\\bmodule\\b",
+      "end": "(?=\\))",
+      "beginCaptures": {
+        "0": {
+          "name": "markup.inserted constant.language support.constant.property-value entity.name.filename"
+        }
+      },
+      "patterns": [
+        {
+          "include": "#pathModuleExtended"
+        },
+        {
+          "include": "#signatureConstraints"
+        }
+      ]
+    },
+    "typeObject": {
+      "begin": "<",
+      "end": ">",
+      "captures": {
+        "0": {
+          "name": "constant.language constant.numeric entity.other.attribute-name.id.css strong strong"
+        }
+      },
+      "patterns": [
+        {
+          "begin": "(?<=<|;)",
+          "end": "(:)|(?=>)",
+          "endCaptures": {
+            "1": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp strong"
+            },
+            "3": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+            },
+            "4": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#comment"
+            },
+            {
+              "include": "#pathModulePrefixSimple"
+            },
+            {
+              "match": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)",
+              "name": "markup.inserted constant.language support.constant.property-value entity.name.filename emphasis"
+            }
+          ]
+        },
+        {
+          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]:|^:))(?![#\\-:!?.@*/&%^+<=>|~$]))",
+          "end": "(;)|(?=>)",
+          "endCaptures": {
+            "1": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+            },
+            "2": {
+              "name": "support.type strong"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#type"
+            }
+          ]
+        }
+      ]
+    },
+    "typeOperator": {
+      "patterns": [
+        {
+          "match": ",|;|[#\\-:!?.@*/&%^+<=>|~$]+",
+          "name": "variable.other.class.js message.error variable.interpolation string.regexp strong"
+        }
+      ]
+    },
+    "typeParens": {
+      "begin": "\\(",
+      "end": "\\)",
+      "captures": {
+        "0": {
+          "name": "punctuation.definition.tag"
+        }
+      },
+      "patterns": [
+        {
+          "match": ",",
+          "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+        },
+        {
+          "include": "#typeModule"
+        },
+        {
+          "include": "#type"
+        }
+      ]
+    },
+    "typePolymorphicVariant": {
+      "begin": "\\[",
+      "end": "\\]",
+      "patterns": []
+    },
+    "typeRecord": {
+      "begin": "\\{",
+      "end": "\\}",
+      "captures": {
+        "0": {
+          "name": "constant.language constant.numeric entity.other.attribute-name.id.css strong strong"
+        }
+      },
+      "patterns": [
+        {
+          "begin": "(?<=\\{|;)",
+          "end": "(:)|(=)|(;)|(with)|(?=\\})",
+          "endCaptures": {
+            "1": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp strong"
+            },
+            "2": {
+              "name": "support.type strong"
+            },
+            "3": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+            },
+            "4": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#comment"
+            },
+            {
+              "include": "#pathModulePrefixSimple"
+            },
+            {
+              "match": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)",
+              "name": "markup.inserted constant.language support.constant.property-value entity.name.filename emphasis"
+            }
+          ]
+        },
+        {
+          "begin": "(?:(?<=(?:[^[:word:]]with|^with))(?![[:word:]]))",
+          "end": "(:)|(=)|(;)|(?=\\})",
+          "endCaptures": {
+            "1": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp strong"
+            },
+            "2": {
+              "name": "support.type strong"
+            },
+            "3": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+            }
+          },
+          "patterns": [
+            {
+              "match": "(?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*)",
+              "name": "markup.inserted constant.language support.constant.property-value entity.name.filename emphasis"
+            }
+          ]
+        },
+        {
+          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]:|^:))(?![#\\-:!?.@*/&%^+<=>|~$]))",
+          "end": "(;)|(=)|(?=\\})",
+          "endCaptures": {
+            "1": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+            },
+            "2": {
+              "name": "support.type strong"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#type"
+            }
+          ]
+        },
+        {
+          "begin": "(?:(?<=(?:[^#\\-:!?.@*/&%^+<=>|~$]=|^=))(?![#\\-:!?.@*/&%^+<=>|~$]))",
+          "end": ";|(?=\\})",
+          "endCaptures": {
+            "0": {
+              "name": "variable.other.class.js message.error variable.interpolation string.regexp"
+            }
+          },
+          "patterns": [
+            {
+              "include": "#type"
+            }
+          ]
+        }
+      ]
+    },
+    "variableModule": {
+      "match": "(?:\\b(?=[[:upper:]])[[:alpha:]_][[:word:]']*)",
+      "captures": {
+        "0": {
+          "name": "string.other.link variable.language variable.parameter emphasis"
+        }
+      }
+    },
+    "variablePattern": {
+      "match": "(\\b_\\b)|((?:(?!\\b(?:and|'|as|asr|assert|\\*|begin|class|:|,|@|constraint|do|done|downto|else|end|=|exception|external|false|for|\\.|fun|function|functor|>|-|if|in|include|inherit|initializer|land|lazy|\\{|\\(|\\[|<|let|lor|lsl|lsr|lxor|match|method|mod|module|mutable|new|nonrec|#|object|of|open|or|%|\\+|private|\\?|\"|rec|\\\\|\\}|\\)|\\]|;|sig|/|struct|then|~|to|true|try|type|val|\\||virtual|when|while|with)\\b(?:[^']|$))\\b(?=[[:lower:]_])[[:alpha:]_][[:word:]']*))",
+      "captures": {
+        "1": {
+          "name": "comment constant.regexp meta.separator.markdown"
+        },
+        "2": {
+          "name": "string.other.link variable.language variable.parameter emphasis"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file

From 1b8ce0e52725b7ae79057d5cb61d5c8b25f929fb Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 3 Aug 2026 11:09:33 +0800
Subject: [PATCH 08/34] fix: when fallbacks to `Bounds.Width`, respect the
 padding of `TextBox`

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/CommitMessageToolBox.axaml.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Views/CommitMessageToolBox.axaml.cs b/src/Views/CommitMessageToolBox.axaml.cs
index efdff3ba4..480192cfb 100644
--- a/src/Views/CommitMessageToolBox.axaml.cs
+++ b/src/Views/CommitMessageToolBox.axaml.cs
@@ -387,7 +387,7 @@ private void OnLayoutUpdated(object sender, EventArgs e)
                 return;
             }
 
-            var requiredWidth = _scrollViewer?.Viewport.Width ?? Bounds.Width;
+            var requiredWidth = _scrollViewer?.Viewport.Width ?? (Bounds.Width - 10);
             if (Math.Abs(_textPresenter.Bounds.Width - requiredWidth) >= 0.01)
             {
                 _textPresenter.Width = requiredWidth;

From 78ffc2bf49f3bcb3af34a8932f9cc248731dc9fd Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 3 Aug 2026 14:19:20 +0800
Subject: [PATCH 09/34] ux: pressing `ESC` will also clear notifications

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/Launcher.axaml.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Views/Launcher.axaml.cs b/src/Views/Launcher.axaml.cs
index 99ebf66d9..e5d1a1923 100644
--- a/src/Views/Launcher.axaml.cs
+++ b/src/Views/Launcher.axaml.cs
@@ -299,6 +299,7 @@ protected override async void OnKeyDown(KeyEventArgs e)
             else if (e.Key == Key.Escape)
             {
                 vm.ActivePage.CancelPopup();
+                vm.ActivePage.Notifications.Clear();
                 e.Handled = true;
                 return;
             }

From f7a4e66cc1ab3d2d90f9010545e1d8904b917208 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 3 Aug 2026 14:48:06 +0800
Subject: [PATCH 10/34] fix: fast checking local change list with `Amend`
 enabled must make sure the staged list does not changed too (#2563)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/WorkingCopy.cs | 36 +++++++++++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
index c0f273529..3ab5ceee8 100644
--- a/src/ViewModels/WorkingCopy.cs
+++ b/src/ViewModels/WorkingCopy.cs
@@ -231,13 +231,45 @@ public WorkingCopy(Repository repo)
 
         public void SetData(List<Models.Change> changes)
         {
-            if (!IsChanged(_cached, changes))
+            do
             {
+                if (IsChanged(_cached, changes))
+                    break;
+
+                if (_useAmend)
+                {
+                    var testStaged = GetStagedChanges(_cached);
+                    if (IsChanged(_staged, testStaged))
+                    {
+                        var visibleStagedNew = GetVisibleChanges(testStaged);
+                        var selectedStagedNew = new List<Models.Change>();
+
+                        if (_selectedStaged is { Count: > 0 })
+                        {
+                            var set = new HashSet<string>();
+                            foreach (var c in _selectedStaged)
+                                set.Add(c.Path);
+
+                            foreach (var c in visibleStagedNew)
+                            {
+                                if (set.Contains(c.Path))
+                                    selectedStagedNew.Add(c);
+                            }
+                        }
+
+                        _isLoadingData = true;
+                        Staged = testStaged;
+                        VisibleStaged = visibleStagedNew;
+                        SelectedStaged = selectedStagedNew;
+                        _isLoadingData = false;
+                    }
+                }
+
                 HasUnsolvedConflicts = _cached.Find(x => x.IsConflicted) != null;
                 UpdateInProgressState();
                 UpdateDetail();
                 return;
-            }
+            } while (false);
 
             var lastSelectedUnstaged = new HashSet<string>();
             if (_selectedUnstaged is { Count: > 0 })

From 5f611d9513c3cb99669f50e0570d2af3dedb9219 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Mon, 3 Aug 2026 17:45:42 +0800
Subject: [PATCH 11/34] code_style: make sure that all `Stream` objects will be
 disposed immediately after operation finished

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Commands/SaveRevisionFile.cs | 2 +-
 src/ViewModels/CommitDetail.cs   | 2 +-
 src/ViewModels/FileHistories.cs  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Commands/SaveRevisionFile.cs b/src/Commands/SaveRevisionFile.cs
index 410d15b07..6c810289d 100644
--- a/src/Commands/SaveRevisionFile.cs
+++ b/src/Commands/SaveRevisionFile.cs
@@ -16,7 +16,7 @@ public static async Task RunAsync(string repo, string revision, string file, str
             var isLFSFiltered = await new IsLFSFiltered(repo, revision, file).GetResultAsync().ConfigureAwait(false);
             if (isLFSFiltered)
             {
-                var pointerStream = await QueryFileContent.RunAsync(repo, revision, file).ConfigureAwait(false);
+                await using var pointerStream = await QueryFileContent.RunAsync(repo, revision, file).ConfigureAwait(false);
                 await ExecCmdAsync(repo, "lfs smudge", saveTo, pointerStream).ConfigureAwait(false);
             }
             else
diff --git a/src/ViewModels/CommitDetail.cs b/src/ViewModels/CommitDetail.cs
index b23465774..754d36cdc 100644
--- a/src/ViewModels/CommitDetail.cs
+++ b/src/ViewModels/CommitDetail.cs
@@ -694,7 +694,7 @@ private async Task SetViewingBlobAsync(Models.Object file)
                 return;
             }
 
-            var contentStream = await Commands.QueryFileContent.RunAsync(_repo.FullPath, _commit.SHA, file.Path);
+            await using var contentStream = await Commands.QueryFileContent.RunAsync(_repo.FullPath, _commit.SHA, file.Path);
             var content = await new StreamReader(contentStream).ReadToEndAsync();
             var lfs = Models.LFSObject.Parse(content);
             if (lfs != null)
diff --git a/src/ViewModels/FileHistories.cs b/src/ViewModels/FileHistories.cs
index 374396f1f..6cd4b1b8e 100644
--- a/src/ViewModels/FileHistories.cs
+++ b/src/ViewModels/FileHistories.cs
@@ -131,7 +131,7 @@ private async Task<object> GetRevisionFileContentAsync(Models.Object obj)
                     return new FileHistoriesRevisionFile(_file, binaryFile, true);
                 }
 
-                var contentStream = await Commands.QueryFileContent.RunAsync(_repo, _revision.SHA, _file).ConfigureAwait(false);
+                await using var contentStream = await Commands.QueryFileContent.RunAsync(_repo, _revision.SHA, _file).ConfigureAwait(false);
                 var content = await new StreamReader(contentStream).ReadToEndAsync();
                 var lfs = Models.LFSObject.Parse(content);
                 if (lfs != null)

From 5f55e545ce81178e2b8bd3b08c4ddea7a643c85d Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 4 Aug 2026 11:40:56 +0800
Subject: [PATCH 12/34] feature: add a built-in hex-viewer to preview content
 of a binary file (#2593)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Models/RevisionFile.cs                |  11 +
 src/Resources/Locales/en_US.axaml         |   2 +
 src/Resources/Locales/zh_CN.axaml         |   2 +
 src/Resources/Locales/zh_TW.axaml         |   2 +
 src/ViewModels/BinaryFile.cs              |  83 ++++++
 src/ViewModels/CommitDetail.cs            |   2 +-
 src/ViewModels/FileHistories.cs           |   2 +-
 src/Views/BinaryFileViewer.axaml          |  49 ++++
 src/Views/BinaryFileViewer.axaml.cs       | 318 ++++++++++++++++++++++
 src/Views/RevisionFileContentViewer.axaml |   8 +-
 10 files changed, 470 insertions(+), 9 deletions(-)
 create mode 100644 src/ViewModels/BinaryFile.cs
 create mode 100644 src/Views/BinaryFileViewer.axaml
 create mode 100644 src/Views/BinaryFileViewer.axaml.cs

diff --git a/src/Models/RevisionFile.cs b/src/Models/RevisionFile.cs
index 9a9fe7d20..f2fb464d7 100644
--- a/src/Models/RevisionFile.cs
+++ b/src/Models/RevisionFile.cs
@@ -6,7 +6,18 @@ namespace SourceGit.Models
 {
     public class RevisionBinaryFile
     {
+        public string Repository { get; set; } = string.Empty;
+        public string File { get; set; } = string.Empty;
+        public string Revision { get; set; } = string.Empty;
         public long Size { get; set; } = 0;
+
+        public RevisionBinaryFile(string repo, string file, string revision, long size)
+        {
+            Repository = repo;
+            File = file;
+            Revision = revision;
+            Size = size;
+        }
     }
 
     public class RevisionImageFile
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 676bd57a0..5c76fa80a 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -420,6 +420,8 @@
   <x:String x:Key="Text.Fetch.NoTags" xml:space="preserve">Fetch without tags</x:String>
   <x:String x:Key="Text.Fetch.Remote" xml:space="preserve">Remote:</x:String>
   <x:String x:Key="Text.Fetch.Title" xml:space="preserve">Fetch Remote Changes</x:String>
+  <x:String x:Key="Text.File.Binary" xml:space="preserve">BINARY FILE</x:String>
+  <x:String x:Key="Text.File.HexViewer" xml:space="preserve">HEX VIEWER</x:String>
   <x:String x:Key="Text.FileCM.AssumeUnchanged" xml:space="preserve">Assume unchanged</x:String>
   <x:String x:Key="Text.FileCM.CustomAction" xml:space="preserve">Custom Action</x:String>
   <x:String x:Key="Text.FileCM.Discard" xml:space="preserve">Discard...</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index d77cd5418..c3f171325 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -424,6 +424,8 @@
   <x:String x:Key="Text.Fetch.NoTags" xml:space="preserve">不拉取远程标签</x:String>
   <x:String x:Key="Text.Fetch.Remote" xml:space="preserve">远程仓库 ：</x:String>
   <x:String x:Key="Text.Fetch.Title" xml:space="preserve">拉取远程仓库内容</x:String>
+  <x:String x:Key="Text.File.Binary" xml:space="preserve">二进制文件</x:String>
+  <x:String x:Key="Text.File.HexViewer" xml:space="preserve">查看内容</x:String>
   <x:String x:Key="Text.FileCM.AssumeUnchanged" xml:space="preserve">不跟踪此文件的更改</x:String>
   <x:String x:Key="Text.FileCM.CustomAction" xml:space="preserve">自定义操作</x:String>
   <x:String x:Key="Text.FileCM.Discard" xml:space="preserve">放弃更改...</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index b07c82996..3155fe0b5 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -424,6 +424,8 @@
   <x:String x:Key="Text.Fetch.NoTags" xml:space="preserve">不提取遠端標籤</x:String>
   <x:String x:Key="Text.Fetch.Remote" xml:space="preserve">遠端存放庫:</x:String>
   <x:String x:Key="Text.Fetch.Title" xml:space="preserve">提取遠端存放庫內容</x:String>
+  <x:String x:Key="Text.File.Binary" xml:space="preserve">二進位檔案</x:String>
+  <x:String x:Key="Text.File.HexViewer" xml:space="preserve">檢視內容</x:String>
   <x:String x:Key="Text.FileCM.AssumeUnchanged" xml:space="preserve">不追蹤此檔案的變更</x:String>
   <x:String x:Key="Text.FileCM.CustomAction" xml:space="preserve">自訂動作</x:String>
   <x:String x:Key="Text.FileCM.Discard" xml:space="preserve">捨棄變更...</x:String>
diff --git a/src/ViewModels/BinaryFile.cs b/src/ViewModels/BinaryFile.cs
new file mode 100644
index 000000000..5c1985d47
--- /dev/null
+++ b/src/ViewModels/BinaryFile.cs
@@ -0,0 +1,83 @@
+using System;
+using System.IO;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace SourceGit.ViewModels
+{
+    public class BinaryFile : ObservableObject, IDisposable
+    {
+        public long FileSize
+        {
+            get => _fileSize;
+            private set => SetProperty(ref _fileSize, value);
+        }
+
+        public static async Task<BinaryFile> LoadAsync(string repo, string path, string revision = "HEAD")
+        {
+            string saveTo = Path.GetTempFileName();
+            await Commands.SaveRevisionFile.RunAsync(repo, revision, path, saveTo).ConfigureAwait(false);
+            return new BinaryFile(saveTo);
+        }
+
+        public BinaryFile(string file)
+        {
+            _filePath = file;
+
+            if (File.Exists(_filePath))
+            {
+                _fileSize = new FileInfo(_filePath).Length;
+                _reader = new FileStream(_filePath, FileMode.Open, FileAccess.Read, FileShare.Read, BUFFER_SIZE, FileOptions.RandomAccess);
+                _readedStart = 0;
+                _readedEnd = Math.Min(_fileSize, BUFFER_SIZE);
+
+                if (_fileSize > 0)
+                {
+                    _reader.Seek(_readedStart, SeekOrigin.Begin);
+                    _reader.ReadExactly(_buffer, 0, (int)_readedEnd);
+                }
+            }
+        }
+
+        public void Dispose()
+        {
+            _reader?.Dispose();
+            _reader = null;
+
+            if (File.Exists(_filePath))
+                File.Delete(_filePath);
+        }
+
+        public ArraySegment<byte> Read(long offset, long length)
+        {
+            if (_reader == null || _fileSize == 0 || offset >= _fileSize)
+                return Array.Empty<byte>();
+
+            if (length > 8192)
+                length = 8192;
+
+            if (offset + length > _fileSize)
+                length = _fileSize - offset;
+
+            if (_readedStart <= offset && _readedEnd >= offset + length)
+                return new ArraySegment<byte>(_buffer, (int)(offset - _readedStart), (int)length);
+
+            _readedStart = (Math.Max(0, offset - 2048) / 1024) * 1024;
+            _readedEnd = Math.Min(_readedStart + BUFFER_SIZE, _fileSize);
+
+            _reader.Seek(_readedStart, SeekOrigin.Begin);
+            _reader.ReadExactly(_buffer, 0, (int)(_readedEnd - _readedStart));
+
+            return new ArraySegment<byte>(_buffer, (int)(offset - _readedStart), (int)length);
+        }
+
+        private const int BUFFER_SIZE = 16384;
+
+        private string _filePath = string.Empty;
+        private FileStream _reader = null;
+        private long _fileSize = 0;
+        private long _readedStart = 0;
+        private long _readedEnd = 0;
+        private byte[] _buffer = new byte[BUFFER_SIZE];
+    }
+}
diff --git a/src/ViewModels/CommitDetail.cs b/src/ViewModels/CommitDetail.cs
index 754d36cdc..0daf09cf9 100644
--- a/src/ViewModels/CommitDetail.cs
+++ b/src/ViewModels/CommitDetail.cs
@@ -688,7 +688,7 @@ private async Task SetViewingBlobAsync(Models.Object file)
                 else
                 {
                     var size = await new Commands.QueryFileSize(_repo.FullPath, file.Path, _commit.SHA).GetResultAsync();
-                    ViewRevisionFileContent = new Models.RevisionBinaryFile() { Size = size };
+                    ViewRevisionFileContent = new Models.RevisionBinaryFile(_repo.FullPath, file.Path, _commit.SHA, size);
                 }
 
                 return;
diff --git a/src/ViewModels/FileHistories.cs b/src/ViewModels/FileHistories.cs
index 6cd4b1b8e..1ed6f42af 100644
--- a/src/ViewModels/FileHistories.cs
+++ b/src/ViewModels/FileHistories.cs
@@ -127,7 +127,7 @@ private async Task<object> GetRevisionFileContentAsync(Models.Object obj)
                     }
 
                     var size = await new Commands.QueryFileSize(_repo, _file, _revision.SHA).GetResultAsync().ConfigureAwait(false);
-                    var binaryFile = new Models.RevisionBinaryFile() { Size = size };
+                    var binaryFile = new Models.RevisionBinaryFile(_repo, _file, _revision.SHA, size);
                     return new FileHistoriesRevisionFile(_file, binaryFile, true);
                 }
 
diff --git a/src/Views/BinaryFileViewer.axaml b/src/Views/BinaryFileViewer.axaml
new file mode 100644
index 000000000..697918b33
--- /dev/null
+++ b/src/Views/BinaryFileViewer.axaml
@@ -0,0 +1,49 @@
+<UserControl xmlns="https://github.com/avaloniaui"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:m="using:SourceGit.Models"
+             xmlns:vm="using:SourceGit.ViewModels"
+             xmlns:v="using:SourceGit.Views"
+             xmlns:c="using:SourceGit.Converters"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="SourceGit.Views.BinaryFileViewer">
+  <UserControl.DataTemplates>
+    <DataTemplate DataType="m:RevisionBinaryFile">
+      <StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center">
+        <Path Width="64" Height="64" Data="{StaticResource Icons.Binary}" Fill="{DynamicResource Brush.FG2}"/>
+        <TextBlock Margin="0,16,0,0" Text="{DynamicResource Text.File.Binary}" FontSize="18" FontWeight="Bold" HorizontalAlignment="Center" Foreground="{DynamicResource Brush.FG2}"/>
+        <StackPanel Margin="0,8,0,0" Orientation="Horizontal" HorizontalAlignment="Center">
+          <TextBlock Text="{Binding Size, Converter={x:Static c:LongConverters.ToFileSize}}" Foreground="{DynamicResource Brush.FG2}"/>
+        </StackPanel>
+        <Button Classes="flat"
+                Margin="0,16,0,0"
+                HorizontalAlignment="Center"
+                Content="{DynamicResource Text.File.HexViewer}"
+                Click="OnOpenHexViewer"/>
+      </StackPanel>
+    </DataTemplate>
+    
+    <DataTemplate DataType="m:Null">
+      <v:LoadingIcon Width="64" Height="64"
+                     HorizontalAlignment="Center" VerticalAlignment="Center"/>
+    </DataTemplate>
+
+    <DataTemplate DataType="vm:BinaryFile">
+      <Grid ColumnDefinitions="*,Auto" Background="Transparent">
+        <v:HexViewer Grid.Column="0"
+                     Foreground="{DynamicResource Brush.FG1}"
+                     HeaderForeground="{DynamicResource Brush.Accent}"
+                     ClipToBounds="True"/>
+
+        <ScrollBar Grid.Column="1"
+                   Margin="0,24,0,0"
+                   Orientation="Vertical"
+                   AllowAutoHide="False"
+                   SmallChange="18"
+                   ValueChanged="OnScrollBarValueChanged"
+                   SizeChanged="OnScrollBarSizeChanged"/>
+      </Grid>
+    </DataTemplate>
+  </UserControl.DataTemplates>
+</UserControl>
diff --git a/src/Views/BinaryFileViewer.axaml.cs b/src/Views/BinaryFileViewer.axaml.cs
new file mode 100644
index 000000000..9647a8b62
--- /dev/null
+++ b/src/Views/BinaryFileViewer.axaml.cs
@@ -0,0 +1,318 @@
+using System;
+using System.Globalization;
+using System.Threading;
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Controls.Primitives;
+using Avalonia.Input;
+using Avalonia.Interactivity;
+using Avalonia.Media;
+using Avalonia.VisualTree;
+
+namespace SourceGit.Views
+{
+    public class HexViewer : Control
+    {
+        public static readonly DirectProperty<HexViewer, long> OffsetProperty =
+            AvaloniaProperty.RegisterDirect<HexViewer, long>(
+                nameof(Offset),
+                static o => o.Offset,
+                static (o, v) => o.Offset = v);
+
+        public long Offset
+        {
+            get => _offset;
+            set
+            {
+                if (SetAndRaise(OffsetProperty, ref _offset, value))
+                    InvalidateVisual();
+            }
+        }
+
+        public static readonly StyledProperty<IBrush> HeaderForegroundProperty =
+            AvaloniaProperty.Register<HexViewer, IBrush>(nameof(HeaderForeground), Brushes.White);
+
+        public IBrush HeaderForeground
+        {
+            get => GetValue(HeaderForegroundProperty);
+            set => SetValue(HeaderForegroundProperty, value);
+        }
+
+        public static readonly StyledProperty<IBrush> ForegroundProperty =
+            AvaloniaProperty.Register<HexViewer, IBrush>(nameof(Foreground), Brushes.White);
+
+        public IBrush Foreground
+        {
+            get => GetValue(ForegroundProperty);
+            set => SetValue(ForegroundProperty, value);
+        }
+
+        public const double HEADER_HEIGHT = 24.0;
+        public const double LINE_HEIGHT = 18.0;
+        public const double BYTE_CELL_WIDTH = 22.0;
+        public const int BYTES_PER_LINE = 16;
+        public const int BYTES_PER_LINE_HALF = 8;
+        public const double FONT_SIZE = 13;
+
+        public override void Render(DrawingContext context)
+        {
+            base.Render(context);
+
+            if (DataContext is not ViewModels.BinaryFile vm)
+                return;
+
+            context.FillRectangle(Brushes.Transparent, new Rect(0, 0, Bounds.Width, Bounds.Height));
+
+            var typeface = new Typeface("fonts:SourceGit#JetBrains Mono NL");
+            var foreground = Foreground;
+            var headerForeground = HeaderForeground;
+            var highlightedBackground = new SolidColorBrush(Colors.Red, 0.2);
+            var highlightedBorder = new Pen(Brushes.Red, 0.5);
+
+            var test = new FormattedText(
+                "F",
+                CultureInfo.CurrentCulture,
+                FlowDirection.LeftToRight,
+                typeface,
+                FONT_SIZE,
+                foreground);
+
+            var addrColumnWidth = test.Width * 9;
+            var x = addrColumnWidth + 16.0;
+
+            _charWidth = test.Width;
+            _first8BytesX = x;
+            _second8BytesX = x + (BYTE_CELL_WIDTH * BYTES_PER_LINE_HALF) + 16.0;
+            _asciiColumnX = _second8BytesX + (BYTE_CELL_WIDTH * BYTES_PER_LINE_HALF) + 16.0;
+
+            for (int i = 0; i < BYTES_PER_LINE; i++)
+            {
+                var hexLabel = new FormattedText(
+                    i.ToString("X1"),
+                    CultureInfo.CurrentCulture,
+                    FlowDirection.LeftToRight,
+                    typeface,
+                    FONT_SIZE,
+                    headerForeground);
+
+                var startX = x + (BYTE_CELL_WIDTH - hexLabel.Width) * 0.5;
+                var startY = (HEADER_HEIGHT - hexLabel.Height) * 0.5;
+                context.DrawText(hexLabel, new Point(startX, startY));
+                x += BYTE_CELL_WIDTH;
+
+                if (i == 7 || i == 15)
+                    x += 16.0;
+            }
+
+            var dataSize = (long)Math.Ceiling((Bounds.Height - HEADER_HEIGHT) / LINE_HEIGHT) * BYTES_PER_LINE;
+            var data = vm.Read(_offset, dataSize);
+            if (data.Count == 0)
+                return;
+
+            x = 0.0;
+            var y = HEADER_HEIGHT - LINE_HEIGHT;
+            var columnIdx = 0;
+            for (var i = 0; i < data.Count; i++)
+            {
+                if (i % BYTES_PER_LINE == 0)
+                {
+                    columnIdx = 0;
+                    x = 0;
+                    y += LINE_HEIGHT;
+
+                    var addr = new FormattedText(
+                        (_offset + i).ToString("X8") + ":",
+                        CultureInfo.CurrentCulture,
+                        FlowDirection.LeftToRight,
+                        typeface,
+                        FONT_SIZE,
+                        headerForeground);
+
+                    context.DrawText(addr, new Point(x, y + (LINE_HEIGHT - addr.Height) * 0.5));
+                    x += addrColumnWidth + 16.0;
+                }
+
+                var isHighlighted = (i + _offset) == _highlightedIdx;
+                var hex = data[i];
+                var hexLabel = new FormattedText(
+                    hex.ToString("X2"),
+                    CultureInfo.CurrentCulture,
+                    FlowDirection.LeftToRight,
+                    typeface,
+                    FONT_SIZE,
+                    hex == 0 ? Brushes.Gray : foreground);
+
+                var ch = (char)hex;
+                var isPrintable = (hex >= 0x20 && hex <= 0x7E);
+                var chLabel = new FormattedText(
+                    isPrintable ? ch.ToString() : ".",
+                    CultureInfo.CurrentCulture,
+                    FlowDirection.LeftToRight,
+                    typeface,
+                    FONT_SIZE,
+                    isPrintable ? Brushes.Green : Brushes.Gray);
+
+                var hexX = x + (BYTE_CELL_WIDTH - hexLabel.Width) * 0.5;
+                var hexY = y + (LINE_HEIGHT - hexLabel.Height) * 0.5;
+                if (isHighlighted)
+                    context.DrawRectangle(highlightedBackground, highlightedBorder, new Rect(x, y, BYTE_CELL_WIDTH, LINE_HEIGHT), 2, 2);
+
+                context.DrawText(hexLabel, new Point(hexX, hexY));
+
+                var asciiX = _asciiColumnX + columnIdx * test.Width;
+                var asciiY = y + (LINE_HEIGHT - chLabel.Height) * 0.5;
+                if (isHighlighted)
+                    context.DrawRectangle(highlightedBackground, highlightedBorder, new Rect(asciiX, y, test.Width, LINE_HEIGHT), 2, 2);
+
+                context.DrawText(chLabel, new Point(asciiX, asciiY));
+
+                x += BYTE_CELL_WIDTH;
+
+                if (columnIdx == 7 || columnIdx == 15)
+                    x += 16.0;
+
+                columnIdx++;
+            }
+        }
+
+        protected override void OnPointerPressed(PointerPressedEventArgs e)
+        {
+            base.OnPointerPressed(e);
+
+            var pos = e.GetPosition(this);
+            var testX = pos.X;
+            var testY = pos.Y - HEADER_HEIGHT;
+            if (testX <= _first8BytesX || testY <= 0)
+                return;
+
+            long columnIdx = -1;
+
+            if (testX >= _asciiColumnX)
+            {
+                var column = (testX - _asciiColumnX) / _charWidth;
+                if (column < 16)
+                    columnIdx = (long)Math.Floor(column);
+            }
+            else if (testX >= _second8BytesX)
+            {
+                var column = (testX - _second8BytesX) / BYTE_CELL_WIDTH;
+                if (column < 8)
+                    columnIdx = (long)Math.Floor(column) + 8;
+            }
+            else
+            {
+                var column = (testX - _first8BytesX) / BYTE_CELL_WIDTH;
+                if (column < 8)
+                    columnIdx = (long)Math.Floor(column);
+            }
+
+            if (columnIdx < 0)
+                return;
+
+            var rowIdx = (long)Math.Floor(testY / LINE_HEIGHT);
+            SetHighlightedIndex(_offset + rowIdx * BYTES_PER_LINE + columnIdx);
+        }
+
+        private void SetHighlightedIndex(long idx)
+        {
+            if (idx == _highlightedIdx)
+                return;
+
+            _highlightedIdx = idx;
+            InvalidateVisual();
+        }
+
+        private long _offset = 0;
+        private double _charWidth = 0;
+        private double _first8BytesX = 0;
+        private double _second8BytesX = 0;
+        private double _asciiColumnX = 0;
+        private long _highlightedIdx = -1;
+    }
+
+    public partial class BinaryFileViewer : UserControl
+    {
+        public BinaryFileViewer()
+        {
+            InitializeComponent();
+        }
+
+        protected override void OnUnloaded(RoutedEventArgs e)
+        {
+            base.OnUnloaded(e);
+
+            if (Content is ViewModels.BinaryFile old)
+            {
+                Content = null;
+                old.Dispose();
+            }
+        }
+
+        protected override void OnDataContextChanged(EventArgs e)
+        {
+            base.OnDataContextChanged(e);
+
+            var old = Content;
+            Content = DataContext;
+            _cancellation?.Cancel();
+
+            if (old is ViewModels.BinaryFile oldFile)
+                oldFile.Dispose();
+        }
+
+        protected override void OnPointerWheelChanged(PointerWheelEventArgs e)
+        {
+            base.OnPointerWheelChanged(e);
+
+            if (Content is not ViewModels.BinaryFile file)
+                return;
+
+            var scroller = this.FindDescendantOfType<ScrollBar>();
+            if (scroller == null)
+                return;
+
+            var delta = Math.Ceiling(e.Delta.Y) * HexViewer.LINE_HEIGHT;
+            scroller.Value -= delta;
+        }
+
+        private void OnScrollBarValueChanged(object sender, RangeBaseValueChangedEventArgs e)
+        {
+            if (sender is ScrollBar scroller)
+            {
+                var viewer = this.FindDescendantOfType<HexViewer>();
+                if (viewer != null)
+                    viewer.Offset = (long)(Math.Ceiling(scroller.Value / HexViewer.LINE_HEIGHT) * HexViewer.BYTES_PER_LINE);
+            }
+        }
+
+        private void OnScrollBarSizeChanged(object sender, SizeChangedEventArgs e)
+        {
+            if (sender is ScrollBar { DataContext: ViewModels.BinaryFile file } scroller)
+            {
+                var viewport = Bounds.Height - HexViewer.HEADER_HEIGHT;
+                var max = Math.Ceiling(file.FileSize / (double)HexViewer.BYTES_PER_LINE) * HexViewer.LINE_HEIGHT - Bounds.Height + HexViewer.HEADER_HEIGHT;
+
+                scroller.ViewportSize = viewport;
+                scroller.Maximum = Math.Max(viewport, max);
+            }
+        }
+
+        private async void OnOpenHexViewer(object sender, RoutedEventArgs e)
+        {
+            if (DataContext is not Models.RevisionBinaryFile vm)
+                return;
+
+            Content = new Models.Null();
+            _cancellation = new();
+
+            var token = _cancellation.Token;
+            var file = await ViewModels.BinaryFile.LoadAsync(vm.Repository, vm.File, vm.Revision);
+            if (token.IsCancellationRequested)
+                return;
+
+            Content = file;
+        }
+
+        private CancellationTokenSource _cancellation = new();
+    }
+}
diff --git a/src/Views/RevisionFileContentViewer.axaml b/src/Views/RevisionFileContentViewer.axaml
index 3422578fe..3392b3a38 100644
--- a/src/Views/RevisionFileContentViewer.axaml
+++ b/src/Views/RevisionFileContentViewer.axaml
@@ -10,13 +10,7 @@
              x:Class="SourceGit.Views.RevisionFileContentViewer">
   <UserControl.DataTemplates>
     <DataTemplate DataType="m:RevisionBinaryFile">
-      <StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center">
-        <Path Width="64" Height="64" Data="{StaticResource Icons.Error}" Fill="{DynamicResource Brush.FG2}"/>
-        <TextBlock Margin="0,16,0,0" Text="{DynamicResource Text.BinaryNotSupported}" FontSize="18" FontWeight="Bold" HorizontalAlignment="Center" Foreground="{DynamicResource Brush.FG2}"/>
-        <StackPanel Margin="0,8,0,0" Orientation="Horizontal" HorizontalAlignment="Center">
-          <TextBlock Text="{Binding Size, Converter={x:Static c:LongConverters.ToFileSize}}" Foreground="{DynamicResource Brush.FG2}"/>
-        </StackPanel>
-      </StackPanel>
+      <v:BinaryFileViewer Margin="8,4,0,4"/>
     </DataTemplate>
 
     <DataTemplate DataType="m:RevisionTextFile">

From 56424e51fb06c51038214ab031aa4aea9758d5dc Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 4 Aug 2026 03:41:19 +0000
Subject: [PATCH 13/34] doc: Update translation status and sort locale files

---
 TRANSLATION.md | 64 ++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 51 insertions(+), 13 deletions(-)

diff --git a/TRANSLATION.md b/TRANSLATION.md
index 949216104..1b5300eca 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -6,13 +6,23 @@ This document shows the translation status of each locale file in the repository
 
 ### ![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)
 
-### ![de__DE](https://img.shields.io/badge/de__DE-%E2%88%9A-brightgreen)
+### ![de__DE](https://img.shields.io/badge/de__DE-99.80%25-yellow)
 
-### ![el__GR](https://img.shields.io/badge/el__GR-99.51%25-yellow)
+<details>
+<summary>Missing keys in de_DE.axaml</summary>
+
+- Text.File.Binary
+- Text.File.HexViewer
+
+</details>
+
+### ![el__GR](https://img.shields.io/badge/el__GR-99.32%25-yellow)
 
 <details>
 <summary>Missing keys in el_GR.axaml</summary>
 
+- Text.File.Binary
+- Text.File.HexViewer
 - Text.Launcher.NewVersion
 - Text.Repository.FilterCommits.Collapse
 - Text.Repository.FilterCommits.Expand
@@ -21,16 +31,18 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![es__ES](https://img.shields.io/badge/es__ES-99.90%25-yellow)
+### ![es__ES](https://img.shields.io/badge/es__ES-99.71%25-yellow)
 
 <details>
 <summary>Missing keys in es_ES.axaml</summary>
 
+- Text.File.Binary
+- Text.File.HexViewer
 - Text.WorkingCopy.FilterChanges
 
 </details>
 
-### ![fr__FR](https://img.shields.io/badge/fr__FR-95.49%25-yellow)
+### ![fr__FR](https://img.shields.io/badge/fr__FR-95.31%25-yellow)
 
 <details>
 <summary>Missing keys in fr_FR.axaml</summary>
@@ -50,6 +62,8 @@ This document shows the translation status of each locale file in the repository
 - Text.DeleteBranch.AskForRemote
 - Text.DeleteBranch.Force
 - Text.Diff.EmptyFile
+- Text.File.Binary
+- Text.File.HexViewer
 - Text.FileModeChange
 - Text.FileModeChange.Deleted
 - Text.FileModeChange.Directory
@@ -84,7 +98,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![he__IL](https://img.shields.io/badge/he__IL-95.49%25-yellow)
+### ![he__IL](https://img.shields.io/badge/he__IL-95.31%25-yellow)
 
 <details>
 <summary>Missing keys in he_IL.axaml</summary>
@@ -104,6 +118,8 @@ This document shows the translation status of each locale file in the repository
 - Text.DeleteBranch.AskForRemote
 - Text.DeleteBranch.Force
 - Text.Diff.EmptyFile
+- Text.File.Binary
+- Text.File.HexViewer
 - Text.FileModeChange
 - Text.FileModeChange.Deleted
 - Text.FileModeChange.Directory
@@ -138,16 +154,18 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![id__ID](https://img.shields.io/badge/id__ID-99.90%25-yellow)
+### ![id__ID](https://img.shields.io/badge/id__ID-99.71%25-yellow)
 
 <details>
 <summary>Missing keys in id_ID.axaml</summary>
 
+- Text.File.Binary
+- Text.File.HexViewer
 - Text.WorkingCopy.FilterChanges
 
 </details>
 
-### ![it__IT](https://img.shields.io/badge/it__IT-89.03%25-yellow)
+### ![it__IT](https://img.shields.io/badge/it__IT-88.86%25-yellow)
 
 <details>
 <summary>Missing keys in it_IT.axaml</summary>
@@ -194,6 +212,8 @@ This document shows the translation status of each locale file in the repository
 - Text.Diff.EmptyFile
 - Text.Diff.Submodule.UncommittedChanges
 - Text.Discard.IncludeModified
+- Text.File.Binary
+- Text.File.HexViewer
 - Text.FileModeChange
 - Text.FileModeChange.Deleted
 - Text.FileModeChange.Directory
@@ -267,11 +287,13 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ja__JP](https://img.shields.io/badge/ja__JP-99.51%25-yellow)
+### ![ja__JP](https://img.shields.io/badge/ja__JP-99.32%25-yellow)
 
 <details>
 <summary>Missing keys in ja_JP.axaml</summary>
 
+- Text.File.Binary
+- Text.File.HexViewer
 - Text.Launcher.NewVersion
 - Text.Repository.FilterCommits.Collapse
 - Text.Repository.FilterCommits.Expand
@@ -280,7 +302,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ko__KR](https://img.shields.io/badge/ko__KR-96.96%25-yellow)
+### ![ko__KR](https://img.shields.io/badge/ko__KR-96.77%25-yellow)
 
 <details>
 <summary>Missing keys in ko_KR.axaml</summary>
@@ -294,6 +316,8 @@ This document shows the translation status of each locale file in the repository
 - Text.DeleteBranch.AskForRemote
 - Text.DeleteBranch.Force
 - Text.Diff.EmptyFile
+- Text.File.Binary
+- Text.File.HexViewer
 - Text.FileModeChange
 - Text.FileModeChange.Deleted
 - Text.FileModeChange.Directory
@@ -319,7 +343,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![pt__BR](https://img.shields.io/badge/pt__BR-62.78%25-red)
+### ![pt__BR](https://img.shields.io/badge/pt__BR-62.66%25-red)
 
 <details>
 <summary>Missing keys in pt_BR.axaml</summary>
@@ -470,6 +494,8 @@ This document shows the translation status of each locale file in the repository
 - Text.ExecuteCustomAction.Target
 - Text.ExecuteCustomAction.Repository
 - Text.Fetch.Force
+- Text.File.Binary
+- Text.File.HexViewer
 - Text.FileCM.CustomAction
 - Text.FileCM.ResolveUsing
 - Text.FileModeChange
@@ -707,9 +733,17 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)
+### ![ru__RU](https://img.shields.io/badge/ru__RU-99.80%25-yellow)
+
+<details>
+<summary>Missing keys in ru_RU.axaml</summary>
+
+- Text.File.Binary
+- Text.File.HexViewer
+
+</details>
 
-### ![ta__IN](https://img.shields.io/badge/ta__IN-64.45%25-red)
+### ![ta__IN](https://img.shields.io/badge/ta__IN-64.32%25-red)
 
 <details>
 <summary>Missing keys in ta_IN.axaml</summary>
@@ -876,6 +910,8 @@ This document shows the translation status of each locale file in the repository
 - Text.EditBranchDescription.Target
 - Text.ExecuteCustomAction.Target
 - Text.ExecuteCustomAction.Repository
+- Text.File.Binary
+- Text.File.HexViewer
 - Text.FileCM.CustomAction
 - Text.FileModeChange
 - Text.FileModeChange.Deleted
@@ -1080,7 +1116,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![uk__UA](https://img.shields.io/badge/uk__UA-65.23%25-red)
+### ![uk__UA](https://img.shields.io/badge/uk__UA-65.10%25-red)
 
 <details>
 <summary>Missing keys in uk_UA.axaml</summary>
@@ -1243,6 +1279,8 @@ This document shows the translation status of each locale file in the repository
 - Text.EditBranchDescription.Target
 - Text.ExecuteCustomAction.Target
 - Text.ExecuteCustomAction.Repository
+- Text.File.Binary
+- Text.File.HexViewer
 - Text.FileCM.CustomAction
 - Text.FileModeChange
 - Text.FileModeChange.Deleted

From 81b7cd4d6402f3a7d21bcfdd48bb1a83a35d7624 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 4 Aug 2026 12:13:28 +0800
Subject: [PATCH 14/34] enhance: make sure highlighted index is less than the
 file size

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/BinaryFileViewer.axaml.cs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/Views/BinaryFileViewer.axaml.cs b/src/Views/BinaryFileViewer.axaml.cs
index 9647a8b62..863af721d 100644
--- a/src/Views/BinaryFileViewer.axaml.cs
+++ b/src/Views/BinaryFileViewer.axaml.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Globalization;
 using System.Threading;
+
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
@@ -179,6 +180,9 @@ protected override void OnPointerPressed(PointerPressedEventArgs e)
         {
             base.OnPointerPressed(e);
 
+            if (DataContext is not ViewModels.BinaryFile vm)
+                return;
+
             var pos = e.GetPosition(this);
             var testX = pos.X;
             var testY = pos.Y - HEADER_HEIGHT;
@@ -210,7 +214,11 @@ protected override void OnPointerPressed(PointerPressedEventArgs e)
                 return;
 
             var rowIdx = (long)Math.Floor(testY / LINE_HEIGHT);
-            SetHighlightedIndex(_offset + rowIdx * BYTES_PER_LINE + columnIdx);
+            var idx = _offset + rowIdx * BYTES_PER_LINE + columnIdx;
+            if (idx >= vm.FileSize)
+                return;
+
+            SetHighlightedIndex(idx);
         }
 
         private void SetHighlightedIndex(long idx)
@@ -241,6 +249,8 @@ protected override void OnUnloaded(RoutedEventArgs e)
         {
             base.OnUnloaded(e);
 
+            _cancellation?.Cancel();
+
             if (Content is ViewModels.BinaryFile old)
             {
                 Content = null;

From 2465f5f0990df6e02760bbad7537d2894a8f66d9 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 4 Aug 2026 15:03:14 +0800
Subject: [PATCH 15/34] feature: allows to goto input offset in hex-viewer

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Resources/Icons.axaml           |   1 +
 src/Resources/Locales/en_US.axaml   |   1 +
 src/Resources/Locales/zh_CN.axaml   |   1 +
 src/Resources/Locales/zh_TW.axaml   |   1 +
 src/Views/BinaryFileViewer.axaml    |  45 ++++++++---
 src/Views/BinaryFileViewer.axaml.cs | 121 +++++++++++++++++++++++++---
 6 files changed, 146 insertions(+), 24 deletions(-)

diff --git a/src/Resources/Icons.axaml b/src/Resources/Icons.axaml
index 6852b6a51..2109df7cf 100644
--- a/src/Resources/Icons.axaml
+++ b/src/Resources/Icons.axaml
@@ -1,5 +1,6 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
   <StreamGeometry x:Key="Icons.Action">M41 512c0-128 46-241 138-333C271 87 384 41 512 41s241 46 333 138c92 92 138 205 138 333s-46 241-138 333c-92 92-205 138-333 138s-241-46-333-138C87 753 41 640 41 512zm87 0c0 108 36 195 113 271s164 113 271 113c108 0 195-36 271-113s113-164 113-271-36-195-113-271c-77-77-164-113-271-113-108 0-195 36-271 113C164 317 128 404 128 512zm256 148V292l195 113L768 512l-195 113-195 113v-77zm148-113-61 36V440l61 36 61 36-61 36z</StreamGeometry>
+  <StreamGeometry x:Key="Icons.Address">M306 761c3-3 8-7 16-11 15-7 35-14 60-19 4-1 14-3 11-18l-3-16c-4-18-13-14-18-13C301 699 256 724 256 763c0 58 112 91 252 91 140 0 252-33 252-91 0-38-45-64-116-78-5-1-16-3-18 13-1 6-2 11-3 15-4 18 8 18 14 19 24 5 44 11 58 18 8 4 13 8 16 11 1 2 2 2 2 1 0 3-17 15-50 24-40 12-95 19-155 19-59 0-114-7-155-19-32-9-49-21-50-24 0 0 0-0 2-2zm73-123c54 79 107 142 129 142 22 0 75-62 129-142 62-91 101-173 101-231C738 280 635 176 508 176c-127 0-230 104-230 232 0 57 39 139 101 231zm150 64a446 446 0 01-21 23c-6-6-13-14-21-23-21-25-46-57-68-91-57-84-92-159-92-204 0-102 82-184 182-184 100 0 182 82 182 184 0 45-36 120-92 204-23 33-47 66-68 91zm-21-200a102 102 0 100-204 102 102 0 000 204zm0-48a54 54 0 110-108 54 54 0 010 108z</StreamGeometry>
   <StreamGeometry x:Key="Icons.AIAssist">M304 464a128 128 0 01128-128c71 0 128 57 128 128v224a32 32 0 01-64 0V592h-128v95a32 32 0 01-64 0v-224zm64 1v64h128v-64a64 64 0 00-64-64c-35 0-64 29-64 64zM688 337c18 0 32 14 32 32v319a32 32 0 01-32 32c-18 0-32-14-32-32v-319a32 32 0 0132-32zM84 911l60-143A446 446 0 0164 512C64 265 265 64 512 64s448 201 448 448-201 448-448 448c-54 0-105-9-153-27l-242 22a32 32 0 01-32-44zm133-150-53 126 203-18 13 5c41 15 85 23 131 23 212 0 384-172 384-384S724 128 512 128 128 300 128 512c0 82 26 157 69 220l20 29z</StreamGeometry>
   <StreamGeometry x:Key="Icons.ApplyPatch">M233 163h560c11 0 20-9 20-20V63h-226c-6-36-37-63-74-63s-68 27-74 63h-226v80c0 11 9 20 20 20zM883 63h-10v112c0 33-27 60-60 60h-600c-33 0-60-27-60-60V63h-10c-44 0-80 36-80 80v801c0 44 36 80 80 80h740c44 0 80-36 80-80V143c0-44-36-80-80-80zm-720 469c0-24 20-44 44-44h62v-72c0-24 20-44 44-44s44 20 44 44v72h62c24 0 44 20 44 44s-20 44-44 44h-62v72c0 24-20 44-44 44s-44-20-44-44v-72h-62c-24 0-44-20-44-44zm700 307c0 24-20 44-44 44h-612c-24 0-44-20-44-44s20-44 44-44h612c24 0 44 20 44 44zm0-191c0 24-20 44-44 44h-232c-24 0-44-20-44-44s20-44 44-44h232c24 0 44 20 44 44zm0-191c0 24-20 44-44 44h-162c-24 0-44-20-44-44s20-44 44-44h162c24 0 44 20 44 44z</StreamGeometry>
   <StreamGeometry x:Key="Icons.Archive">M366 146l293 0 0-73-293 0 0 73zm658 366 0 274q0 38-27 65t-65 27l-841 0q-38 0-65-27t-27-65l0-274 384 0 0 91q0 15 11 26t26 11l183 0q15 0 26-11t11-26l0-91 384 0zm-439 0 0 73-146 0 0-73 146 0zm439-274 0 219-1024 0 0-219q0-38 27-65t65-27l201 0 0-91q0-23 16-39t39-16l329 0q23 0 39 16t16 39l0 91 201 0q38 0 65 27t27 65z</StreamGeometry>
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 5c76fa80a..03fad4921 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -422,6 +422,7 @@
   <x:String x:Key="Text.Fetch.Title" xml:space="preserve">Fetch Remote Changes</x:String>
   <x:String x:Key="Text.File.Binary" xml:space="preserve">BINARY FILE</x:String>
   <x:String x:Key="Text.File.HexViewer" xml:space="preserve">HEX VIEWER</x:String>
+  <x:String x:Key="Text.File.HexViewer.GotoAddress" xml:space="preserve">Go to address...</x:String>
   <x:String x:Key="Text.FileCM.AssumeUnchanged" xml:space="preserve">Assume unchanged</x:String>
   <x:String x:Key="Text.FileCM.CustomAction" xml:space="preserve">Custom Action</x:String>
   <x:String x:Key="Text.FileCM.Discard" xml:space="preserve">Discard...</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index c3f171325..7532be2e2 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -426,6 +426,7 @@
   <x:String x:Key="Text.Fetch.Title" xml:space="preserve">拉取远程仓库内容</x:String>
   <x:String x:Key="Text.File.Binary" xml:space="preserve">二进制文件</x:String>
   <x:String x:Key="Text.File.HexViewer" xml:space="preserve">查看内容</x:String>
+  <x:String x:Key="Text.File.HexViewer.GotoAddress" xml:space="preserve">定位地址...</x:String>
   <x:String x:Key="Text.FileCM.AssumeUnchanged" xml:space="preserve">不跟踪此文件的更改</x:String>
   <x:String x:Key="Text.FileCM.CustomAction" xml:space="preserve">自定义操作</x:String>
   <x:String x:Key="Text.FileCM.Discard" xml:space="preserve">放弃更改...</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 3155fe0b5..9b1307de7 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -426,6 +426,7 @@
   <x:String x:Key="Text.Fetch.Title" xml:space="preserve">提取遠端存放庫內容</x:String>
   <x:String x:Key="Text.File.Binary" xml:space="preserve">二進位檔案</x:String>
   <x:String x:Key="Text.File.HexViewer" xml:space="preserve">檢視內容</x:String>
+  <x:String x:Key="Text.File.HexViewer.GotoAddress" xml:space="preserve">前往地址...</x:String>
   <x:String x:Key="Text.FileCM.AssumeUnchanged" xml:space="preserve">不追蹤此檔案的變更</x:String>
   <x:String x:Key="Text.FileCM.CustomAction" xml:space="preserve">自訂動作</x:String>
   <x:String x:Key="Text.FileCM.Discard" xml:space="preserve">捨棄變更...</x:String>
diff --git a/src/Views/BinaryFileViewer.axaml b/src/Views/BinaryFileViewer.axaml
index 697918b33..f8d55c52f 100644
--- a/src/Views/BinaryFileViewer.axaml
+++ b/src/Views/BinaryFileViewer.axaml
@@ -30,19 +30,40 @@
     </DataTemplate>
 
     <DataTemplate DataType="vm:BinaryFile">
-      <Grid ColumnDefinitions="*,Auto" Background="Transparent">
-        <v:HexViewer Grid.Column="0"
-                     Foreground="{DynamicResource Brush.FG1}"
-                     HeaderForeground="{DynamicResource Brush.Accent}"
-                     ClipToBounds="True"/>
+      <Grid RowDefinitions="28,*" Background="Transparent">
+        <v:BinaryFileAddressTextBox Grid.Row="0"
+                                    Width="600" Height="26"
+                                    HorizontalAlignment="Left" VerticalAlignment="Center"
+                                    BorderThickness="1"
+                                    BorderBrush="{DynamicResource Brush.Border2}"
+                                    CornerRadius="13"
+                                    ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+                                    ScrollViewer.VerticalScrollBarVisibility="Disabled"
+                                    Watermark="{DynamicResource Text.File.HexViewer.GotoAddress}"
+                                    TextChanged="OnGotoAddressTextChanged">
+          <TextBox.InnerLeftContent>
+            <Path Width="14" Height="14"
+                  Margin="6,0,0,0"
+                  Fill="{DynamicResource Brush.FG2}"
+                  Data="{StaticResource Icons.Address}"/>
+          </TextBox.InnerLeftContent>
+        </v:BinaryFileAddressTextBox>
+        
+        <Grid Grid.Row="1" ColumnDefinitions="*,Auto">
+          <v:HexViewer Grid.Column="0"
+                       Foreground="{DynamicResource Brush.FG1}"
+                       HeaderForeground="{DynamicResource Brush.Accent}"
+                       ClipToBounds="True"/>
 
-        <ScrollBar Grid.Column="1"
-                   Margin="0,24,0,0"
-                   Orientation="Vertical"
-                   AllowAutoHide="False"
-                   SmallChange="18"
-                   ValueChanged="OnScrollBarValueChanged"
-                   SizeChanged="OnScrollBarSizeChanged"/>
+          <ScrollBar Grid.Column="1"
+                     x:Name="HexViewerScroller"
+                     Margin="0,24,0,0"
+                     Orientation="Vertical"
+                     AllowAutoHide="False"
+                     SmallChange="18"
+                     ValueChanged="OnScrollBarValueChanged"
+                     SizeChanged="OnScrollBarSizeChanged"/>
+        </Grid>
       </Grid>
     </DataTemplate>
   </UserControl.DataTemplates>
diff --git a/src/Views/BinaryFileViewer.axaml.cs b/src/Views/BinaryFileViewer.axaml.cs
index 863af721d..5c4e37017 100644
--- a/src/Views/BinaryFileViewer.axaml.cs
+++ b/src/Views/BinaryFileViewer.axaml.cs
@@ -1,17 +1,78 @@
 using System;
 using System.Globalization;
+using System.Text;
 using System.Threading;
 
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Controls.Primitives;
 using Avalonia.Input;
+using Avalonia.Input.Platform;
 using Avalonia.Interactivity;
 using Avalonia.Media;
 using Avalonia.VisualTree;
 
 namespace SourceGit.Views
 {
+    public class BinaryFileAddressTextBox : TextBox
+    {
+        protected override Type StyleKeyOverride => typeof(TextBox);
+
+        protected override void OnLoaded(RoutedEventArgs e)
+        {
+            base.OnLoaded(e);
+            PastingFromClipboard += OnPastingFromClipboard;
+        }
+
+        protected override void OnUnloaded(RoutedEventArgs e)
+        {
+            PastingFromClipboard -= OnPastingFromClipboard;
+            base.OnUnloaded(e);
+        }
+
+        protected override void OnTextInput(TextInputEventArgs e)
+        {
+            if (string.IsNullOrEmpty(e.Text))
+                return;
+
+            var builder = new StringBuilder(e.Text.Length);
+            var chars = e.Text.ToCharArray();
+            foreach (var ch in chars)
+            {
+                if ((ch >= '0' && ch <= '9') ||
+                    (ch >= 'a' && ch <= 'f') ||
+                    (ch >= 'A' && ch <= 'F'))
+                    builder.Append(ch);
+
+                if (builder.Length >= 8)
+                    break;
+            }
+
+            e.Text = builder.ToString();
+            base.OnTextInput(e);
+        }
+
+        private async void OnPastingFromClipboard(object sender, RoutedEventArgs e)
+        {
+            e.Handled = true;
+
+            try
+            {
+                var clipboard = TopLevel.GetTopLevel(this)?.Clipboard;
+                if (clipboard != null)
+                {
+                    var text = await clipboard.TryGetTextAsync();
+                    if (!string.IsNullOrEmpty(text))
+                        OnTextInput(new TextInputEventArgs() { Text = text });
+                }
+            }
+            catch
+            {
+                // Ignore exceptions
+            }
+        }
+    }
+
     public class HexViewer : Control
     {
         public static readonly DirectProperty<HexViewer, long> OffsetProperty =
@@ -55,6 +116,15 @@ public IBrush Foreground
         public const int BYTES_PER_LINE_HALF = 8;
         public const double FONT_SIZE = 13;
 
+        public void SetHighlightedIndex(long idx)
+        {
+            if (idx == _highlightedIdx)
+                return;
+
+            _highlightedIdx = idx;
+            InvalidateVisual();
+        }
+
         public override void Render(DrawingContext context)
         {
             base.Render(context);
@@ -221,15 +291,6 @@ protected override void OnPointerPressed(PointerPressedEventArgs e)
             SetHighlightedIndex(idx);
         }
 
-        private void SetHighlightedIndex(long idx)
-        {
-            if (idx == _highlightedIdx)
-                return;
-
-            _highlightedIdx = idx;
-            InvalidateVisual();
-        }
-
         private long _offset = 0;
         private double _charWidth = 0;
         private double _first8BytesX = 0;
@@ -277,7 +338,8 @@ protected override void OnPointerWheelChanged(PointerWheelEventArgs e)
             if (Content is not ViewModels.BinaryFile file)
                 return;
 
-            var scroller = this.FindDescendantOfType<ScrollBar>();
+            // TextBox itself contains a ScrollBar.
+            var scroller = this.FindDescendantOfType<ScrollBar>(false, s => s.Name.Equals("HexViewerScroller", StringComparison.Ordinal));
             if (scroller == null)
                 return;
 
@@ -299,8 +361,8 @@ private void OnScrollBarSizeChanged(object sender, SizeChangedEventArgs e)
         {
             if (sender is ScrollBar { DataContext: ViewModels.BinaryFile file } scroller)
             {
-                var viewport = Bounds.Height - HexViewer.HEADER_HEIGHT;
-                var max = Math.Ceiling(file.FileSize / (double)HexViewer.BYTES_PER_LINE) * HexViewer.LINE_HEIGHT - Bounds.Height + HexViewer.HEADER_HEIGHT;
+                var viewport = Bounds.Height - HexViewer.HEADER_HEIGHT - 26;
+                var max = Math.Ceiling(file.FileSize / (double)HexViewer.BYTES_PER_LINE) * HexViewer.LINE_HEIGHT - viewport;
 
                 scroller.ViewportSize = viewport;
                 scroller.Maximum = Math.Max(viewport, max);
@@ -323,6 +385,41 @@ private async void OnOpenHexViewer(object sender, RoutedEventArgs e)
             Content = file;
         }
 
+        private void OnGotoAddressTextChanged(object sender, TextChangedEventArgs e)
+        {
+            if (sender is BinaryFileAddressTextBox { DataContext: ViewModels.BinaryFile file } textBox)
+            {
+                var text = textBox.Text;
+                if (string.IsNullOrEmpty(text))
+                    return;
+
+                long idx = 0;
+                try
+                {
+                    idx = Convert.ToInt64($"0x{text}", 16);
+                }
+                catch
+                {
+                    // Ignore parsing errors
+                }
+
+                if (idx < 0 || idx >= file.FileSize)
+                    return;
+
+                // TextBox itself contains a ScrollBar.
+                var scroller = this.FindDescendantOfType<ScrollBar>(false, s => s.Name.Equals("HexViewerScroller", StringComparison.Ordinal));
+                if (scroller == null)
+                    return;
+
+                var viewport = Bounds.Height - HexViewer.HEADER_HEIGHT - 26;
+                var offset = Math.Floor(idx / (double)HexViewer.BYTES_PER_LINE) * HexViewer.LINE_HEIGHT - (viewport * 0.5);
+                scroller.Value = Math.Max(0, offset);
+
+                var viewer = this.FindDescendantOfType<HexViewer>(false);
+                viewer?.SetHighlightedIndex(idx);
+            }
+        }
+
         private CancellationTokenSource _cancellation = new();
     }
 }

From 40182d7eaa4100e86be60a59bb2dd2520eb6f3a7 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 4 Aug 2026 07:03:38 +0000
Subject: [PATCH 16/34] doc: Update translation status and sort locale files

---
 TRANSLATION.md | 39 ++++++++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/TRANSLATION.md b/TRANSLATION.md
index 1b5300eca..35737c8fc 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -6,23 +6,25 @@ This document shows the translation status of each locale file in the repository
 
 ### ![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)
 
-### ![de__DE](https://img.shields.io/badge/de__DE-99.80%25-yellow)
+### ![de__DE](https://img.shields.io/badge/de__DE-99.71%25-yellow)
 
 <details>
 <summary>Missing keys in de_DE.axaml</summary>
 
 - Text.File.Binary
 - Text.File.HexViewer
+- Text.File.HexViewer.GotoAddress
 
 </details>
 
-### ![el__GR](https://img.shields.io/badge/el__GR-99.32%25-yellow)
+### ![el__GR](https://img.shields.io/badge/el__GR-99.22%25-yellow)
 
 <details>
 <summary>Missing keys in el_GR.axaml</summary>
 
 - Text.File.Binary
 - Text.File.HexViewer
+- Text.File.HexViewer.GotoAddress
 - Text.Launcher.NewVersion
 - Text.Repository.FilterCommits.Collapse
 - Text.Repository.FilterCommits.Expand
@@ -31,18 +33,19 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![es__ES](https://img.shields.io/badge/es__ES-99.71%25-yellow)
+### ![es__ES](https://img.shields.io/badge/es__ES-99.61%25-yellow)
 
 <details>
 <summary>Missing keys in es_ES.axaml</summary>
 
 - Text.File.Binary
 - Text.File.HexViewer
+- Text.File.HexViewer.GotoAddress
 - Text.WorkingCopy.FilterChanges
 
 </details>
 
-### ![fr__FR](https://img.shields.io/badge/fr__FR-95.31%25-yellow)
+### ![fr__FR](https://img.shields.io/badge/fr__FR-95.21%25-yellow)
 
 <details>
 <summary>Missing keys in fr_FR.axaml</summary>
@@ -64,6 +67,7 @@ This document shows the translation status of each locale file in the repository
 - Text.Diff.EmptyFile
 - Text.File.Binary
 - Text.File.HexViewer
+- Text.File.HexViewer.GotoAddress
 - Text.FileModeChange
 - Text.FileModeChange.Deleted
 - Text.FileModeChange.Directory
@@ -98,7 +102,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![he__IL](https://img.shields.io/badge/he__IL-95.31%25-yellow)
+### ![he__IL](https://img.shields.io/badge/he__IL-95.21%25-yellow)
 
 <details>
 <summary>Missing keys in he_IL.axaml</summary>
@@ -120,6 +124,7 @@ This document shows the translation status of each locale file in the repository
 - Text.Diff.EmptyFile
 - Text.File.Binary
 - Text.File.HexViewer
+- Text.File.HexViewer.GotoAddress
 - Text.FileModeChange
 - Text.FileModeChange.Deleted
 - Text.FileModeChange.Directory
@@ -154,18 +159,19 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![id__ID](https://img.shields.io/badge/id__ID-99.71%25-yellow)
+### ![id__ID](https://img.shields.io/badge/id__ID-99.61%25-yellow)
 
 <details>
 <summary>Missing keys in id_ID.axaml</summary>
 
 - Text.File.Binary
 - Text.File.HexViewer
+- Text.File.HexViewer.GotoAddress
 - Text.WorkingCopy.FilterChanges
 
 </details>
 
-### ![it__IT](https://img.shields.io/badge/it__IT-88.86%25-yellow)
+### ![it__IT](https://img.shields.io/badge/it__IT-88.77%25-yellow)
 
 <details>
 <summary>Missing keys in it_IT.axaml</summary>
@@ -214,6 +220,7 @@ This document shows the translation status of each locale file in the repository
 - Text.Discard.IncludeModified
 - Text.File.Binary
 - Text.File.HexViewer
+- Text.File.HexViewer.GotoAddress
 - Text.FileModeChange
 - Text.FileModeChange.Deleted
 - Text.FileModeChange.Directory
@@ -287,13 +294,14 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ja__JP](https://img.shields.io/badge/ja__JP-99.32%25-yellow)
+### ![ja__JP](https://img.shields.io/badge/ja__JP-99.22%25-yellow)
 
 <details>
 <summary>Missing keys in ja_JP.axaml</summary>
 
 - Text.File.Binary
 - Text.File.HexViewer
+- Text.File.HexViewer.GotoAddress
 - Text.Launcher.NewVersion
 - Text.Repository.FilterCommits.Collapse
 - Text.Repository.FilterCommits.Expand
@@ -302,7 +310,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ko__KR](https://img.shields.io/badge/ko__KR-96.77%25-yellow)
+### ![ko__KR](https://img.shields.io/badge/ko__KR-96.68%25-yellow)
 
 <details>
 <summary>Missing keys in ko_KR.axaml</summary>
@@ -318,6 +326,7 @@ This document shows the translation status of each locale file in the repository
 - Text.Diff.EmptyFile
 - Text.File.Binary
 - Text.File.HexViewer
+- Text.File.HexViewer.GotoAddress
 - Text.FileModeChange
 - Text.FileModeChange.Deleted
 - Text.FileModeChange.Directory
@@ -343,7 +352,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![pt__BR](https://img.shields.io/badge/pt__BR-62.66%25-red)
+### ![pt__BR](https://img.shields.io/badge/pt__BR-62.60%25-red)
 
 <details>
 <summary>Missing keys in pt_BR.axaml</summary>
@@ -496,6 +505,7 @@ This document shows the translation status of each locale file in the repository
 - Text.Fetch.Force
 - Text.File.Binary
 - Text.File.HexViewer
+- Text.File.HexViewer.GotoAddress
 - Text.FileCM.CustomAction
 - Text.FileCM.ResolveUsing
 - Text.FileModeChange
@@ -733,17 +743,18 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ru__RU](https://img.shields.io/badge/ru__RU-99.80%25-yellow)
+### ![ru__RU](https://img.shields.io/badge/ru__RU-99.71%25-yellow)
 
 <details>
 <summary>Missing keys in ru_RU.axaml</summary>
 
 - Text.File.Binary
 - Text.File.HexViewer
+- Text.File.HexViewer.GotoAddress
 
 </details>
 
-### ![ta__IN](https://img.shields.io/badge/ta__IN-64.32%25-red)
+### ![ta__IN](https://img.shields.io/badge/ta__IN-64.26%25-red)
 
 <details>
 <summary>Missing keys in ta_IN.axaml</summary>
@@ -912,6 +923,7 @@ This document shows the translation status of each locale file in the repository
 - Text.ExecuteCustomAction.Repository
 - Text.File.Binary
 - Text.File.HexViewer
+- Text.File.HexViewer.GotoAddress
 - Text.FileCM.CustomAction
 - Text.FileModeChange
 - Text.FileModeChange.Deleted
@@ -1116,7 +1128,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![uk__UA](https://img.shields.io/badge/uk__UA-65.10%25-red)
+### ![uk__UA](https://img.shields.io/badge/uk__UA-65.04%25-red)
 
 <details>
 <summary>Missing keys in uk_UA.axaml</summary>
@@ -1281,6 +1293,7 @@ This document shows the translation status of each locale file in the repository
 - Text.ExecuteCustomAction.Repository
 - Text.File.Binary
 - Text.File.HexViewer
+- Text.File.HexViewer.GotoAddress
 - Text.FileCM.CustomAction
 - Text.FileModeChange
 - Text.FileModeChange.Deleted

From 401e68664026193ac3eb76c393430b5b32ca04c2 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 4 Aug 2026 15:11:48 +0800
Subject: [PATCH 17/34] code_style: it's not necessary to adding `0x` prefix
 when parsing a hex address

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/BinaryFileViewer.axaml.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Views/BinaryFileViewer.axaml.cs b/src/Views/BinaryFileViewer.axaml.cs
index 5c4e37017..8f9ae7a36 100644
--- a/src/Views/BinaryFileViewer.axaml.cs
+++ b/src/Views/BinaryFileViewer.axaml.cs
@@ -396,7 +396,7 @@ private void OnGotoAddressTextChanged(object sender, TextChangedEventArgs e)
                 long idx = 0;
                 try
                 {
-                    idx = Convert.ToInt64($"0x{text}", 16);
+                    idx = Convert.ToInt64(text, 16);
                 }
                 catch
                 {

From b5e4b2cd6a3e12ed0fae7c03df750786bfbb9a9e Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 4 Aug 2026 15:52:40 +0800
Subject: [PATCH 18/34] enhance: scrolling accumulation

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/BinaryFileViewer.axaml.cs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/Views/BinaryFileViewer.axaml.cs b/src/Views/BinaryFileViewer.axaml.cs
index 8f9ae7a36..d5e2a61e2 100644
--- a/src/Views/BinaryFileViewer.axaml.cs
+++ b/src/Views/BinaryFileViewer.axaml.cs
@@ -335,7 +335,7 @@ protected override void OnPointerWheelChanged(PointerWheelEventArgs e)
         {
             base.OnPointerWheelChanged(e);
 
-            if (Content is not ViewModels.BinaryFile file)
+            if (Content is not ViewModels.BinaryFile)
                 return;
 
             // TextBox itself contains a ScrollBar.
@@ -343,8 +343,7 @@ protected override void OnPointerWheelChanged(PointerWheelEventArgs e)
             if (scroller == null)
                 return;
 
-            var delta = Math.Ceiling(e.Delta.Y) * HexViewer.LINE_HEIGHT;
-            scroller.Value -= delta;
+            scroller.Value -= e.Delta.Y * HexViewer.LINE_HEIGHT;
         }
 
         private void OnScrollBarValueChanged(object sender, RangeBaseValueChangedEventArgs e)
@@ -411,8 +410,7 @@ private void OnGotoAddressTextChanged(object sender, TextChangedEventArgs e)
                 if (scroller == null)
                     return;
 
-                var viewport = Bounds.Height - HexViewer.HEADER_HEIGHT - 26;
-                var offset = Math.Floor(idx / (double)HexViewer.BYTES_PER_LINE) * HexViewer.LINE_HEIGHT - (viewport * 0.5);
+                var offset = Math.Floor(idx / (double)HexViewer.BYTES_PER_LINE) * HexViewer.LINE_HEIGHT - (scroller.ViewportSize * 0.5);
                 scroller.Value = Math.Max(0, offset);
 
                 var viewer = this.FindDescendantOfType<HexViewer>(false);

From 3a0f66582f7cf7b5f609c9bb216b04e6bb6ae07f Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 4 Aug 2026 18:19:04 +0800
Subject: [PATCH 19/34] refactor: use `git cat-file -s` instead of `git ls-tree
 <revision> -l -- <file>` to query filesize

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Commands/QueryFileSize.cs | 18 +++++-------------
 src/Models/DiffResult.cs      |  4 ++++
 src/ViewModels/DiffContext.cs | 25 +++++++++++++++++++++++--
 3 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/src/Commands/QueryFileSize.cs b/src/Commands/QueryFileSize.cs
index c1ad51dfe..c2afe2650 100644
--- a/src/Commands/QueryFileSize.cs
+++ b/src/Commands/QueryFileSize.cs
@@ -1,29 +1,21 @@
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 
 namespace SourceGit.Commands
 {
-    public partial class QueryFileSize : Command
+    public class QueryFileSize : Command
     {
-        [GeneratedRegex(@"^\d+\s+\w+\s+[0-9a-f]+\s+(\d+)\s+.*$")]
-        private static partial Regex REG_FORMAT();
-
         public QueryFileSize(string repo, string file, string revision)
         {
             WorkingDirectory = repo;
             Context = repo;
-            Args = $"ls-tree {revision} -l -- {file.Quoted()}";
+            Args = $"cat-file -s {revision}:{file.Quoted()}";
         }
 
         public async Task<long> GetResultAsync()
         {
             var rs = await ReadToEndAsync().ConfigureAwait(false);
-            if (rs.IsSuccess)
-            {
-                var match = REG_FORMAT().Match(rs.StdOut);
-                if (match.Success)
-                    return long.Parse(match.Groups[1].Value);
-            }
+            if (rs.IsSuccess && long.TryParse(rs.StdOut.Trim(), out var size))
+                return size;
 
             return 0;
         }
diff --git a/src/Models/DiffResult.cs b/src/Models/DiffResult.cs
index ddb3d7e07..35b175c53 100644
--- a/src/Models/DiffResult.cs
+++ b/src/Models/DiffResult.cs
@@ -63,6 +63,10 @@ public class LFSDiff
 
     public class BinaryDiff
     {
+        public string Repository { get; set; } = string.Empty;
+        public string FilePath { get; set; } = string.Empty;
+        public string NewRevision { get; set; } = string.Empty;
+
         public long OldSize { get; set; } = 0;
         public long NewSize { get; set; } = 0;
     }
diff --git a/src/ViewModels/DiffContext.cs b/src/ViewModels/DiffContext.cs
index 27eb93b8d..d943f2007 100644
--- a/src/ViewModels/DiffContext.cs
+++ b/src/ViewModels/DiffContext.cs
@@ -251,26 +251,47 @@ private void LoadContent()
             var binaryDiff = new Models.BinaryDiff();
             var fullPath = Path.Combine(_repo, _option.Path);
 
+            binaryDiff.Repository = _repo;
+            binaryDiff.FilePath = _option.Path;
+
             if (_option.Revisions.Count == 2)
             {
                 if (_option.Revisions[0].Equals("-R", StringComparison.Ordinal))
                 {
                     binaryDiff.OldSize = File.Exists(fullPath) ? new FileInfo(fullPath).Length : 0;
                     binaryDiff.NewSize = await new Commands.QueryFileSize(_repo, _option.Path, _option.Revisions[1]).GetResultAsync().ConfigureAwait(false);
+                    binaryDiff.NewRevision = _option.Revisions[1];
                 }
                 else
                 {
                     binaryDiff.OldSize = await new Commands.QueryFileSize(_repo, oldPath, _option.Revisions[0]).GetResultAsync().ConfigureAwait(false);
                     if (string.IsNullOrEmpty(_option.Revisions[1]))
+                    {
                         binaryDiff.NewSize = File.Exists(fullPath) ? new FileInfo(fullPath).Length : 0;
+                        binaryDiff.NewRevision = null;
+                    }
                     else
+                    {
                         binaryDiff.NewSize = await new Commands.QueryFileSize(_repo, _option.Path, _option.Revisions[1]).GetResultAsync().ConfigureAwait(false);
+                        binaryDiff.NewRevision = _option.Revisions[1];
+                    }
                 }
             }
             else
             {
-                binaryDiff.OldSize = await new Commands.QueryFileSize(_repo, oldPath, "HEAD").GetResultAsync().ConfigureAwait(false);
-                binaryDiff.NewSize = File.Exists(fullPath) ? new FileInfo(fullPath).Length : 0;
+                if (!oldPath.Equals("/dev/null", StringComparison.Ordinal))
+                    binaryDiff.OldSize = await new Commands.QueryFileSize(_repo, oldPath, "HEAD").GetResultAsync().ConfigureAwait(false);
+
+                if (_option.IsUnstaged)
+                {
+                    binaryDiff.NewSize = File.Exists(fullPath) ? new FileInfo(fullPath).Length : 0;
+                    binaryDiff.NewRevision = null;
+                }
+                else
+                {
+                    binaryDiff.NewSize = await new Commands.QueryFileSize(_repo, _option.Path, string.Empty).GetResultAsync().ConfigureAwait(false);
+                    binaryDiff.NewRevision = string.Empty;
+                }
             }
 
             return binaryDiff;

From 41b6f000a650d4117dc738737886017f4646dc94 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 4 Aug 2026 18:20:24 +0800
Subject: [PATCH 20/34] feature: supports to view the content of binary file in
 right-side (NEW) of diff view

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Converters/LongConverters.cs              |  5 ++
 src/Resources/Locales/en_US.axaml             |  1 +
 src/Resources/Locales/zh_CN.axaml             |  1 +
 src/Resources/Locales/zh_TW.axaml             |  1 +
 src/ViewModels/BinaryFile.cs                  | 19 +++--
 src/ViewModels/BinaryFileViewerStandalone.cs  | 46 +++++++++++++
 src/Views/BinaryFileViewer.axaml.cs           |  2 +-
 src/Views/BinaryFileViewerStandalone.axaml    | 69 +++++++++++++++++++
 src/Views/BinaryFileViewerStandalone.axaml.cs | 10 +++
 src/Views/DiffView.axaml                      |  7 ++
 src/Views/DiffView.axaml.cs                   |  9 +++
 11 files changed, 163 insertions(+), 7 deletions(-)
 create mode 100644 src/ViewModels/BinaryFileViewerStandalone.cs
 create mode 100644 src/Views/BinaryFileViewerStandalone.axaml
 create mode 100644 src/Views/BinaryFileViewerStandalone.axaml.cs

diff --git a/src/Converters/LongConverters.cs b/src/Converters/LongConverters.cs
index 05a55e95b..fb72aadb7 100644
--- a/src/Converters/LongConverters.cs
+++ b/src/Converters/LongConverters.cs
@@ -18,6 +18,11 @@ public static class LongConverters
             return $"{(bytes / GB):G3} GB ({bytes:N0})";
         });
 
+        public static readonly FuncValueConverter<long, bool> IsGreaterThanZero = new(bytes =>
+        {
+            return bytes > 0;
+        });
+
         private const double KB = 1024;
         private const double MB = 1024 * 1024;
         private const double GB = 1024 * 1024 * 1024;
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 03fad4921..375aeeb93 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -364,6 +364,7 @@
   <x:String x:Key="Text.DeleteTag.Tag" xml:space="preserve">Tag:</x:String>
   <x:String x:Key="Text.DeleteTag.WithRemote" xml:space="preserve">Delete from remote repositories</x:String>
   <x:String x:Key="Text.Diff.Binary" xml:space="preserve">BINARY DIFF</x:String>
+  <x:String x:Key="Text.Diff.Binary.ViewContentOfNew" xml:space="preserve">VIEW NEW CONTENT</x:String>
   <x:String x:Key="Text.Diff.EmptyFile" xml:space="preserve">EMPTY FILE</x:String>
   <x:String x:Key="Text.Diff.First" xml:space="preserve">First Difference</x:String>
   <x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">Ignore Whitespace Changes</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 7532be2e2..1ae5476e9 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -368,6 +368,7 @@
   <x:String x:Key="Text.DeleteTag.Tag" xml:space="preserve">标签名 ：</x:String>
   <x:String x:Key="Text.DeleteTag.WithRemote" xml:space="preserve">同时删除远程仓库中的此标签</x:String>
   <x:String x:Key="Text.Diff.Binary" xml:space="preserve">二进制文件</x:String>
+  <x:String x:Key="Text.Diff.Binary.ViewContentOfNew" xml:space="preserve">查看新内容</x:String>
   <x:String x:Key="Text.Diff.EmptyFile" xml:space="preserve">空文件</x:String>
   <x:String x:Key="Text.Diff.First" xml:space="preserve">首个差异</x:String>
   <x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">忽略空白符号变化</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 9b1307de7..2d55ae127 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -368,6 +368,7 @@
   <x:String x:Key="Text.DeleteTag.Tag" xml:space="preserve">標籤名稱:</x:String>
   <x:String x:Key="Text.DeleteTag.WithRemote" xml:space="preserve">同時刪除遠端存放庫中的此標籤</x:String>
   <x:String x:Key="Text.Diff.Binary" xml:space="preserve">二進位檔案</x:String>
+  <x:String x:Key="Text.Diff.Binary.ViewContentOfNew" xml:space="preserve">查看新內容</x:String>
   <x:String x:Key="Text.Diff.EmptyFile" xml:space="preserve">空檔案</x:String>
   <x:String x:Key="Text.Diff.First" xml:space="preserve">第一個差異</x:String>
   <x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">忽略空白符號變化</x:String>
diff --git a/src/ViewModels/BinaryFile.cs b/src/ViewModels/BinaryFile.cs
index 5c1985d47..b1ee4e0bb 100644
--- a/src/ViewModels/BinaryFile.cs
+++ b/src/ViewModels/BinaryFile.cs
@@ -13,16 +13,22 @@ public long FileSize
             private set => SetProperty(ref _fileSize, value);
         }
 
-        public static async Task<BinaryFile> LoadAsync(string repo, string path, string revision = "HEAD")
+        public static async Task<BinaryFile> LoadAsync(string repo, string path, string revision)
         {
-            string saveTo = Path.GetTempFileName();
-            await Commands.SaveRevisionFile.RunAsync(repo, revision, path, saveTo).ConfigureAwait(false);
-            return new BinaryFile(saveTo);
+            if (revision != null)
+            {
+                string saveTo = Path.GetTempFileName();
+                await Commands.SaveRevisionFile.RunAsync(repo, revision, path, saveTo).ConfigureAwait(false);
+                return new BinaryFile(saveTo, true);
+            }
+
+            return new BinaryFile(Path.Combine(repo, path));
         }
 
-        public BinaryFile(string file)
+        public BinaryFile(string file, bool needDeleteFile = false)
         {
             _filePath = file;
+            _needDeleteFile = needDeleteFile;
 
             if (File.Exists(_filePath))
             {
@@ -44,7 +50,7 @@ public void Dispose()
             _reader?.Dispose();
             _reader = null;
 
-            if (File.Exists(_filePath))
+            if (_needDeleteFile && File.Exists(_filePath))
                 File.Delete(_filePath);
         }
 
@@ -74,6 +80,7 @@ public ArraySegment<byte> Read(long offset, long length)
         private const int BUFFER_SIZE = 16384;
 
         private string _filePath = string.Empty;
+        private bool _needDeleteFile = false;
         private FileStream _reader = null;
         private long _fileSize = 0;
         private long _readedStart = 0;
diff --git a/src/ViewModels/BinaryFileViewerStandalone.cs b/src/ViewModels/BinaryFileViewerStandalone.cs
new file mode 100644
index 000000000..daa949e06
--- /dev/null
+++ b/src/ViewModels/BinaryFileViewerStandalone.cs
@@ -0,0 +1,46 @@
+using System.Threading.Tasks;
+using Avalonia.Threading;
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace SourceGit.ViewModels
+{
+    public class BinaryFileViewerStandalone : ObservableObject
+    {
+        public string FilePath
+        {
+            get;
+            private set;
+        }
+
+        public bool IsLoading
+        {
+            get => _isLoading;
+            private set => SetProperty(ref _isLoading, value);
+        }
+
+        public BinaryFile File
+        {
+            get => _file;
+            private set => SetProperty(ref _file, value);
+        }
+
+        public BinaryFileViewerStandalone(string repo, string file, string revision)
+        {
+            FilePath = file;
+
+            Task.Run(async () =>
+            {
+                var loaded = await BinaryFile.LoadAsync(repo, file, revision).ConfigureAwait(false);
+
+                Dispatcher.UIThread.Post(() =>
+                {
+                    File = loaded;
+                    IsLoading = false;
+                });
+            });
+        }
+
+        private bool _isLoading = true;
+        private BinaryFile _file = null;
+    }
+}
diff --git a/src/Views/BinaryFileViewer.axaml.cs b/src/Views/BinaryFileViewer.axaml.cs
index d5e2a61e2..6e71e475f 100644
--- a/src/Views/BinaryFileViewer.axaml.cs
+++ b/src/Views/BinaryFileViewer.axaml.cs
@@ -360,7 +360,7 @@ private void OnScrollBarSizeChanged(object sender, SizeChangedEventArgs e)
         {
             if (sender is ScrollBar { DataContext: ViewModels.BinaryFile file } scroller)
             {
-                var viewport = Bounds.Height - HexViewer.HEADER_HEIGHT - 26;
+                var viewport = scroller.Bounds.Height;
                 var max = Math.Ceiling(file.FileSize / (double)HexViewer.BYTES_PER_LINE) * HexViewer.LINE_HEIGHT - viewport;
 
                 scroller.ViewportSize = viewport;
diff --git a/src/Views/BinaryFileViewerStandalone.axaml b/src/Views/BinaryFileViewerStandalone.axaml
new file mode 100644
index 000000000..21a92342e
--- /dev/null
+++ b/src/Views/BinaryFileViewerStandalone.axaml
@@ -0,0 +1,69 @@
+<v:ChromelessWindow xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                    xmlns:vm="using:SourceGit.ViewModels"
+                    xmlns:v="using:SourceGit.Views"
+                    mc:Ignorable="d" d:DesignWidth="520" d:DesignHeight="230"
+                    x:Class="SourceGit.Views.BinaryFileViewerStandalone"
+                    x:Name="ThisControl"
+                    x:DataType="vm:BinaryFileViewerStandalone"
+                    Icon="/App.ico"
+                    Title="{DynamicResource Text.File.HexViewer}"
+                    Width="800" Height="600"
+                    WindowStartupLocation="CenterOwner">
+  <Grid RowDefinitions="Auto,32,*">
+    <!-- TitleBar -->
+    <Grid Grid.Row="0" Height="28" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
+      <!-- Bottom border -->
+      <Border Background="{DynamicResource Brush.TitleBar}"
+              BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border2}"
+              DoubleTapped="MaximizeOrRestoreWindow"
+              PointerPressed="BeginMoveWindow"/>
+
+      <Path Width="12" Height="12"
+            Margin="10,0,0,0"
+            HorizontalAlignment="Left"
+            Data="{StaticResource Icons.Binary}"
+            IsVisible="{OnPlatform True, macOS=False}"/>
+
+      <TextBlock Classes="bold"
+                 Text="{DynamicResource Text.File.HexViewer}"
+                 HorizontalAlignment="Center" VerticalAlignment="Center"
+                 IsHitTestVisible="False"/>
+
+      <!-- Caption Buttons (Windows/Linux) -->
+      <v:CaptionButtons HorizontalAlignment="Right" IsVisible="{OnPlatform True, macOS=False}"/>
+    </Grid>
+
+    <!-- File -->
+    <Border Grid.Row="1" Height="32" VerticalAlignment="Center">
+      <Grid Margin="8,0,0,0" ColumnDefinitions="Auto,*">
+        <Path Grid.Column="0"
+              Width="14" Height="14"
+              Data="{StaticResource Icons.File}"/>
+
+        <TextBlock Grid.Column="1"
+                   Margin="4,0,0,0"
+                   Text="{Binding FilePath, Mode=OneWay}"
+                   VerticalAlignment="Center"/>
+      </Grid>
+    </Border>
+    
+    <!-- Body -->
+    <Border Grid.Row="2" Margin="4,0,4,4" BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}">
+      <ContentControl Content="{Binding File, Mode=OneWay}">
+        <ContentControl.DataTemplates>
+          <DataTemplate DataType="vm:BinaryFile">
+            <v:BinaryFileViewer Margin="8,4,0,4"/>
+          </DataTemplate>
+        </ContentControl.DataTemplates>
+      </ContentControl>
+    </Border>
+
+    <!-- Loading Icon -->
+    <v:LoadingIcon Grid.Row="2"
+                   Width="64" Height="64"
+                   IsVisible="{Binding IsLoading, Mode=OneWay}"/>
+  </Grid>
+</v:ChromelessWindow>
diff --git a/src/Views/BinaryFileViewerStandalone.axaml.cs b/src/Views/BinaryFileViewerStandalone.axaml.cs
new file mode 100644
index 000000000..058d46dd4
--- /dev/null
+++ b/src/Views/BinaryFileViewerStandalone.axaml.cs
@@ -0,0 +1,10 @@
+namespace SourceGit.Views
+{
+    public partial class BinaryFileViewerStandalone : ChromelessWindow
+    {
+        public BinaryFileViewerStandalone()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/src/Views/DiffView.axaml b/src/Views/DiffView.axaml
index baf10f9b2..93f65b5e5 100644
--- a/src/Views/DiffView.axaml
+++ b/src/Views/DiffView.axaml
@@ -246,6 +246,13 @@
 
                 <TextBlock Grid.Row="1" Grid.Column="1" Text="{Binding NewSize, Converter={x:Static c:LongConverters.ToFileSize}}" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Right" FontSize="16" Margin="8,0"/>
               </Grid>
+
+              <Button Classes="flat"
+                      Margin="0,16,0,0"
+                      HorizontalAlignment="Center"
+                      Content="{DynamicResource Text.Diff.Binary.ViewContentOfNew}"
+                      IsVisible="{Binding NewSize, Mode=OneWay, Converter={x:Static c:LongConverters.IsGreaterThanZero}}"
+                      Click="OnOpenStandaloneHexEditor"/>
             </StackPanel>
           </DataTemplate>
 
diff --git a/src/Views/DiffView.axaml.cs b/src/Views/DiffView.axaml.cs
index 4d8ca6af0..e2dd1ddf2 100644
--- a/src/Views/DiffView.axaml.cs
+++ b/src/Views/DiffView.axaml.cs
@@ -84,5 +84,14 @@ private void OnOpenSubmoduleRevisionCompare(object sender, RoutedEventArgs e)
                 this.ShowWindow(vm);
             }
         }
+
+        private async void OnOpenStandaloneHexEditor(object sender, RoutedEventArgs e)
+        {
+            if (sender is Button { DataContext: Models.BinaryDiff diff } && diff.NewSize > 0)
+            {
+                await this.ShowDialogAsync(new ViewModels.BinaryFileViewerStandalone(diff.Repository, diff.FilePath, diff.NewRevision));
+                e.Handled = true;
+            }
+        }
     }
 }

From fcf6441759798304ef3bf9ce4c75e5659d5d4897 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 4 Aug 2026 10:21:29 +0000
Subject: [PATCH 21/34] doc: Update translation status and sort locale files

---
 TRANSLATION.md | 39 ++++++++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/TRANSLATION.md b/TRANSLATION.md
index 35737c8fc..fde5e623e 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -6,22 +6,24 @@ This document shows the translation status of each locale file in the repository
 
 ### ![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)
 
-### ![de__DE](https://img.shields.io/badge/de__DE-99.71%25-yellow)
+### ![de__DE](https://img.shields.io/badge/de__DE-99.61%25-yellow)
 
 <details>
 <summary>Missing keys in de_DE.axaml</summary>
 
+- Text.Diff.Binary.ViewContentOfNew
 - Text.File.Binary
 - Text.File.HexViewer
 - Text.File.HexViewer.GotoAddress
 
 </details>
 
-### ![el__GR](https://img.shields.io/badge/el__GR-99.22%25-yellow)
+### ![el__GR](https://img.shields.io/badge/el__GR-99.12%25-yellow)
 
 <details>
 <summary>Missing keys in el_GR.axaml</summary>
 
+- Text.Diff.Binary.ViewContentOfNew
 - Text.File.Binary
 - Text.File.HexViewer
 - Text.File.HexViewer.GotoAddress
@@ -33,11 +35,12 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![es__ES](https://img.shields.io/badge/es__ES-99.61%25-yellow)
+### ![es__ES](https://img.shields.io/badge/es__ES-99.51%25-yellow)
 
 <details>
 <summary>Missing keys in es_ES.axaml</summary>
 
+- Text.Diff.Binary.ViewContentOfNew
 - Text.File.Binary
 - Text.File.HexViewer
 - Text.File.HexViewer.GotoAddress
@@ -45,7 +48,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![fr__FR](https://img.shields.io/badge/fr__FR-95.21%25-yellow)
+### ![fr__FR](https://img.shields.io/badge/fr__FR-95.12%25-yellow)
 
 <details>
 <summary>Missing keys in fr_FR.axaml</summary>
@@ -64,6 +67,7 @@ This document shows the translation status of each locale file in the repository
 - Text.CopyAsPatch
 - Text.DeleteBranch.AskForRemote
 - Text.DeleteBranch.Force
+- Text.Diff.Binary.ViewContentOfNew
 - Text.Diff.EmptyFile
 - Text.File.Binary
 - Text.File.HexViewer
@@ -102,7 +106,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![he__IL](https://img.shields.io/badge/he__IL-95.21%25-yellow)
+### ![he__IL](https://img.shields.io/badge/he__IL-95.12%25-yellow)
 
 <details>
 <summary>Missing keys in he_IL.axaml</summary>
@@ -121,6 +125,7 @@ This document shows the translation status of each locale file in the repository
 - Text.CopyAsPatch
 - Text.DeleteBranch.AskForRemote
 - Text.DeleteBranch.Force
+- Text.Diff.Binary.ViewContentOfNew
 - Text.Diff.EmptyFile
 - Text.File.Binary
 - Text.File.HexViewer
@@ -159,11 +164,12 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![id__ID](https://img.shields.io/badge/id__ID-99.61%25-yellow)
+### ![id__ID](https://img.shields.io/badge/id__ID-99.51%25-yellow)
 
 <details>
 <summary>Missing keys in id_ID.axaml</summary>
 
+- Text.Diff.Binary.ViewContentOfNew
 - Text.File.Binary
 - Text.File.HexViewer
 - Text.File.HexViewer.GotoAddress
@@ -171,7 +177,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![it__IT](https://img.shields.io/badge/it__IT-88.77%25-yellow)
+### ![it__IT](https://img.shields.io/badge/it__IT-88.68%25-yellow)
 
 <details>
 <summary>Missing keys in it_IT.axaml</summary>
@@ -215,6 +221,7 @@ This document shows the translation status of each locale file in the repository
 - Text.CopyAsPatch
 - Text.DeleteBranch.AskForRemote
 - Text.DeleteBranch.Force
+- Text.Diff.Binary.ViewContentOfNew
 - Text.Diff.EmptyFile
 - Text.Diff.Submodule.UncommittedChanges
 - Text.Discard.IncludeModified
@@ -294,11 +301,12 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ja__JP](https://img.shields.io/badge/ja__JP-99.22%25-yellow)
+### ![ja__JP](https://img.shields.io/badge/ja__JP-99.12%25-yellow)
 
 <details>
 <summary>Missing keys in ja_JP.axaml</summary>
 
+- Text.Diff.Binary.ViewContentOfNew
 - Text.File.Binary
 - Text.File.HexViewer
 - Text.File.HexViewer.GotoAddress
@@ -310,7 +318,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ko__KR](https://img.shields.io/badge/ko__KR-96.68%25-yellow)
+### ![ko__KR](https://img.shields.io/badge/ko__KR-96.59%25-yellow)
 
 <details>
 <summary>Missing keys in ko_KR.axaml</summary>
@@ -323,6 +331,7 @@ This document shows the translation status of each locale file in the repository
 - Text.Configure.Git.EnableRecursiveWhenAutoUpdatingSubmodules
 - Text.DeleteBranch.AskForRemote
 - Text.DeleteBranch.Force
+- Text.Diff.Binary.ViewContentOfNew
 - Text.Diff.EmptyFile
 - Text.File.Binary
 - Text.File.HexViewer
@@ -352,7 +361,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![pt__BR](https://img.shields.io/badge/pt__BR-62.60%25-red)
+### ![pt__BR](https://img.shields.io/badge/pt__BR-62.54%25-red)
 
 <details>
 <summary>Missing keys in pt_BR.axaml</summary>
@@ -481,6 +490,7 @@ This document shows the translation status of each locale file in the repository
 - Text.DeleteRepositoryNode.Path
 - Text.DeleteRepositoryNode.TipForGroup
 - Text.DeleteRepositoryNode.TipForRepository
+- Text.Diff.Binary.ViewContentOfNew
 - Text.Diff.EmptyFile
 - Text.Diff.First
 - Text.Diff.Image.Blend
@@ -743,18 +753,19 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ru__RU](https://img.shields.io/badge/ru__RU-99.71%25-yellow)
+### ![ru__RU](https://img.shields.io/badge/ru__RU-99.61%25-yellow)
 
 <details>
 <summary>Missing keys in ru_RU.axaml</summary>
 
+- Text.Diff.Binary.ViewContentOfNew
 - Text.File.Binary
 - Text.File.HexViewer
 - Text.File.HexViewer.GotoAddress
 
 </details>
 
-### ![ta__IN](https://img.shields.io/badge/ta__IN-64.26%25-red)
+### ![ta__IN](https://img.shields.io/badge/ta__IN-64.20%25-red)
 
 <details>
 <summary>Missing keys in ta_IN.axaml</summary>
@@ -902,6 +913,7 @@ This document shows the translation status of each locale file in the repository
 - Text.DeleteMultiTags
 - Text.DeleteMultiTags.DeleteFromRemotes
 - Text.DeleteMultiTags.Tip
+- Text.Diff.Binary.ViewContentOfNew
 - Text.Diff.EmptyFile
 - Text.Diff.Image.Blend
 - Text.Diff.Image.Difference
@@ -1128,7 +1140,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![uk__UA](https://img.shields.io/badge/uk__UA-65.04%25-red)
+### ![uk__UA](https://img.shields.io/badge/uk__UA-64.98%25-red)
 
 <details>
 <summary>Missing keys in uk_UA.axaml</summary>
@@ -1272,6 +1284,7 @@ This document shows the translation status of each locale file in the repository
 - Text.DeleteMultiTags
 - Text.DeleteMultiTags.DeleteFromRemotes
 - Text.DeleteMultiTags.Tip
+- Text.Diff.Binary.ViewContentOfNew
 - Text.Diff.EmptyFile
 - Text.Diff.Image.Blend
 - Text.Diff.Image.Difference

From c02570e4e464ad2563fc8c95091f9d793c09a34f Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 4 Aug 2026 20:12:02 +0800
Subject: [PATCH 22/34] refactor: unify the behaviour to open the built-in
 hex-editor

Signed-off-by: leo <longshuang@msn.cn>
---
 src/ViewModels/BinaryFileViewer.cs            |  55 +++++++
 src/ViewModels/BinaryFileViewerStandalone.cs  |  46 ------
 src/Views/BinaryFileViewer.axaml              | 136 +++++++++++-------
 src/Views/BinaryFileViewer.axaml.cs           |  64 +++------
 src/Views/BinaryFileViewerStandalone.axaml    |  69 ---------
 src/Views/BinaryFileViewerStandalone.axaml.cs |  10 --
 src/Views/DiffView.axaml.cs                   |   2 +-
 src/Views/RevisionFileContentViewer.axaml     |  13 +-
 src/Views/RevisionFileContentViewer.axaml.cs  |   9 ++
 9 files changed, 179 insertions(+), 225 deletions(-)
 create mode 100644 src/ViewModels/BinaryFileViewer.cs
 delete mode 100644 src/ViewModels/BinaryFileViewerStandalone.cs
 delete mode 100644 src/Views/BinaryFileViewerStandalone.axaml
 delete mode 100644 src/Views/BinaryFileViewerStandalone.axaml.cs

diff --git a/src/ViewModels/BinaryFileViewer.cs b/src/ViewModels/BinaryFileViewer.cs
new file mode 100644
index 000000000..87b213999
--- /dev/null
+++ b/src/ViewModels/BinaryFileViewer.cs
@@ -0,0 +1,55 @@
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.ComponentModel;
+
+namespace SourceGit.ViewModels
+{
+    public class BinaryFileViewer : ObservableObject
+    {
+        public string File
+        {
+            get => _file;
+        }
+
+        public bool IsLoading
+        {
+            get => _isLoading;
+            private set => SetProperty(ref _isLoading, value);
+        }
+
+        public BinaryFile Content
+        {
+            get => _content;
+            private set => SetProperty(ref _content, value);
+        }
+
+        public BinaryFileViewer(string repo, string file, string revision)
+        {
+            _repo = repo;
+            _file = file;
+            _revision = revision;
+        }
+
+        public async Task LoadAsync()
+        {
+            Content = await BinaryFile.LoadAsync(_repo, _file, _revision)
+                .ConfigureAwait(false);
+            IsLoading = false;
+        }
+
+        public void Cleanup()
+        {
+            _repo = null;
+            _file = null;
+            _revision = null;
+
+            _content?.Dispose();
+            _content = null;
+        }
+
+        private bool _isLoading = true;
+        private string _repo = null;
+        private string _file = null;
+        private string _revision = null;
+        private BinaryFile _content = null;
+    }
+}
diff --git a/src/ViewModels/BinaryFileViewerStandalone.cs b/src/ViewModels/BinaryFileViewerStandalone.cs
deleted file mode 100644
index daa949e06..000000000
--- a/src/ViewModels/BinaryFileViewerStandalone.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System.Threading.Tasks;
-using Avalonia.Threading;
-using CommunityToolkit.Mvvm.ComponentModel;
-
-namespace SourceGit.ViewModels
-{
-    public class BinaryFileViewerStandalone : ObservableObject
-    {
-        public string FilePath
-        {
-            get;
-            private set;
-        }
-
-        public bool IsLoading
-        {
-            get => _isLoading;
-            private set => SetProperty(ref _isLoading, value);
-        }
-
-        public BinaryFile File
-        {
-            get => _file;
-            private set => SetProperty(ref _file, value);
-        }
-
-        public BinaryFileViewerStandalone(string repo, string file, string revision)
-        {
-            FilePath = file;
-
-            Task.Run(async () =>
-            {
-                var loaded = await BinaryFile.LoadAsync(repo, file, revision).ConfigureAwait(false);
-
-                Dispatcher.UIThread.Post(() =>
-                {
-                    File = loaded;
-                    IsLoading = false;
-                });
-            });
-        }
-
-        private bool _isLoading = true;
-        private BinaryFile _file = null;
-    }
-}
diff --git a/src/Views/BinaryFileViewer.axaml b/src/Views/BinaryFileViewer.axaml
index f8d55c52f..709ce1923 100644
--- a/src/Views/BinaryFileViewer.axaml
+++ b/src/Views/BinaryFileViewer.axaml
@@ -1,38 +1,55 @@
-<UserControl xmlns="https://github.com/avaloniaui"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:m="using:SourceGit.Models"
-             xmlns:vm="using:SourceGit.ViewModels"
-             xmlns:v="using:SourceGit.Views"
-             xmlns:c="using:SourceGit.Converters"
-             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             x:Class="SourceGit.Views.BinaryFileViewer">
-  <UserControl.DataTemplates>
-    <DataTemplate DataType="m:RevisionBinaryFile">
-      <StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center">
-        <Path Width="64" Height="64" Data="{StaticResource Icons.Binary}" Fill="{DynamicResource Brush.FG2}"/>
-        <TextBlock Margin="0,16,0,0" Text="{DynamicResource Text.File.Binary}" FontSize="18" FontWeight="Bold" HorizontalAlignment="Center" Foreground="{DynamicResource Brush.FG2}"/>
-        <StackPanel Margin="0,8,0,0" Orientation="Horizontal" HorizontalAlignment="Center">
-          <TextBlock Text="{Binding Size, Converter={x:Static c:LongConverters.ToFileSize}}" Foreground="{DynamicResource Brush.FG2}"/>
-        </StackPanel>
-        <Button Classes="flat"
-                Margin="0,16,0,0"
-                HorizontalAlignment="Center"
-                Content="{DynamicResource Text.File.HexViewer}"
-                Click="OnOpenHexViewer"/>
-      </StackPanel>
-    </DataTemplate>
-    
-    <DataTemplate DataType="m:Null">
-      <v:LoadingIcon Width="64" Height="64"
-                     HorizontalAlignment="Center" VerticalAlignment="Center"/>
-    </DataTemplate>
+<v:ChromelessWindow xmlns="https://github.com/avaloniaui"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                    xmlns:vm="using:SourceGit.ViewModels"
+                    xmlns:v="using:SourceGit.Views"
+                    mc:Ignorable="d" d:DesignWidth="520" d:DesignHeight="230"
+                    x:Class="SourceGit.Views.BinaryFileViewer"
+                    x:Name="ThisControl"
+                    x:DataType="vm:BinaryFileViewer"
+                    Icon="/App.ico"
+                    Title="{DynamicResource Text.File.HexViewer}"
+                    Width="800" Height="600"
+                    WindowStartupLocation="CenterOwner">
+  <Grid RowDefinitions="Auto,32,*">
+    <!-- TitleBar -->
+    <Grid Grid.Row="0" Height="28" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
+      <!-- Bottom border -->
+      <Border Background="{DynamicResource Brush.TitleBar}"
+              BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border2}"
+              DoubleTapped="MaximizeOrRestoreWindow"
+              PointerPressed="BeginMoveWindow"/>
+
+      <Path Width="12" Height="12"
+            Margin="10,0,0,0"
+            HorizontalAlignment="Left"
+            Data="{StaticResource Icons.Binary}"
+            IsVisible="{OnPlatform True, macOS=False}"/>
+
+      <TextBlock Classes="bold"
+                 Text="{DynamicResource Text.File.HexViewer}"
+                 HorizontalAlignment="Center" VerticalAlignment="Center"
+                 IsHitTestVisible="False"/>
+
+      <!-- Caption Buttons (Windows/Linux) -->
+      <v:CaptionButtons HorizontalAlignment="Right" IsVisible="{OnPlatform True, macOS=False}"/>
+    </Grid>
+
+    <!-- File -->
+    <Border Grid.Row="1" Height="32" VerticalAlignment="Center">
+      <Grid Margin="8,0" ColumnDefinitions="Auto,*,Auto">
+        <Path Grid.Column="0"
+              Width="14" Height="14"
+              Data="{StaticResource Icons.File}"/>
 
-    <DataTemplate DataType="vm:BinaryFile">
-      <Grid RowDefinitions="28,*" Background="Transparent">
-        <v:BinaryFileAddressTextBox Grid.Row="0"
-                                    Width="600" Height="26"
+        <TextBlock Grid.Column="1"
+                   Margin="4,0,0,0"
+                   Text="{Binding File, Mode=OneWay}"
+                   VerticalAlignment="Center"/>
+
+        <v:BinaryFileAddressTextBox Grid.Column="2"
+                                    Width="200" Height="26"
                                     HorizontalAlignment="Left" VerticalAlignment="Center"
                                     BorderThickness="1"
                                     BorderBrush="{DynamicResource Brush.Border2}"
@@ -48,23 +65,36 @@
                   Data="{StaticResource Icons.Address}"/>
           </TextBox.InnerLeftContent>
         </v:BinaryFileAddressTextBox>
-        
-        <Grid Grid.Row="1" ColumnDefinitions="*,Auto">
-          <v:HexViewer Grid.Column="0"
-                       Foreground="{DynamicResource Brush.FG1}"
-                       HeaderForeground="{DynamicResource Brush.Accent}"
-                       ClipToBounds="True"/>
-
-          <ScrollBar Grid.Column="1"
-                     x:Name="HexViewerScroller"
-                     Margin="0,24,0,0"
-                     Orientation="Vertical"
-                     AllowAutoHide="False"
-                     SmallChange="18"
-                     ValueChanged="OnScrollBarValueChanged"
-                     SizeChanged="OnScrollBarSizeChanged"/>
-        </Grid>
       </Grid>
-    </DataTemplate>
-  </UserControl.DataTemplates>
-</UserControl>
+    </Border>
+    
+    <!-- Body -->
+    <Border Grid.Row="2" Margin="4,0,4,4" BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}">
+      <ContentControl x:Name="ContentPanel" Margin="8,4,0,4" Content="{Binding Content, Mode=OneWay}">
+        <ContentControl.DataTemplates>
+          <DataTemplate DataType="vm:BinaryFile">
+            <Grid ColumnDefinitions="*,Auto" Background="Transparent" PointerWheelChanged="OnContentPointerWheelChanged">
+              <v:HexViewer Grid.Column="0"
+                           Foreground="{DynamicResource Brush.FG1}"
+                           HeaderForeground="{DynamicResource Brush.Accent}"
+                           ClipToBounds="True"/>
+
+              <ScrollBar Grid.Column="1"
+                         Margin="0,24,0,0"
+                         Orientation="Vertical"
+                         AllowAutoHide="False"
+                         SmallChange="18"
+                         ValueChanged="OnScrollBarValueChanged"
+                         SizeChanged="OnScrollBarSizeChanged"/>
+            </Grid>
+          </DataTemplate>
+        </ContentControl.DataTemplates>
+      </ContentControl>
+    </Border>
+
+    <!-- Loading Icon -->
+    <v:LoadingIcon Grid.Row="2"
+                   Width="64" Height="64"
+                   IsVisible="{Binding IsLoading, Mode=OneWay}"/>
+  </Grid>
+</v:ChromelessWindow>
diff --git a/src/Views/BinaryFileViewer.axaml.cs b/src/Views/BinaryFileViewer.axaml.cs
index 6e71e475f..e2d1aebba 100644
--- a/src/Views/BinaryFileViewer.axaml.cs
+++ b/src/Views/BinaryFileViewer.axaml.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Globalization;
 using System.Text;
-using System.Threading;
 
 using Avalonia;
 using Avalonia.Controls;
@@ -10,6 +9,7 @@
 using Avalonia.Input.Platform;
 using Avalonia.Interactivity;
 using Avalonia.Media;
+using Avalonia.Threading;
 using Avalonia.VisualTree;
 
 namespace SourceGit.Views
@@ -299,47 +299,39 @@ protected override void OnPointerPressed(PointerPressedEventArgs e)
         private long _highlightedIdx = -1;
     }
 
-    public partial class BinaryFileViewer : UserControl
+    public partial class BinaryFileViewer : ChromelessWindow
     {
         public BinaryFileViewer()
         {
             InitializeComponent();
         }
 
-        protected override void OnUnloaded(RoutedEventArgs e)
+        protected override void OnOpened(EventArgs e)
         {
-            base.OnUnloaded(e);
+            base.OnOpened(e);
 
-            _cancellation?.Cancel();
-
-            if (Content is ViewModels.BinaryFile old)
+            // Queue loading to the next frame to avoid blocking the window-opening.
+            Dispatcher.UIThread.Post(async () =>
             {
-                Content = null;
-                old.Dispose();
-            }
+                if (DataContext is ViewModels.BinaryFileViewer vm)
+                    await vm.LoadAsync();
+            });
         }
 
-        protected override void OnDataContextChanged(EventArgs e)
+        protected override void OnClosed(EventArgs e)
         {
-            base.OnDataContextChanged(e);
+            base.OnClosed(e);
 
-            var old = Content;
-            Content = DataContext;
-            _cancellation?.Cancel();
-
-            if (old is ViewModels.BinaryFile oldFile)
-                oldFile.Dispose();
+            if (DataContext is ViewModels.BinaryFileViewer vm)
+                vm.Cleanup();
         }
 
-        protected override void OnPointerWheelChanged(PointerWheelEventArgs e)
+        private void OnContentPointerWheelChanged(object sender, PointerWheelEventArgs e)
         {
-            base.OnPointerWheelChanged(e);
-
-            if (Content is not ViewModels.BinaryFile)
+            if (sender is not Grid grid)
                 return;
 
-            // TextBox itself contains a ScrollBar.
-            var scroller = this.FindDescendantOfType<ScrollBar>(false, s => s.Name.Equals("HexViewerScroller", StringComparison.Ordinal));
+            var scroller = grid.FindDescendantOfType<ScrollBar>();
             if (scroller == null)
                 return;
 
@@ -368,25 +360,10 @@ private void OnScrollBarSizeChanged(object sender, SizeChangedEventArgs e)
             }
         }
 
-        private async void OnOpenHexViewer(object sender, RoutedEventArgs e)
-        {
-            if (DataContext is not Models.RevisionBinaryFile vm)
-                return;
-
-            Content = new Models.Null();
-            _cancellation = new();
-
-            var token = _cancellation.Token;
-            var file = await ViewModels.BinaryFile.LoadAsync(vm.Repository, vm.File, vm.Revision);
-            if (token.IsCancellationRequested)
-                return;
-
-            Content = file;
-        }
-
         private void OnGotoAddressTextChanged(object sender, TextChangedEventArgs e)
         {
-            if (sender is BinaryFileAddressTextBox { DataContext: ViewModels.BinaryFile file } textBox)
+            if (sender is BinaryFileAddressTextBox textBox &&
+                DataContext is ViewModels.BinaryFileViewer { Content: { } file })
             {
                 var text = textBox.Text;
                 if (string.IsNullOrEmpty(text))
@@ -405,8 +382,7 @@ private void OnGotoAddressTextChanged(object sender, TextChangedEventArgs e)
                 if (idx < 0 || idx >= file.FileSize)
                     return;
 
-                // TextBox itself contains a ScrollBar.
-                var scroller = this.FindDescendantOfType<ScrollBar>(false, s => s.Name.Equals("HexViewerScroller", StringComparison.Ordinal));
+                var scroller = ContentPanel.FindDescendantOfType<ScrollBar>();
                 if (scroller == null)
                     return;
 
@@ -417,7 +393,5 @@ private void OnGotoAddressTextChanged(object sender, TextChangedEventArgs e)
                 viewer?.SetHighlightedIndex(idx);
             }
         }
-
-        private CancellationTokenSource _cancellation = new();
     }
 }
diff --git a/src/Views/BinaryFileViewerStandalone.axaml b/src/Views/BinaryFileViewerStandalone.axaml
deleted file mode 100644
index 21a92342e..000000000
--- a/src/Views/BinaryFileViewerStandalone.axaml
+++ /dev/null
@@ -1,69 +0,0 @@
-<v:ChromelessWindow xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-                    xmlns:vm="using:SourceGit.ViewModels"
-                    xmlns:v="using:SourceGit.Views"
-                    mc:Ignorable="d" d:DesignWidth="520" d:DesignHeight="230"
-                    x:Class="SourceGit.Views.BinaryFileViewerStandalone"
-                    x:Name="ThisControl"
-                    x:DataType="vm:BinaryFileViewerStandalone"
-                    Icon="/App.ico"
-                    Title="{DynamicResource Text.File.HexViewer}"
-                    Width="800" Height="600"
-                    WindowStartupLocation="CenterOwner">
-  <Grid RowDefinitions="Auto,32,*">
-    <!-- TitleBar -->
-    <Grid Grid.Row="0" Height="28" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
-      <!-- Bottom border -->
-      <Border Background="{DynamicResource Brush.TitleBar}"
-              BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border2}"
-              DoubleTapped="MaximizeOrRestoreWindow"
-              PointerPressed="BeginMoveWindow"/>
-
-      <Path Width="12" Height="12"
-            Margin="10,0,0,0"
-            HorizontalAlignment="Left"
-            Data="{StaticResource Icons.Binary}"
-            IsVisible="{OnPlatform True, macOS=False}"/>
-
-      <TextBlock Classes="bold"
-                 Text="{DynamicResource Text.File.HexViewer}"
-                 HorizontalAlignment="Center" VerticalAlignment="Center"
-                 IsHitTestVisible="False"/>
-
-      <!-- Caption Buttons (Windows/Linux) -->
-      <v:CaptionButtons HorizontalAlignment="Right" IsVisible="{OnPlatform True, macOS=False}"/>
-    </Grid>
-
-    <!-- File -->
-    <Border Grid.Row="1" Height="32" VerticalAlignment="Center">
-      <Grid Margin="8,0,0,0" ColumnDefinitions="Auto,*">
-        <Path Grid.Column="0"
-              Width="14" Height="14"
-              Data="{StaticResource Icons.File}"/>
-
-        <TextBlock Grid.Column="1"
-                   Margin="4,0,0,0"
-                   Text="{Binding FilePath, Mode=OneWay}"
-                   VerticalAlignment="Center"/>
-      </Grid>
-    </Border>
-    
-    <!-- Body -->
-    <Border Grid.Row="2" Margin="4,0,4,4" BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}">
-      <ContentControl Content="{Binding File, Mode=OneWay}">
-        <ContentControl.DataTemplates>
-          <DataTemplate DataType="vm:BinaryFile">
-            <v:BinaryFileViewer Margin="8,4,0,4"/>
-          </DataTemplate>
-        </ContentControl.DataTemplates>
-      </ContentControl>
-    </Border>
-
-    <!-- Loading Icon -->
-    <v:LoadingIcon Grid.Row="2"
-                   Width="64" Height="64"
-                   IsVisible="{Binding IsLoading, Mode=OneWay}"/>
-  </Grid>
-</v:ChromelessWindow>
diff --git a/src/Views/BinaryFileViewerStandalone.axaml.cs b/src/Views/BinaryFileViewerStandalone.axaml.cs
deleted file mode 100644
index 058d46dd4..000000000
--- a/src/Views/BinaryFileViewerStandalone.axaml.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace SourceGit.Views
-{
-    public partial class BinaryFileViewerStandalone : ChromelessWindow
-    {
-        public BinaryFileViewerStandalone()
-        {
-            InitializeComponent();
-        }
-    }
-}
diff --git a/src/Views/DiffView.axaml.cs b/src/Views/DiffView.axaml.cs
index e2dd1ddf2..cd2915d90 100644
--- a/src/Views/DiffView.axaml.cs
+++ b/src/Views/DiffView.axaml.cs
@@ -89,7 +89,7 @@ private async void OnOpenStandaloneHexEditor(object sender, RoutedEventArgs e)
         {
             if (sender is Button { DataContext: Models.BinaryDiff diff } && diff.NewSize > 0)
             {
-                await this.ShowDialogAsync(new ViewModels.BinaryFileViewerStandalone(diff.Repository, diff.FilePath, diff.NewRevision));
+                await this.ShowDialogAsync(new ViewModels.BinaryFileViewer(diff.Repository, diff.FilePath, diff.NewRevision));
                 e.Handled = true;
             }
         }
diff --git a/src/Views/RevisionFileContentViewer.axaml b/src/Views/RevisionFileContentViewer.axaml
index 3392b3a38..ba2812661 100644
--- a/src/Views/RevisionFileContentViewer.axaml
+++ b/src/Views/RevisionFileContentViewer.axaml
@@ -10,7 +10,18 @@
              x:Class="SourceGit.Views.RevisionFileContentViewer">
   <UserControl.DataTemplates>
     <DataTemplate DataType="m:RevisionBinaryFile">
-      <v:BinaryFileViewer Margin="8,4,0,4"/>
+      <StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center">
+        <Path Width="64" Height="64" Data="{StaticResource Icons.Binary}" Fill="{DynamicResource Brush.FG2}"/>
+        <TextBlock Margin="0,16,0,0" Text="{DynamicResource Text.File.Binary}" FontSize="18" FontWeight="Bold" HorizontalAlignment="Center" Foreground="{DynamicResource Brush.FG2}"/>
+        <StackPanel Margin="0,8,0,0" Orientation="Horizontal" HorizontalAlignment="Center">
+          <TextBlock Text="{Binding Size, Converter={x:Static c:LongConverters.ToFileSize}}" Foreground="{DynamicResource Brush.FG2}"/>
+        </StackPanel>
+        <Button Classes="flat"
+                Margin="0,16,0,0"
+                HorizontalAlignment="Center"
+                Content="{DynamicResource Text.File.HexViewer}"
+                Click="OnOpenBinaryFileViewer"/>
+      </StackPanel>
     </DataTemplate>
 
     <DataTemplate DataType="m:RevisionTextFile">
diff --git a/src/Views/RevisionFileContentViewer.axaml.cs b/src/Views/RevisionFileContentViewer.axaml.cs
index 860a6c1d8..262286d85 100644
--- a/src/Views/RevisionFileContentViewer.axaml.cs
+++ b/src/Views/RevisionFileContentViewer.axaml.cs
@@ -162,5 +162,14 @@ public RevisionFileContentViewer()
         {
             InitializeComponent();
         }
+
+        private async void OnOpenBinaryFileViewer(object sender, RoutedEventArgs e)
+        {
+            if (sender is not Control { DataContext: Models.RevisionBinaryFile vm })
+                return;
+
+            await this.ShowDialogAsync(new ViewModels.BinaryFileViewer(vm.Repository, vm.File, vm.Revision));
+            e.Handled = true;
+        }
     }
 }

From 38d58f598b41c1d316163101cc1edebaa2eb0417 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 4 Aug 2026 20:22:51 +0800
Subject: [PATCH 23/34] refactor: move `ViewModels.BinaryFile` to
 `Models.BinaryFile`

Signed-off-by: leo <longshuang@msn.cn>
---
 src/{ViewModels => Models}/BinaryFile.cs | 39 ++++++++----------------
 src/ViewModels/BinaryFileViewer.cs       | 21 ++++++++++---
 src/Views/BinaryFileViewer.axaml         |  3 +-
 src/Views/BinaryFileViewer.axaml.cs      | 12 ++++----
 4 files changed, 36 insertions(+), 39 deletions(-)
 rename src/{ViewModels => Models}/BinaryFile.cs (61%)

diff --git a/src/ViewModels/BinaryFile.cs b/src/Models/BinaryFile.cs
similarity index 61%
rename from src/ViewModels/BinaryFile.cs
rename to src/Models/BinaryFile.cs
index b1ee4e0bb..d875ac2f5 100644
--- a/src/ViewModels/BinaryFile.cs
+++ b/src/Models/BinaryFile.cs
@@ -1,28 +1,13 @@
 using System;
 using System.IO;
-using System.Threading.Tasks;
-using CommunityToolkit.Mvvm.ComponentModel;
 
-namespace SourceGit.ViewModels
+namespace SourceGit.Models
 {
-    public class BinaryFile : ObservableObject, IDisposable
+    public class BinaryFile : IDisposable
     {
-        public long FileSize
+        public long Size
         {
-            get => _fileSize;
-            private set => SetProperty(ref _fileSize, value);
-        }
-
-        public static async Task<BinaryFile> LoadAsync(string repo, string path, string revision)
-        {
-            if (revision != null)
-            {
-                string saveTo = Path.GetTempFileName();
-                await Commands.SaveRevisionFile.RunAsync(repo, revision, path, saveTo).ConfigureAwait(false);
-                return new BinaryFile(saveTo, true);
-            }
-
-            return new BinaryFile(Path.Combine(repo, path));
+            get => _size;
         }
 
         public BinaryFile(string file, bool needDeleteFile = false)
@@ -32,12 +17,12 @@ public BinaryFile(string file, bool needDeleteFile = false)
 
             if (File.Exists(_filePath))
             {
-                _fileSize = new FileInfo(_filePath).Length;
+                _size = new FileInfo(_filePath).Length;
                 _reader = new FileStream(_filePath, FileMode.Open, FileAccess.Read, FileShare.Read, BUFFER_SIZE, FileOptions.RandomAccess);
                 _readedStart = 0;
-                _readedEnd = Math.Min(_fileSize, BUFFER_SIZE);
+                _readedEnd = Math.Min(_size, BUFFER_SIZE);
 
-                if (_fileSize > 0)
+                if (_size > 0)
                 {
                     _reader.Seek(_readedStart, SeekOrigin.Begin);
                     _reader.ReadExactly(_buffer, 0, (int)_readedEnd);
@@ -56,20 +41,20 @@ public void Dispose()
 
         public ArraySegment<byte> Read(long offset, long length)
         {
-            if (_reader == null || _fileSize == 0 || offset >= _fileSize)
+            if (_reader == null || _size == 0 || offset >= _size)
                 return Array.Empty<byte>();
 
             if (length > 8192)
                 length = 8192;
 
-            if (offset + length > _fileSize)
-                length = _fileSize - offset;
+            if (offset + length > _size)
+                length = _size - offset;
 
             if (_readedStart <= offset && _readedEnd >= offset + length)
                 return new ArraySegment<byte>(_buffer, (int)(offset - _readedStart), (int)length);
 
             _readedStart = (Math.Max(0, offset - 2048) / 1024) * 1024;
-            _readedEnd = Math.Min(_readedStart + BUFFER_SIZE, _fileSize);
+            _readedEnd = Math.Min(_readedStart + BUFFER_SIZE, _size);
 
             _reader.Seek(_readedStart, SeekOrigin.Begin);
             _reader.ReadExactly(_buffer, 0, (int)(_readedEnd - _readedStart));
@@ -82,7 +67,7 @@ public ArraySegment<byte> Read(long offset, long length)
         private string _filePath = string.Empty;
         private bool _needDeleteFile = false;
         private FileStream _reader = null;
-        private long _fileSize = 0;
+        private long _size = 0;
         private long _readedStart = 0;
         private long _readedEnd = 0;
         private byte[] _buffer = new byte[BUFFER_SIZE];
diff --git a/src/ViewModels/BinaryFileViewer.cs b/src/ViewModels/BinaryFileViewer.cs
index 87b213999..076887970 100644
--- a/src/ViewModels/BinaryFileViewer.cs
+++ b/src/ViewModels/BinaryFileViewer.cs
@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System.IO;
+using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.ComponentModel;
 
 namespace SourceGit.ViewModels
@@ -16,7 +17,7 @@ public bool IsLoading
             private set => SetProperty(ref _isLoading, value);
         }
 
-        public BinaryFile Content
+        public Models.BinaryFile Content
         {
             get => _content;
             private set => SetProperty(ref _content, value);
@@ -31,8 +32,18 @@ public BinaryFileViewer(string repo, string file, string revision)
 
         public async Task LoadAsync()
         {
-            Content = await BinaryFile.LoadAsync(_repo, _file, _revision)
-                .ConfigureAwait(false);
+            if (_revision != null)
+            {
+                string saveTo = Path.GetTempFileName();
+                await Commands.SaveRevisionFile.RunAsync(_repo, _revision, _file, saveTo);
+
+                Content = new Models.BinaryFile(saveTo, true);
+            }
+            else
+            {
+                Content = new Models.BinaryFile(Path.Combine(_repo, _file), false);
+            }
+
             IsLoading = false;
         }
 
@@ -50,6 +61,6 @@ public void Cleanup()
         private string _repo = null;
         private string _file = null;
         private string _revision = null;
-        private BinaryFile _content = null;
+        private Models.BinaryFile _content = null;
     }
 }
diff --git a/src/Views/BinaryFileViewer.axaml b/src/Views/BinaryFileViewer.axaml
index 709ce1923..e211aea34 100644
--- a/src/Views/BinaryFileViewer.axaml
+++ b/src/Views/BinaryFileViewer.axaml
@@ -2,6 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                    xmlns:m="using:SourceGit.Models"
                     xmlns:vm="using:SourceGit.ViewModels"
                     xmlns:v="using:SourceGit.Views"
                     mc:Ignorable="d" d:DesignWidth="520" d:DesignHeight="230"
@@ -72,7 +73,7 @@
     <Border Grid.Row="2" Margin="4,0,4,4" BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}">
       <ContentControl x:Name="ContentPanel" Margin="8,4,0,4" Content="{Binding Content, Mode=OneWay}">
         <ContentControl.DataTemplates>
-          <DataTemplate DataType="vm:BinaryFile">
+          <DataTemplate DataType="m:BinaryFile">
             <Grid ColumnDefinitions="*,Auto" Background="Transparent" PointerWheelChanged="OnContentPointerWheelChanged">
               <v:HexViewer Grid.Column="0"
                            Foreground="{DynamicResource Brush.FG1}"
diff --git a/src/Views/BinaryFileViewer.axaml.cs b/src/Views/BinaryFileViewer.axaml.cs
index e2d1aebba..87850d509 100644
--- a/src/Views/BinaryFileViewer.axaml.cs
+++ b/src/Views/BinaryFileViewer.axaml.cs
@@ -129,7 +129,7 @@ public override void Render(DrawingContext context)
         {
             base.Render(context);
 
-            if (DataContext is not ViewModels.BinaryFile vm)
+            if (DataContext is not Models.BinaryFile vm)
                 return;
 
             context.FillRectangle(Brushes.Transparent, new Rect(0, 0, Bounds.Width, Bounds.Height));
@@ -250,7 +250,7 @@ protected override void OnPointerPressed(PointerPressedEventArgs e)
         {
             base.OnPointerPressed(e);
 
-            if (DataContext is not ViewModels.BinaryFile vm)
+            if (DataContext is not Models.BinaryFile vm)
                 return;
 
             var pos = e.GetPosition(this);
@@ -285,7 +285,7 @@ protected override void OnPointerPressed(PointerPressedEventArgs e)
 
             var rowIdx = (long)Math.Floor(testY / LINE_HEIGHT);
             var idx = _offset + rowIdx * BYTES_PER_LINE + columnIdx;
-            if (idx >= vm.FileSize)
+            if (idx >= vm.Size)
                 return;
 
             SetHighlightedIndex(idx);
@@ -350,10 +350,10 @@ private void OnScrollBarValueChanged(object sender, RangeBaseValueChangedEventAr
 
         private void OnScrollBarSizeChanged(object sender, SizeChangedEventArgs e)
         {
-            if (sender is ScrollBar { DataContext: ViewModels.BinaryFile file } scroller)
+            if (sender is ScrollBar { DataContext: Models.BinaryFile file } scroller)
             {
                 var viewport = scroller.Bounds.Height;
-                var max = Math.Ceiling(file.FileSize / (double)HexViewer.BYTES_PER_LINE) * HexViewer.LINE_HEIGHT - viewport;
+                var max = Math.Ceiling(file.Size / (double)HexViewer.BYTES_PER_LINE) * HexViewer.LINE_HEIGHT - viewport;
 
                 scroller.ViewportSize = viewport;
                 scroller.Maximum = Math.Max(viewport, max);
@@ -379,7 +379,7 @@ private void OnGotoAddressTextChanged(object sender, TextChangedEventArgs e)
                     // Ignore parsing errors
                 }
 
-                if (idx < 0 || idx >= file.FileSize)
+                if (idx < 0 || idx >= file.Size)
                     return;
 
                 var scroller = ContentPanel.FindDescendantOfType<ScrollBar>();

From 2a15e49bd85a903fb95b1d4f8846d975266002e7 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 5 Aug 2026 10:17:53 +0800
Subject: [PATCH 24/34] enhance: auto hide scrollbar in hex-viewer

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/BinaryFileViewer.axaml    |  8 +++--
 src/Views/BinaryFileViewer.axaml.cs | 48 ++++++++++++++++++-----------
 src/Views/DiffView.axaml            |  2 +-
 src/Views/DiffView.axaml.cs         |  2 +-
 4 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/src/Views/BinaryFileViewer.axaml b/src/Views/BinaryFileViewer.axaml
index e211aea34..962f60109 100644
--- a/src/Views/BinaryFileViewer.axaml
+++ b/src/Views/BinaryFileViewer.axaml
@@ -74,7 +74,10 @@
       <ContentControl x:Name="ContentPanel" Margin="8,4,0,4" Content="{Binding Content, Mode=OneWay}">
         <ContentControl.DataTemplates>
           <DataTemplate DataType="m:BinaryFile">
-            <Grid ColumnDefinitions="*,Auto" Background="Transparent" PointerWheelChanged="OnContentPointerWheelChanged">
+            <Grid ColumnDefinitions="*,Auto"
+                  Background="Transparent"
+                  PointerWheelChanged="OnContentPointerWheelChanged"
+                  SizeChanged="OnContentSizeChanged">
               <v:HexViewer Grid.Column="0"
                            Foreground="{DynamicResource Brush.FG1}"
                            HeaderForeground="{DynamicResource Brush.Accent}"
@@ -85,8 +88,7 @@
                          Orientation="Vertical"
                          AllowAutoHide="False"
                          SmallChange="18"
-                         ValueChanged="OnScrollBarValueChanged"
-                         SizeChanged="OnScrollBarSizeChanged"/>
+                         ValueChanged="OnScrollBarValueChanged"/>
             </Grid>
           </DataTemplate>
         </ContentControl.DataTemplates>
diff --git a/src/Views/BinaryFileViewer.axaml.cs b/src/Views/BinaryFileViewer.axaml.cs
index 87850d509..ea54bf1e3 100644
--- a/src/Views/BinaryFileViewer.axaml.cs
+++ b/src/Views/BinaryFileViewer.axaml.cs
@@ -332,31 +332,43 @@ private void OnContentPointerWheelChanged(object sender, PointerWheelEventArgs e
                 return;
 
             var scroller = grid.FindDescendantOfType<ScrollBar>();
-            if (scroller == null)
+            if (scroller == null || !scroller.IsVisible)
                 return;
 
             scroller.Value -= e.Delta.Y * HexViewer.LINE_HEIGHT;
         }
 
-        private void OnScrollBarValueChanged(object sender, RangeBaseValueChangedEventArgs e)
+        private void OnContentSizeChanged(object sender, SizeChangedEventArgs e)
         {
-            if (sender is ScrollBar scroller)
+            if (sender is not Grid { DataContext: Models.BinaryFile file } grid)
+                return;
+
+            var scroller = grid.FindDescendantOfType<ScrollBar>();
+            if (scroller == null)
+                return;
+
+            var viewport = grid.Bounds.Height - HexViewer.HEADER_HEIGHT;
+            var max = Math.Ceiling(file.Size * 1.0 / HexViewer.BYTES_PER_LINE) * HexViewer.LINE_HEIGHT - viewport;
+
+            if (max <= 0)
             {
-                var viewer = this.FindDescendantOfType<HexViewer>();
-                if (viewer != null)
-                    viewer.Offset = (long)(Math.Ceiling(scroller.Value / HexViewer.LINE_HEIGHT) * HexViewer.BYTES_PER_LINE);
+                scroller.IsVisible = false;
+            }
+            else
+            {
+                scroller.IsVisible = true;
+                scroller.ViewportSize = viewport;
+                scroller.Maximum = max;
             }
         }
 
-        private void OnScrollBarSizeChanged(object sender, SizeChangedEventArgs e)
+        private void OnScrollBarValueChanged(object sender, RangeBaseValueChangedEventArgs e)
         {
-            if (sender is ScrollBar { DataContext: Models.BinaryFile file } scroller)
+            if (sender is ScrollBar scroller)
             {
-                var viewport = scroller.Bounds.Height;
-                var max = Math.Ceiling(file.Size / (double)HexViewer.BYTES_PER_LINE) * HexViewer.LINE_HEIGHT - viewport;
-
-                scroller.ViewportSize = viewport;
-                scroller.Maximum = Math.Max(viewport, max);
+                var viewer = this.FindDescendantOfType<HexViewer>();
+                if (viewer != null)
+                    viewer.Offset = (long)(Math.Ceiling(scroller.Value / HexViewer.LINE_HEIGHT) * HexViewer.BYTES_PER_LINE);
             }
         }
 
@@ -383,11 +395,11 @@ private void OnGotoAddressTextChanged(object sender, TextChangedEventArgs e)
                     return;
 
                 var scroller = ContentPanel.FindDescendantOfType<ScrollBar>();
-                if (scroller == null)
-                    return;
-
-                var offset = Math.Floor(idx / (double)HexViewer.BYTES_PER_LINE) * HexViewer.LINE_HEIGHT - (scroller.ViewportSize * 0.5);
-                scroller.Value = Math.Max(0, offset);
+                if (scroller is { IsVisible: true })
+                {
+                    var offset = Math.Floor(idx * 1.0 / HexViewer.BYTES_PER_LINE) * HexViewer.LINE_HEIGHT - (scroller.ViewportSize * 0.5);
+                    scroller.Value = Math.Max(0, offset);
+                }
 
                 var viewer = this.FindDescendantOfType<HexViewer>(false);
                 viewer?.SetHighlightedIndex(idx);
diff --git a/src/Views/DiffView.axaml b/src/Views/DiffView.axaml
index 93f65b5e5..721891303 100644
--- a/src/Views/DiffView.axaml
+++ b/src/Views/DiffView.axaml
@@ -252,7 +252,7 @@
                       HorizontalAlignment="Center"
                       Content="{DynamicResource Text.Diff.Binary.ViewContentOfNew}"
                       IsVisible="{Binding NewSize, Mode=OneWay, Converter={x:Static c:LongConverters.IsGreaterThanZero}}"
-                      Click="OnOpenStandaloneHexEditor"/>
+                      Click="OnOpenBinaryFileViewer"/>
             </StackPanel>
           </DataTemplate>
 
diff --git a/src/Views/DiffView.axaml.cs b/src/Views/DiffView.axaml.cs
index cd2915d90..d6d4b6c23 100644
--- a/src/Views/DiffView.axaml.cs
+++ b/src/Views/DiffView.axaml.cs
@@ -85,7 +85,7 @@ private void OnOpenSubmoduleRevisionCompare(object sender, RoutedEventArgs e)
             }
         }
 
-        private async void OnOpenStandaloneHexEditor(object sender, RoutedEventArgs e)
+        private async void OnOpenBinaryFileViewer(object sender, RoutedEventArgs e)
         {
             if (sender is Button { DataContext: Models.BinaryDiff diff } && diff.NewSize > 0)
             {

From 7695c807fd97f0b5c1caf6955f77ddc1c8667cd8 Mon Sep 17 00:00:00 2001
From: Gadfly <gadfly@gadfly.vip>
Date: Wed, 5 Aug 2026 10:19:46 +0800
Subject: [PATCH 25/34] fix: detect IntelliJ IDEA and Android Studio from
 JetBrains Toolbox (#2606)

The product-code allowlist introduced in 73f83611 was copied verbatim
from the old icon-only list, which never contained IU/IC/AI. As a
result, IntelliJ IDEA (Ultimate/Community) and Android Studio installed
via Toolbox were silently filtered out and never surfaced as external
tools.

Add IU, IC and AI to the allowlist, and ship matching 64x64 icons
sourced from the official Toolbox assets under
Resources/Images/ExternalToolIcons/JetBrains/.
---
 src/Models/ExternalTool.cs                       |   2 +-
 .../Images/ExternalToolIcons/JetBrains/AI.png    | Bin 0 -> 3176 bytes
 .../Images/ExternalToolIcons/JetBrains/IC.png    | Bin 0 -> 1908 bytes
 .../Images/ExternalToolIcons/JetBrains/IU.png    | Bin 0 -> 1908 bytes
 4 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 src/Resources/Images/ExternalToolIcons/JetBrains/AI.png
 create mode 100644 src/Resources/Images/ExternalToolIcons/JetBrains/IC.png
 create mode 100644 src/Resources/Images/ExternalToolIcons/JetBrains/IU.png

diff --git a/src/Models/ExternalTool.cs b/src/Models/ExternalTool.cs
index 7f93cf8bd..7f30963a5 100644
--- a/src/Models/ExternalTool.cs
+++ b/src/Models/ExternalTool.cs
@@ -186,7 +186,7 @@ public void Cursor(Func<string> platformFinder)
 
         public void FindJetBrainsFromToolbox(Func<string> platformFinder)
         {
-            var supported = new List<string> { "CL", "DB", "DL", "DS", "GO", "JB", "PC", "PS", "PY", "QA", "QD", "RD", "RM", "RR", "WRS", "WS" };
+            var supported = new List<string> { "AI", "CL", "DB", "DL", "DS", "GO", "IC", "IU", "JB", "PC", "PS", "PY", "QA", "QD", "RD", "RM", "RR", "WRS", "WS" };
             var state = Path.Combine(platformFinder(), "state.json");
             if (File.Exists(state))
             {
diff --git a/src/Resources/Images/ExternalToolIcons/JetBrains/AI.png b/src/Resources/Images/ExternalToolIcons/JetBrains/AI.png
new file mode 100644
index 0000000000000000000000000000000000000000..64390ed3270b80e2b1aea6f7f2741e9639d916ed
GIT binary patch
literal 3176
zcmV-u443nXP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00006VoOIv0RI60
z0RN!9r;`8x3>`^CK~#90?OS_Lm1P?Lz2D`W1BaWafOts}FDc$CO)%3X4M}86vy^RI
zcbv91XUE*xoSNDlcN(X$_R?i*M{9M>OiT$9vy15_MP5<~R75Tch(I8B&gDDb<=H<F
z<ecvuIB*Wq%=VjM=6uihzR&G_p69)MFTl_E{{|Z@!9-*RFbjYRAdfL-A1qyND~M=_
zs;aMQnr5Y&&@`=8Rn<QeQP5!PH(($lld7tJ)HJP$JU~^|IwE?Ch{W5am)}x=h)e($
z0vOYcYy~hz)3j-fv89Z$U@v(!5m7eBafJY?0GMySYPtEB!x*#rOLw0^M9WoGt@kvt
z{>DvN$%Ab-06<Zcl|-c8F5^3)X__R<a=fql`;-Di6t1djG0*cueO07CkY%|{6va4S
zW)RL71?+bFn}cOM0EnVEUXr9OgCbl}lwbQ2!mT!q-Z>)C?r$BW_?AGbqA2~Y2SPuM
zU(56Sd;Jv(0DE#}95^il03t#d9-P)MRRDnFIPPObQ63ir;b5OT_oXor4O0|l7tixM
z0q}hl)*X%Q)b;yD8}-n#cQD3GJkMvzviv#`h4iJbR}Q#Y>|P<Ft31!I>7SYd4kie~
z1|qtus_G^p3iPH^uMSWY<xwKK%5mKDjIp2mQk5|l&T-sUP1CLr(fz%(?=kUYS-y|s
zxV?<AekZ6qe3y3t-+ZwT#l<BM1RjT4rsJOIG)x>j+HW#Aj*BFsFB}d>yuo1j!Be{)
z*8vub<;%dpz{P&k3c$9HKEcMVZ$Z<X^WGd_!v24}jKq8I@~1dht=25F+5Cv7_Z}TU
zM4YB+R*vJ0{!-?A$ra39^%PW1!}3M<W8I1r*dz&m-I<P)`4<r$8iK;?-3SZzU#2OF
zazhlw;eGDd($W&^)9ma98(w*Xj58By>F+i<(JeMRO-}h08D}Qadk3=pEtXnZTEacq
z>9GjfY_=(V_F69}x>^YUc;tckPV_*N5y|(>1ppM5Rrp&htXAuIPwzZBfH4;9Z$*Lv
z0ssKD4NbatwKp070Kw(}e~azW7LN`vnN0WiTam>H9W3AeFaw2U<z4hIa!=!vW8VS*
z9!!|yZ?P~Mjq^Ocb345e5w9ppqQ4axf9GOEk2r|xnsUUaJ&lB!(_ppRar*ov5D}(K
zxepQ1e$PAv1_mY(5o3($mYi-Qz;3rcAqYaGKb0T=>8BV*-n|(^qv9YrWc>H^Ih-me
z1OSYPNkqux4fyao*`Hzo00x60R+6Np?%wI9K_UuO6y>5I2qXQe#5b1}Y|fCnp4%Er
z5N*1GRvQnyVG06*qdOF0z`vgiz#YT9+ooJ`)FH+Y(Q7+dmM@E<IMem)KqtlFaBTCp
z@c^*bWn_cHC*Ze_rebAsa+mP{K!mO+sF9nIV<|$er33}`Yp|0ukE88{D6n7iO1>zH
zlO#!c&6Vy{10+d$*kCX`?xjs$<7BCd%Qc!4ZTQVCaI2k=eNKj?+<JHHqJoNvpQ2E_
z<kUxGJZ6~2U|skEj1WVSV=2Ps$mL$^VKf?_k!3kU6veMQX<ZROM2zS8xBF^bS)GQz
zAC}P2?s-e=I{E;xYOV-@2g1z^Nz<KA!8HQJqI-3HWKwa)b`{TD{|}z5+KF}H3;KGd
z$7!1OmJ^}#hs|c2&GUS;zK>^od0xTqciHgi4+>t+l%Q(*Hs`LYxKO1!(ZbCP$un;m
zotDtyjP58d3d2z8mO2xRk$51eV}>9A^-3$=x^V<DIrHuf27@8aX0wg$eC~2UZEbCo
zw@iqDzkDoVYqkXG=HQ;crsAEi9J;n2<myNNvAH6Q-I8y32*cty=NVbifYD`(x}M`q
zqp>jPPNz1ftYvto;i$K2ccG%9Vp!+zE(bI;G<a7{0N7>1nX7uwXPuF;{g?xt$xwJ*
zLw==myO02elv(=aM_Pgi-lZfL7ltED>ZtIUEobnj+6-O4%$74Kl4`tF9RRfQ^78AQ
z4_zW>&z@aiu~<sH;SgY8cz&7DZT{^$DdXi#33eISm7|Y{mG_DWFz9<m58<$IinC*6
z6&PFoV2`?JARK5p?Ty+1fTpIV@0ToDQrr35-REjeP0fC98O@u>W5pczpYV=fQt+E?
zHk@^d60?yZ^)An6D^DbdU@pEXy*LaZ4v(8T06>oAvTlm>gzD<*eLz=`I<EtcA3wg6
zh!kBf4|w_kgU8d{x>gOY^TP7k0)kAQ>-Lyo9Oh4Q<|oO(_==vRz^=)-=4k9yUsY8t
zd-m-4pgYZ}_8vTVuxaDQjSrbjrcu3eL&vHuVWNQgRzm5IZl-|lZ2^oM&Os#xgTP=m
zv91&%0&1Ey6kO9#(V(Hc-kDchV=(yGLdcw?<J*ZLd>{nI!=}j)7zcx!Q@qB;#;;OS
zQ{U}Qb8SWK?d^G?p`rRo*aJ8QJeOibOazB*#~f~_LZBn&vd${VI(sX?%*GBESfrkh
z#cdKHu3`!D#((6ojRr!cqX8|N4begve&I4>0D#3}IqOQ(xrs5>r;^%<6>~&PisrEO
zpoHpX@6P#qGrT*loR5ZStQmIR0s#2e$hG*qtpK02o&x|p6g&eX#UVZNAfjqlnr<(^
z80$HfdqCVM9(RuP>3fMsSS4WcwWO}+51Mmv+I9s15XuK)gc#N<502w>w&@&TG#b6i
ze|M;9CVYL#xrX-t^RqrWuALtPquOy|lxrzLjob_X_+`i}a9&6X2nf)fyX#Uw5QLb%
zE8BrRx%wKAa+iP=vqj_<t0=10Q2L{a+Gf(3$FYvJz_{TYW{u@AXS{${4@oHKwvcMI
z0#mOq#t&m|eF6;POn4;JyTdDk!Js=E)H%RlF!XCHT;EDKa>04@1rAs>*MO)nhE?&m
zf=y9@b~|;{00x*19kYVyl08q%6S2u<C3(Fd2I43qWKIGD@O(rHhVtGWqw_qkv&~%%
zFuT&c!QK-x6qnWUqBsFjVfxS%cp%KoFfyFO$RQlU%zEPi;O=oerjBw}vDpGlsa^z;
z@z@lRg8R*ryw=g(r#+nmyj>1=N27)CdA{>XjAOv6c;7F3t&TV7Xtf2gcr$7(mIlx0
z6R-C6_F`9>&H?%P`R~GA1?mC&PC6fG0Kmd20!9z@=>iG>AbtXmiBZmc8rv8uONM#q
z;T}Y!<>%+`aHZ=sOiWDtxU8&fm$!^<4#KB-`pTb{;J>SWtKIPGyj<ZW=)#2yuO}rX
z>Gsa<hDeExjeVw|px|!+dR-Hg)oHLfoC9XwBp&02`#$=em_JF-9g>#UYhEp+h)6kc
z;>70Z)2F`(H}-ha(l%qpj2Dj{J^BYt(|WvtWpml_3LLQZetq8h0>*%K3-vs$p0@@7
z0994n4jnr5WI{s1D*)Wu(bF(Vixw^VXHHJebLgQabg%pd0eJCYqhCkA6Z0nWcq-B0
zv|W}}&k;aG>fytO*QchYz7N2sj}2l~Rn>k^UtV*I6-wOFPAlKAP*L^3-<SOMvO+1Z
zStxN!J6&(|EU&b*bQ^rU$JB-G+qX|uRn_iJkljJF|CEDnv}prov@0s=RmwgmlP8I?
zEH`i7yt&^?dUs%Tb#<TJHVb`3RaMpd-Wuj@vQkx5)!u$O@3y17ygc3SOjoX48DzKH
ze;n-5?G09|wRGy#ss5dYI&taJr7eSPU~kCF%iAy@#sffPWTd&WvNB_^jr0Juq@?6M
z0DimF<q1LQ>FH}KD=V|?c6;?;TWz!1D$2{t5A4{n<52)!-468^0s%z5@WKo8j~_q&
zQd3jY+1q5Z+R)IDd*sNG=bnA`*?0hv0Q`TksE=R(hGb@DuCv?i*9XdStJPYzd-v|g
z0EA)?|K+bIu=VTLPi<~)&iA+RO-)VTuU)%#0)C=~J0UGC?T-5T`W$~5UtL}OSyEEc
zh=I^`z`Qwm^5mgeSy@|SV`EqIJRb;j97<R$mg3sl+S6raWqEaVb#*+?vxta@5iv0_
zcSl7<%?=C<jOo-%(=>ZwVd1+A7A$zFv9YmrAoLvQa5Ao5y*f5IIeD7VXf&p$r=QKt
z%&Y~_2EcVQYXT6wX3d&W%a$#hX|Y%=+1c3_Gcqzt0O&t6|BRpE7yJ+TDrf}{nw~oV
O0000<MNUMnLSTYN4<m*E

literal 0
HcmV?d00001

diff --git a/src/Resources/Images/ExternalToolIcons/JetBrains/IC.png b/src/Resources/Images/ExternalToolIcons/JetBrains/IC.png
new file mode 100644
index 0000000000000000000000000000000000000000..62e50e936defe2d813109a795653bae1b07d6d41
GIT binary patch
literal 1908
zcmV-)2aEWLP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00006VoOIv0RI60
z0RN!9r;`8x2PsKJK~#90-CJE~9M={8&Ye3_)|M1ou^nUU#kJGeL?NU#N$irA(t=+4
zP%y3Zl7dlcC{DpNb<!5>I=`R<Lg){rcIAi0Pz5)AX`nbMC5cIjNCTmm$Y@t>NENj>
zYT`%{(nxd9$;0f-&g{<Y?(B~=-Vc_$GjsROIo~<=oO{pA655EZKU*AJgZ<R1vhH`u
z+R8-jyj{Jx4&V|PKgE;u@3u*_>*Vz>IZD0eDy!Ee3v0@POBOOh0swpj#=W{-qbqTL
zWsB7d2A}}Hb&(kow!^~HZINW}k3Kxiq~Ba43$C)@w;A+=Puk)ET}FQBDig7MMm=F`
zgaCQG_mF|!Ti<Va)ly5daNTJ-gL(h#-4A`R%ZNDwL89_mB0&RyIn)1RLHARJbyu1n
z8}0*P3G&$WD<FP|PUH11S^dG9D7%*OSs{Vk$8UZR+<Oj4DTI*sVSvbi(*H9{rtjp?
z{M(PZq;6e{%y|`w1zCy-n)s$MNu#_Fz(wW7I~Lvqq0QEt&exx_*#(qU)ACvI1TC=p
z>*^UOU9x=mSXTS+^5S=)#iUk#BT3LTT|caNndQURuC9C;@2}ntP1U1+)<}p?gT8`g
zN_vsK+!MU^m6dOL)(09^ej`YT5|ChB@4I(iKU+u`>O{L`tq-RqRd<hogn1otdH;Kd
zLBptI%a@bFok#$y`YbOU>j81WF2?dgpbjKJ!6?8efQzkBfT74Su>$$$V;~|`KT}gv
zvA-J{8VdScxNxDJdL|+i11epf;!<FTp%?=~L9kr$vTJcTfBrlGfQWGP=urT`;^HDM
zUc3kZn46nh4_z8U(E|W*agN6+9wsCPqobn$0Nb_$0<K-V7M#yAG)zeGh~*KV89EG_
zA~B$f<$Y2*3>rcXjOtEY@0V|YIt&V~&X-aig;HTSJ%-MA7!(;Qc#0D0Src>`v>3|A
zFM}%sp<{9zEpJUIkyKl04Ymq#%ig#^_~FVxONHICWlQjVWo4x$V`?#}>Is@f3W}}j
z8z3gID17AXY>AKnkjv$8{P^+UczSxeCF9y`QWaISmYecyOyUN}|9tFh2eTDB$oTj;
z0B<GeW5<pi!TGtlIh;Cm3MWpSz~RG(k;~<9@Zdr0-02bOI1VNzCYn^es8FaTSq}*$
z0P(l)UxFZ4tr9f7bO%0_9^CiV(-nh=RIkEZy?PY~4jjP5!~}+iha=aFF*tVYSg@RK
z7PmaQkgDXa2@qpw210{LHNfSy%~*B2VXM}ygy!exF*!Mjv9U2+zI?f5<JvJ*>1v*!
z0f3Auh)+Pw257<QFAW?6sx#n>jErDpWF);-DWEyNDxE}v1^{6z9}Rw`?}lwSYnw{t
z?u;YO1FDhW6-Ai};7ZFA6C9@pni-;!Js?X+@_-}~Gyt%x3Mypz((X`U&B=Mz_Xo;2
zv~a5D4jKToi#(%pTkNiOL$SaPKkdml>>3_WPJ(CCH(r?~qn0c70*(!v4YZh`%{of5
zGBg|5Vj^u=7bQ~60)Q~98L*!T0Js(`S4wlg!#tqax}`^B#wtKC7_0_YH3%_5CF4l>
zbb2NrKp6R;80v40fl3lGjx-)X7X3CLK)F;936;k}h>(zR)a?Nle*gb`?=MPIfT;jh
ziO&E75;Bfj>i{r5g~B7VW82OG;m70Lod<K(haWdWMX=gR5JG>k4UYZum%C>D{v`sg
zOw3~c@G^kZWuIER!CI(yFHsNTUef5%i`Z>_@WlD&kDM;=AI$1v@|$UyBpZZa-BQf^
zhq~Ut3;o~1c>j@?;`*1pA%X%3gX<z`o8Sk*P5LuDu;ten>iJXk{^0{r$WsH}+)5X2
z7MdA%ZJxyF_GfU5b**;)@PQI42%4ME8;#Lz&*G~$zg&0!Xl55mdIRc)K^o<Oasq70
zw^EoJ0Z{_3Ow0mU-WX9f29X#*fUuVe6EgwtA5OXyK!A$MY<U}fd0Hj*k9*0QYzK!1
z{)jubz3$buTSY)o`leH1>@KoJ?Lgmq_{tY9pr`BOW<(57K|rIaupF%>!M0a0xaZH<
zckAC9vpQob?sNqKtxScjB4PWsY25Y2myqke-l!;Z0R9zsA!Z6tq1kyAMl&Q>%8@;{
zy-K@xz0>Sm{|TLmuVz&4@Y|3IeG<a;xbikyzhh`Nm-gKDw{Pqo_{U#C4ez$*0DO;r
zju)!Q7J&dH-mb8_!J8(c&g`(@l0JFo<TK}r8#Krn^g&@S(v)Nf3ow{TvV5sq40!)=
z9>Bi(RjVI0NVvqR>-+oOe(pc*xOW^9{x>L70JVjH*qC6jKo%Yzc;`3czSY+Yu`Wfx
zAKH1-vY2p*ga>!Nd-iwht-LQw1q9!*<N&<|p?lhR?*%42Y)!qm?p6;Y!2>QDTHf?E
u0?q>Q3y8)c{}s?V(ln^2Ufd9?hw(W@SBbN}js?j80000<MNUMnLSTZ}Z<5{s

literal 0
HcmV?d00001

diff --git a/src/Resources/Images/ExternalToolIcons/JetBrains/IU.png b/src/Resources/Images/ExternalToolIcons/JetBrains/IU.png
new file mode 100644
index 0000000000000000000000000000000000000000..62e50e936defe2d813109a795653bae1b07d6d41
GIT binary patch
literal 1908
zcmV-)2aEWLP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00006VoOIv0RI60
z0RN!9r;`8x2PsKJK~#90-CJE~9M={8&Ye3_)|M1ou^nUU#kJGeL?NU#N$irA(t=+4
zP%y3Zl7dlcC{DpNb<!5>I=`R<Lg){rcIAi0Pz5)AX`nbMC5cIjNCTmm$Y@t>NENj>
zYT`%{(nxd9$;0f-&g{<Y?(B~=-Vc_$GjsROIo~<=oO{pA655EZKU*AJgZ<R1vhH`u
z+R8-jyj{Jx4&V|PKgE;u@3u*_>*Vz>IZD0eDy!Ee3v0@POBOOh0swpj#=W{-qbqTL
zWsB7d2A}}Hb&(kow!^~HZINW}k3Kxiq~Ba43$C)@w;A+=Puk)ET}FQBDig7MMm=F`
zgaCQG_mF|!Ti<Va)ly5daNTJ-gL(h#-4A`R%ZNDwL89_mB0&RyIn)1RLHARJbyu1n
z8}0*P3G&$WD<FP|PUH11S^dG9D7%*OSs{Vk$8UZR+<Oj4DTI*sVSvbi(*H9{rtjp?
z{M(PZq;6e{%y|`w1zCy-n)s$MNu#_Fz(wW7I~Lvqq0QEt&exx_*#(qU)ACvI1TC=p
z>*^UOU9x=mSXTS+^5S=)#iUk#BT3LTT|caNndQURuC9C;@2}ntP1U1+)<}p?gT8`g
zN_vsK+!MU^m6dOL)(09^ej`YT5|ChB@4I(iKU+u`>O{L`tq-RqRd<hogn1otdH;Kd
zLBptI%a@bFok#$y`YbOU>j81WF2?dgpbjKJ!6?8efQzkBfT74Su>$$$V;~|`KT}gv
zvA-J{8VdScxNxDJdL|+i11epf;!<FTp%?=~L9kr$vTJcTfBrlGfQWGP=urT`;^HDM
zUc3kZn46nh4_z8U(E|W*agN6+9wsCPqobn$0Nb_$0<K-V7M#yAG)zeGh~*KV89EG_
zA~B$f<$Y2*3>rcXjOtEY@0V|YIt&V~&X-aig;HTSJ%-MA7!(;Qc#0D0Src>`v>3|A
zFM}%sp<{9zEpJUIkyKl04Ymq#%ig#^_~FVxONHICWlQjVWo4x$V`?#}>Is@f3W}}j
z8z3gID17AXY>AKnkjv$8{P^+UczSxeCF9y`QWaISmYecyOyUN}|9tFh2eTDB$oTj;
z0B<GeW5<pi!TGtlIh;Cm3MWpSz~RG(k;~<9@Zdr0-02bOI1VNzCYn^es8FaTSq}*$
z0P(l)UxFZ4tr9f7bO%0_9^CiV(-nh=RIkEZy?PY~4jjP5!~}+iha=aFF*tVYSg@RK
z7PmaQkgDXa2@qpw210{LHNfSy%~*B2VXM}ygy!exF*!Mjv9U2+zI?f5<JvJ*>1v*!
z0f3Auh)+Pw257<QFAW?6sx#n>jErDpWF);-DWEyNDxE}v1^{6z9}Rw`?}lwSYnw{t
z?u;YO1FDhW6-Ai};7ZFA6C9@pni-;!Js?X+@_-}~Gyt%x3Mypz((X`U&B=Mz_Xo;2
zv~a5D4jKToi#(%pTkNiOL$SaPKkdml>>3_WPJ(CCH(r?~qn0c70*(!v4YZh`%{of5
zGBg|5Vj^u=7bQ~60)Q~98L*!T0Js(`S4wlg!#tqax}`^B#wtKC7_0_YH3%_5CF4l>
zbb2NrKp6R;80v40fl3lGjx-)X7X3CLK)F;936;k}h>(zR)a?Nle*gb`?=MPIfT;jh
ziO&E75;Bfj>i{r5g~B7VW82OG;m70Lod<K(haWdWMX=gR5JG>k4UYZum%C>D{v`sg
zOw3~c@G^kZWuIER!CI(yFHsNTUef5%i`Z>_@WlD&kDM;=AI$1v@|$UyBpZZa-BQf^
zhq~Ut3;o~1c>j@?;`*1pA%X%3gX<z`o8Sk*P5LuDu;ten>iJXk{^0{r$WsH}+)5X2
z7MdA%ZJxyF_GfU5b**;)@PQI42%4ME8;#Lz&*G~$zg&0!Xl55mdIRc)K^o<Oasq70
zw^EoJ0Z{_3Ow0mU-WX9f29X#*fUuVe6EgwtA5OXyK!A$MY<U}fd0Hj*k9*0QYzK!1
z{)jubz3$buTSY)o`leH1>@KoJ?Lgmq_{tY9pr`BOW<(57K|rIaupF%>!M0a0xaZH<
zckAC9vpQob?sNqKtxScjB4PWsY25Y2myqke-l!;Z0R9zsA!Z6tq1kyAMl&Q>%8@;{
zy-K@xz0>Sm{|TLmuVz&4@Y|3IeG<a;xbikyzhh`Nm-gKDw{Pqo_{U#C4ez$*0DO;r
zju)!Q7J&dH-mb8_!J8(c&g`(@l0JFo<TK}r8#Krn^g&@S(v)Nf3ow{TvV5sq40!)=
z9>Bi(RjVI0NVvqR>-+oOe(pc*xOW^9{x>L70JVjH*qC6jKo%Yzc;`3czSY+Yu`Wfx
zAKH1-vY2p*ga>!Nd-iwht-LQw1q9!*<N&<|p?lhR?*%42Y)!qm?p6;Y!2>QDTHf?E
u0?q>Q3y8)c{}s?V(ln^2Ufd9?hw(W@SBbN}js?j80000<MNUMnLSTZ}Z<5{s

literal 0
HcmV?d00001


From 1812df047de8af581d04fc7da978a1b848b0bc86 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 5 Aug 2026 10:42:06 +0800
Subject: [PATCH 26/34] enhance: allow closing hex-viewer by pressing `ESC`

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Views/BinaryFileViewer.axaml.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Views/BinaryFileViewer.axaml.cs b/src/Views/BinaryFileViewer.axaml.cs
index ea54bf1e3..8e2adde3d 100644
--- a/src/Views/BinaryFileViewer.axaml.cs
+++ b/src/Views/BinaryFileViewer.axaml.cs
@@ -303,6 +303,7 @@ public partial class BinaryFileViewer : ChromelessWindow
     {
         public BinaryFileViewer()
         {
+            CloseOnESC = true;
             InitializeComponent();
         }
 

From 6dd54ccd77436ea7740b31219a35355ad5913f72 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 5 Aug 2026 12:02:24 +0800
Subject: [PATCH 27/34] refactor: use old-style design to ask user to confirm
 deleting the tracking remote

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Resources/Locales/de_DE.axaml |  1 +
 src/Resources/Locales/el_GR.axaml |  1 +
 src/Resources/Locales/en_US.axaml |  2 +-
 src/Resources/Locales/es_ES.axaml |  1 +
 src/Resources/Locales/fr_FR.axaml |  1 +
 src/Resources/Locales/he_IL.axaml |  1 +
 src/Resources/Locales/id_ID.axaml |  1 +
 src/Resources/Locales/it_IT.axaml |  1 +
 src/Resources/Locales/ja_JP.axaml |  1 +
 src/Resources/Locales/ko_KR.axaml |  1 +
 src/Resources/Locales/pt_BR.axaml |  1 +
 src/Resources/Locales/ru_RU.axaml |  1 +
 src/Resources/Locales/ta_IN.axaml |  1 +
 src/Resources/Locales/uk_UA.axaml |  1 +
 src/Resources/Locales/zh_CN.axaml |  1 +
 src/Resources/Locales/zh_TW.axaml |  1 +
 src/ViewModels/DeleteBranch.cs    | 68 +++++++++++++++++++------------
 src/Views/DeleteBranch.axaml      | 42 ++++++++++++-------
 18 files changed, 86 insertions(+), 41 deletions(-)

diff --git a/src/Resources/Locales/de_DE.axaml b/src/Resources/Locales/de_DE.axaml
index 2fbc94c69..2ac45adea 100644
--- a/src/Resources/Locales/de_DE.axaml
+++ b/src/Resources/Locales/de_DE.axaml
@@ -349,6 +349,7 @@ $1, $2, … Werte der Eingabe-Steuerelemente</x:String>
   <x:String x:Key="Text.DeleteBranch.Branch" xml:space="preserve">Branch:</x:String>
   <x:String x:Key="Text.DeleteBranch.Force" xml:space="preserve">Löschen erzwingen, auch bei nicht gemergten Commits</x:String>
   <x:String x:Key="Text.DeleteBranch.IsRemoteTip" xml:space="preserve">Du bist dabei, einen Remote-Branch zu löschen!!!</x:String>
+  <x:String x:Key="Text.DeleteBranch.WithTrackingRemote" xml:space="preserve">Auch Remote-Branch ${0}$ löschen</x:String>
   <x:String x:Key="Text.DeleteMultiBranch" xml:space="preserve">Mehrere Branches löschen</x:String>
   <x:String x:Key="Text.DeleteMultiBranch.Tip" xml:space="preserve">Du versuchst, mehrere Branches auf einmal zu löschen. Kontrolliere dies sorgfältig, bevor du fortfährst!</x:String>
   <x:String x:Key="Text.DeleteMultiTags" xml:space="preserve">Mehrere Tags löschen</x:String>
diff --git a/src/Resources/Locales/el_GR.axaml b/src/Resources/Locales/el_GR.axaml
index 4de2a9003..eea68e91b 100644
--- a/src/Resources/Locales/el_GR.axaml
+++ b/src/Resources/Locales/el_GR.axaml
@@ -349,6 +349,7 @@
   <x:String x:Key="Text.DeleteBranch.Branch" xml:space="preserve">Κλάδος:</x:String>
   <x:String x:Key="Text.DeleteBranch.Force" xml:space="preserve">Εξαναγκασμένη διαγραφή ακόμη κι αν περιέχει μη συγχωνευμένα commit</x:String>
   <x:String x:Key="Text.DeleteBranch.IsRemoteTip" xml:space="preserve">Πρόκειται να διαγράψετε έναν απομακρυσμένο κλάδο!!!</x:String>
+  <x:String x:Key="Text.DeleteBranch.WithTrackingRemote" xml:space="preserve">Διαγραφή και του απομακρυσμένου κλάδου ${0}$</x:String>
   <x:String x:Key="Text.DeleteMultiBranch" xml:space="preserve">Διαγραφή πολλαπλών κλάδων</x:String>
   <x:String x:Key="Text.DeleteMultiBranch.Tip" xml:space="preserve">Προσπαθείτε να διαγράψετε πολλούς κλάδους ταυτόχρονα. Βεβαιωθείτε ότι ελέγξατε ξανά πριν προχωρήσετε!</x:String>
   <x:String x:Key="Text.DeleteMultiTags" xml:space="preserve">Διαγραφή πολλαπλών ετικετών</x:String>
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 375aeeb93..757b2dbe5 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -341,10 +341,10 @@
   <x:String x:Key="Text.DeinitSubmodule.Force" xml:space="preserve">Force de-init even if it contains local changes.</x:String>
   <x:String x:Key="Text.DeinitSubmodule.Path" xml:space="preserve">Submodule:</x:String>
   <x:String x:Key="Text.DeleteBranch" xml:space="preserve">Delete Branch</x:String>
-  <x:String x:Key="Text.DeleteBranch.AskForRemote" xml:space="preserve">Do you want to also delete the following remote branch?</x:String>
   <x:String x:Key="Text.DeleteBranch.Branch" xml:space="preserve">Branch:</x:String>
   <x:String x:Key="Text.DeleteBranch.Force" xml:space="preserve">Force delete even if it contains unmerged commit(s)</x:String>
   <x:String x:Key="Text.DeleteBranch.IsRemoteTip" xml:space="preserve">You are about to delete a remote branch!!!</x:String>
+  <x:String x:Key="Text.DeleteBranch.WithTrackingRemote" xml:space="preserve">Also delete remote branch ${0}$</x:String>
   <x:String x:Key="Text.DeleteMultiBranch" xml:space="preserve">Delete Multiple Branches</x:String>
   <x:String x:Key="Text.DeleteMultiBranch.Tip" xml:space="preserve">You are trying to delete multiple branches at one time. Be sure to double-check before taking action!</x:String>
   <x:String x:Key="Text.DeleteMultiTags" xml:space="preserve">Delete Multiple Tags</x:String>
diff --git a/src/Resources/Locales/es_ES.axaml b/src/Resources/Locales/es_ES.axaml
index ac2e7d76f..ea0ee6f00 100644
--- a/src/Resources/Locales/es_ES.axaml
+++ b/src/Resources/Locales/es_ES.axaml
@@ -349,6 +349,7 @@
   <x:String x:Key="Text.DeleteBranch.Branch" xml:space="preserve">Rama:</x:String>
   <x:String x:Key="Text.DeleteBranch.Force" xml:space="preserve">Forzar la eliminación incluso si contiene commit(s) sin fusionar</x:String>
   <x:String x:Key="Text.DeleteBranch.IsRemoteTip" xml:space="preserve">¡Estás a punto de eliminar una rama remota!</x:String>
+  <x:String x:Key="Text.DeleteBranch.WithTrackingRemote" xml:space="preserve">También eliminar la rama remota ${0}$</x:String>
   <x:String x:Key="Text.DeleteMultiBranch" xml:space="preserve">Eliminar Múltiples Ramas</x:String>
   <x:String x:Key="Text.DeleteMultiBranch.Tip" xml:space="preserve">Estás intentando eliminar múltiples ramas a la vez. ¡Asegúrate de comprobar dos veces antes de realizar esta acción!</x:String>
   <x:String x:Key="Text.DeleteMultiTags" xml:space="preserve">Eliminar Múltiples Etiquetas</x:String>
diff --git a/src/Resources/Locales/fr_FR.axaml b/src/Resources/Locales/fr_FR.axaml
index a094fb2ae..97946656f 100644
--- a/src/Resources/Locales/fr_FR.axaml
+++ b/src/Resources/Locales/fr_FR.axaml
@@ -335,6 +335,7 @@
   <x:String x:Key="Text.DeleteBranch" xml:space="preserve">Supprimer la branche</x:String>
   <x:String x:Key="Text.DeleteBranch.Branch" xml:space="preserve">Branche :</x:String>
   <x:String x:Key="Text.DeleteBranch.IsRemoteTip" xml:space="preserve">Vous êtes sur le point de supprimer une branche distante !!!</x:String>
+  <x:String x:Key="Text.DeleteBranch.WithTrackingRemote" xml:space="preserve">Supprimer également la branche distante ${0}$</x:String>
   <x:String x:Key="Text.DeleteMultiBranch" xml:space="preserve">Supprimer plusieurs branches</x:String>
   <x:String x:Key="Text.DeleteMultiBranch.Tip" xml:space="preserve">Vous essayez de supprimer plusieurs branches à la fois. Assurez-vous de revérifier avant de procéder !</x:String>
   <x:String x:Key="Text.DeleteMultiTags" xml:space="preserve">Supprimer plusieurs tags</x:String>
diff --git a/src/Resources/Locales/he_IL.axaml b/src/Resources/Locales/he_IL.axaml
index 64346545d..038554b02 100644
--- a/src/Resources/Locales/he_IL.axaml
+++ b/src/Resources/Locales/he_IL.axaml
@@ -335,6 +335,7 @@
   <x:String x:Key="Text.DeleteBranch" xml:space="preserve">מחק Branch</x:String>
   <x:String x:Key="Text.DeleteBranch.Branch" xml:space="preserve">Branch:</x:String>
   <x:String x:Key="Text.DeleteBranch.IsRemoteTip" xml:space="preserve">פעולה זו תמחק branch מרוחק!!!</x:String>
+  <x:String x:Key="Text.DeleteBranch.WithTrackingRemote" xml:space="preserve">למחוק גם את ה־branch המרוחק ${0}$</x:String>
   <x:String x:Key="Text.DeleteMultiBranch" xml:space="preserve">מחק מספר Branches</x:String>
   <x:String x:Key="Text.DeleteMultiBranch.Tip" xml:space="preserve">פעולה זו תמחק מספר branches בו זמנית. בדוק היטב לפני הביצוע!</x:String>
   <x:String x:Key="Text.DeleteMultiTags" xml:space="preserve">מחק מספר Tags</x:String>
diff --git a/src/Resources/Locales/id_ID.axaml b/src/Resources/Locales/id_ID.axaml
index 383ae256d..b65dd27a2 100644
--- a/src/Resources/Locales/id_ID.axaml
+++ b/src/Resources/Locales/id_ID.axaml
@@ -349,6 +349,7 @@
   <x:String x:Key="Text.DeleteBranch.Branch" xml:space="preserve">Branch:</x:String>
   <x:String x:Key="Text.DeleteBranch.Force" xml:space="preserve">Paksa hapus meskipun berisi commit yang belum di-merge</x:String>
   <x:String x:Key="Text.DeleteBranch.IsRemoteTip" xml:space="preserve">Anda akan menghapus remote branch!!!</x:String>
+  <x:String x:Key="Text.DeleteBranch.WithTrackingRemote" xml:space="preserve">Juga hapus remote branch ${0}$</x:String>
   <x:String x:Key="Text.DeleteMultiBranch" xml:space="preserve">Hapus Beberapa Branch</x:String>
   <x:String x:Key="Text.DeleteMultiBranch.Tip" xml:space="preserve">Anda akan menghapus beberapa branch sekaligus. Pastikan untuk memeriksa ulang sebelum bertindak!</x:String>
   <x:String x:Key="Text.DeleteMultiTags" xml:space="preserve">Hapus Beberapa Tag</x:String>
diff --git a/src/Resources/Locales/it_IT.axaml b/src/Resources/Locales/it_IT.axaml
index 46b2fa9a5..2ceaa6da6 100644
--- a/src/Resources/Locales/it_IT.axaml
+++ b/src/Resources/Locales/it_IT.axaml
@@ -310,6 +310,7 @@ ${pure_files:N} Come ${files:N}, ma senza cartelle</x:String>
   <x:String x:Key="Text.DeleteBranch" xml:space="preserve">Elimina Branch</x:String>
   <x:String x:Key="Text.DeleteBranch.Branch" xml:space="preserve">Branch:</x:String>
   <x:String x:Key="Text.DeleteBranch.IsRemoteTip" xml:space="preserve">Stai per eliminare un branch remoto!!!</x:String>
+  <x:String x:Key="Text.DeleteBranch.WithTrackingRemote" xml:space="preserve">Elimina anche il branch remoto ${0}$</x:String>
   <x:String x:Key="Text.DeleteMultiBranch" xml:space="preserve">Elimina Branch Multipli</x:String>
   <x:String x:Key="Text.DeleteMultiBranch.Tip" xml:space="preserve">Stai per eliminare più branch contemporaneamente. Controlla attentamente prima di procedere!</x:String>
   <x:String x:Key="Text.DeleteMultiTags" xml:space="preserve">Elimina Tag Multipli</x:String>
diff --git a/src/Resources/Locales/ja_JP.axaml b/src/Resources/Locales/ja_JP.axaml
index 844e70874..f54401492 100644
--- a/src/Resources/Locales/ja_JP.axaml
+++ b/src/Resources/Locales/ja_JP.axaml
@@ -349,6 +349,7 @@
   <x:String x:Key="Text.DeleteBranch.Branch" xml:space="preserve">ブランチ:</x:String>
   <x:String x:Key="Text.DeleteBranch.Force" xml:space="preserve">未マージのコミットがあっても強制的に削除</x:String>
   <x:String x:Key="Text.DeleteBranch.IsRemoteTip" xml:space="preserve">リモートブランチを削除しようとしています！！！</x:String>
+  <x:String x:Key="Text.DeleteBranch.WithTrackingRemote" xml:space="preserve">リモートブランチの ${0}$ も削除</x:String>
   <x:String x:Key="Text.DeleteMultiBranch" xml:space="preserve">複数のブランチを削除</x:String>
   <x:String x:Key="Text.DeleteMultiBranch.Tip" xml:space="preserve">複数のブランチをまとめて削除しようとしています。操作を行う前によく確認してください！</x:String>
   <x:String x:Key="Text.DeleteMultiTags" xml:space="preserve">複数のタグを削除</x:String>
diff --git a/src/Resources/Locales/ko_KR.axaml b/src/Resources/Locales/ko_KR.axaml
index 5a1d7b053..3224c0f1d 100644
--- a/src/Resources/Locales/ko_KR.axaml
+++ b/src/Resources/Locales/ko_KR.axaml
@@ -334,6 +334,7 @@
   <x:String x:Key="Text.DeleteBranch" xml:space="preserve">브랜치 삭제</x:String>
   <x:String x:Key="Text.DeleteBranch.Branch" xml:space="preserve">브랜치:</x:String>
   <x:String x:Key="Text.DeleteBranch.IsRemoteTip" xml:space="preserve">원격 브랜치를 삭제하려고 합니다!!!</x:String>
+  <x:String x:Key="Text.DeleteBranch.WithTrackingRemote" xml:space="preserve">원격 브랜치 ${0}$도 함께 삭제</x:String>
   <x:String x:Key="Text.DeleteMultiBranch" xml:space="preserve">여러 브랜치 삭제</x:String>
   <x:String x:Key="Text.DeleteMultiBranch.Tip" xml:space="preserve">한 번에 여러 브랜치를 삭제하려고 합니다. 실행하기 전에 다시 한번 확인하세요!</x:String>
   <x:String x:Key="Text.DeleteMultiTags" xml:space="preserve">여러 태그 삭제</x:String>
diff --git a/src/Resources/Locales/pt_BR.axaml b/src/Resources/Locales/pt_BR.axaml
index 8155dc647..0a3540d09 100644
--- a/src/Resources/Locales/pt_BR.axaml
+++ b/src/Resources/Locales/pt_BR.axaml
@@ -215,6 +215,7 @@
   <x:String x:Key="Text.DeleteBranch" xml:space="preserve">Excluir Branch</x:String>
   <x:String x:Key="Text.DeleteBranch.Branch" xml:space="preserve">Branch:</x:String>
   <x:String x:Key="Text.DeleteBranch.IsRemoteTip" xml:space="preserve">Você está prestes a excluir uma branch remota!!!</x:String>
+  <x:String x:Key="Text.DeleteBranch.WithTrackingRemote" xml:space="preserve">Também excluir branch remoto ${0}$</x:String>
   <x:String x:Key="Text.DeleteMultiBranch" xml:space="preserve">Excluir Múltiplos Branches</x:String>
   <x:String x:Key="Text.DeleteMultiBranch.Tip" xml:space="preserve">Você está tentando excluir vários branches de uma vez. Certifique-se de verificar antes de agir!</x:String>
   <x:String x:Key="Text.DeleteRemote" xml:space="preserve">Excluir Remoto</x:String>
diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index 525796412..86d80f850 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -349,6 +349,7 @@
   <x:String x:Key="Text.DeleteBranch.Branch" xml:space="preserve">Ветка:</x:String>
   <x:String x:Key="Text.DeleteBranch.Force" xml:space="preserve">Принудительно удалить, даже если содержит неслитые ревизии</x:String>
   <x:String x:Key="Text.DeleteBranch.IsRemoteTip" xml:space="preserve">Вы собираетесь удалить внешнюю ветку!!!</x:String>
+  <x:String x:Key="Text.DeleteBranch.WithTrackingRemote" xml:space="preserve">Также удалите внешнюю ветку ${0}$</x:String>
   <x:String x:Key="Text.DeleteMultiBranch" xml:space="preserve">Удаление нескольких веток</x:String>
   <x:String x:Key="Text.DeleteMultiBranch.Tip" xml:space="preserve">Вы пытаетесь удалить несколько веток одновременно. Обязательно перепроверьте, прежде чем предпринимать какие-либо действия!</x:String>
   <x:String x:Key="Text.DeleteMultiTags" xml:space="preserve">Удалить несколько меток</x:String>
diff --git a/src/Resources/Locales/ta_IN.axaml b/src/Resources/Locales/ta_IN.axaml
index 5cbea045b..09edf56bc 100644
--- a/src/Resources/Locales/ta_IN.axaml
+++ b/src/Resources/Locales/ta_IN.axaml
@@ -193,6 +193,7 @@
   <x:String x:Key="Text.DeleteBranch" xml:space="preserve">கிளையை நீக்கு</x:String>
   <x:String x:Key="Text.DeleteBranch.Branch" xml:space="preserve">கிளை:</x:String>
   <x:String x:Key="Text.DeleteBranch.IsRemoteTip" xml:space="preserve">நீங்கள் ஒரு தொலை கிளையை நீக்கப் போகிறீர்கள்!!!</x:String>
+  <x:String x:Key="Text.DeleteBranch.WithTrackingRemote" xml:space="preserve">தொலை ${0}$ கிளையையும் நீக்கு</x:String>
   <x:String x:Key="Text.DeleteMultiBranch" xml:space="preserve">பல கிளைகளை நீக்கு</x:String>
   <x:String x:Key="Text.DeleteMultiBranch.Tip" xml:space="preserve">நீங்கள் ஒரே நேரத்தில் பல கிளைகளை நீக்க முயற்சிக்கிறீர்கள் நடவடிக்கை எடுப்பதற்கு முன் மீண்டும் சரிபார்!</x:String>
   <x:String x:Key="Text.DeleteRemote" xml:space="preserve">தொலையை நீக்கு</x:String>
diff --git a/src/Resources/Locales/uk_UA.axaml b/src/Resources/Locales/uk_UA.axaml
index 9cad040c7..eecb8c343 100644
--- a/src/Resources/Locales/uk_UA.axaml
+++ b/src/Resources/Locales/uk_UA.axaml
@@ -197,6 +197,7 @@
   <x:String x:Key="Text.DeleteBranch" xml:space="preserve">Видалити гілку</x:String>
   <x:String x:Key="Text.DeleteBranch.Branch" xml:space="preserve">Гілка:</x:String>
   <x:String x:Key="Text.DeleteBranch.IsRemoteTip" xml:space="preserve">Ви збираєтеся видалити віддалену гілку!!!</x:String>
+  <x:String x:Key="Text.DeleteBranch.WithTrackingRemote" xml:space="preserve">Також видалити віддалену гілку ${0}$</x:String>
   <x:String x:Key="Text.DeleteMultiBranch" xml:space="preserve">Видалити кілька гілок</x:String>
   <x:String x:Key="Text.DeleteMultiBranch.Tip" xml:space="preserve">Ви намагаєтеся видалити кілька гілок одночасно. Перевірте ще раз перед виконанням!</x:String>
   <x:String x:Key="Text.DeleteRemote" xml:space="preserve">Видалити віддалене сховище</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 1ae5476e9..47f8a12da 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -349,6 +349,7 @@
   <x:String x:Key="Text.DeleteBranch.Branch" xml:space="preserve">分支名 ：</x:String>
   <x:String x:Key="Text.DeleteBranch.Force" xml:space="preserve">强制删除，即使包含未合并的提交</x:String>
   <x:String x:Key="Text.DeleteBranch.IsRemoteTip" xml:space="preserve">您正在删除远程上的分支，请务必小心！！！</x:String>
+  <x:String x:Key="Text.DeleteBranch.WithTrackingRemote" xml:space="preserve">同时删除远程分支 ${0}$</x:String>
   <x:String x:Key="Text.DeleteMultiBranch" xml:space="preserve">删除多个分支</x:String>
   <x:String x:Key="Text.DeleteMultiBranch.Tip" xml:space="preserve">您正在尝试一次性删除多个分支，请务必仔细检查后再执行操作！</x:String>
   <x:String x:Key="Text.DeleteMultiTags" xml:space="preserve">删除多个标签</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 2d55ae127..f54868f43 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -349,6 +349,7 @@
   <x:String x:Key="Text.DeleteBranch.Branch" xml:space="preserve">分支名稱:</x:String>
   <x:String x:Key="Text.DeleteBranch.Force" xml:space="preserve">強制刪除，即使包含未合併的提交</x:String>
   <x:String x:Key="Text.DeleteBranch.IsRemoteTip" xml:space="preserve">您正在刪除遠端上的分支，請務必小心!</x:String>
+  <x:String x:Key="Text.DeleteBranch.WithTrackingRemote" xml:space="preserve">同時刪除遠端分支 ${0}$</x:String>
   <x:String x:Key="Text.DeleteMultiBranch" xml:space="preserve">刪除多個分支</x:String>
   <x:String x:Key="Text.DeleteMultiBranch.Tip" xml:space="preserve">您正在嘗試一次性刪除多個分支，請務必仔細檢查後再刪除!</x:String>
   <x:String x:Key="Text.DeleteMultiTags" xml:space="preserve">刪除多個標籤</x:String>
diff --git a/src/ViewModels/DeleteBranch.cs b/src/ViewModels/DeleteBranch.cs
index ed8e8ff0b..57e29e023 100644
--- a/src/ViewModels/DeleteBranch.cs
+++ b/src/ViewModels/DeleteBranch.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace SourceGit.ViewModels
@@ -11,6 +10,22 @@ public Models.Branch Target
             get;
         }
 
+        public Models.Branch Upstream
+        {
+            get;
+        }
+
+        public string DeleteUpstreamTip
+        {
+            get;
+        }
+
+        public bool DeleteUpstream
+        {
+            get;
+            set;
+        }
+
         public bool Force
         {
             get;
@@ -21,6 +36,16 @@ public DeleteBranch(Repository repo, Models.Branch branch)
         {
             _repo = repo;
             Target = branch;
+
+            if (branch.IsLocal && !string.IsNullOrEmpty(branch.Upstream))
+            {
+                var upstream = _repo.Branches.Find(x => x.FullName.Equals(branch.Upstream, StringComparison.Ordinal));
+                if (upstream != null && upstream.Name.Equals(branch.Name, StringComparison.Ordinal))
+                {
+                    Upstream = upstream;
+                    DeleteUpstreamTip = App.Text("DeleteBranch.WithTrackingRemote", upstream.FriendlyName);
+                }
+            }
         }
 
         public override async Task<bool> Sure()
@@ -34,33 +59,26 @@ public override async Task<bool> Sure()
             var succ = false;
             if (Target.IsLocal)
             {
-                succ = await new Commands.Branch(_repo.FullPath, Target.Name)
-                    .Use(log)
-                    .DeleteLocalAsync(Force);
-
-                if (succ)
+                do
                 {
+                    succ = await new Commands.Branch(_repo.FullPath, Target.Name)
+                        .Use(log)
+                        .DeleteLocalAsync(Force);
+
+                    if (!succ)
+                        break;
+
                     _repo.UIStates.RemoveHistoryFilter(Target.FullName, Models.FilterType.LocalBranch);
 
-                    var upstream = Target.Upstream ?? string.Empty;
-                    var tracking = _repo.Branches.Find(x => x.FullName.Equals(upstream, StringComparison.Ordinal));
-                    if (tracking != null && tracking.Name.Equals(Target.Name, StringComparison.Ordinal))
-                    {
-                        var msgBuilder = new StringBuilder();
-                        msgBuilder
-                            .AppendLine(App.Text("DeleteBranch.AskForRemote"))
-                            .AppendLine()
-                            .Append("• ").Append(tracking.FriendlyName);
-
-                        var deleteTracking = await App.AskConfirmAsync(msgBuilder.ToString(), Models.ConfirmButtonType.YesNo);
-                        if (deleteTracking)
-                        {
-                            succ = await DeleteRemoteBranchAsync(tracking, log);
-                            if (succ)
-                                _repo.UIStates.RemoveHistoryFilter(tracking.FullName, Models.FilterType.RemoteBranch);
-                        }
-                    }
-                }
+                    if (!DeleteUpstream || Upstream == null)
+                        break;
+
+                    succ = await DeleteRemoteBranchAsync(Upstream, log);
+                    if (!succ)
+                        break;
+
+                    _repo.UIStates.RemoveHistoryFilter(Upstream.FullName, Models.FilterType.RemoteBranch);
+                } while (false);
             }
             else
             {
diff --git a/src/Views/DeleteBranch.axaml b/src/Views/DeleteBranch.axaml
index 3cd83e73d..d27b11ea7 100644
--- a/src/Views/DeleteBranch.axaml
+++ b/src/Views/DeleteBranch.axaml
@@ -18,7 +18,7 @@
                  Text="{DynamicResource Text.DeleteBranch}"/>
     </StackPanel>
 
-    <Grid Margin="0,16,8,0" RowDefinitions="32,Auto" ColumnDefinitions="120,*">
+    <Grid Margin="0,16,8,0" RowDefinitions="32,Auto,Auto,Auto" ColumnDefinitions="120,*">
       <TextBlock Grid.Row="0" Grid.Column="0" HorizontalAlignment="Right" Text="{DynamicResource Text.DeleteBranch.Branch}"/>
       <StackPanel Grid.Row="0" Grid.Column="1" Orientation="Horizontal">
         <Path Width="14" Height="14" Margin="8,0" Data="{StaticResource Icons.Branch}"/>
@@ -37,24 +37,36 @@
         </Border>
       </StackPanel>
 
-      <Grid Grid.Row="1" Grid.Column="1" Height="32" Margin="6,0,0,0">
+      <Border Grid.Row="1" Grid.Column="1"
+              Height="32"
+              IsVisible="{Binding Target.IsLocal, Mode=OneWay}">
         <CheckBox Content="{DynamicResource Text.DeleteBranch.Force}"
                   IsChecked="{Binding Force, Mode=TwoWay}"
-                  IsVisible="{Binding Target.IsLocal}"
                   ToolTip.Tip="--force"/>
+      </Border>
 
-        <StackPanel Orientation="Horizontal"
-                    VerticalAlignment="Center"
-                    IsVisible="{Binding !Target.IsLocal}">
-          <Path Width="14" Height="14"
-                Data="{StaticResource Icons.Error}"
-                Fill="DarkOrange"/>
-          <TextBlock Margin="4,0,0,0"
-                     Text="{DynamicResource Text.DeleteBranch.IsRemoteTip}"
-                     Foreground="{DynamicResource Brush.FG2}"
-                     FontStyle="Italic"/>
-        </StackPanel>
-      </Grid>
+      <Border Grid.Row="2" Grid.Column="1"
+              Height="32"
+              IsVisible="{Binding Upstream, Mode=OneWay, Converter={x:Static ObjectConverters.IsNotNull}}">
+        <CheckBox IsChecked="{Binding DeleteUpstream, Mode=TwoWay}">
+          <v:NameHighlightedTextBlock Foreground="{DynamicResource Brush.FG1}"
+                                      Text="{Binding DeleteUpstreamTip, Mode=OneWay}"
+                                      VerticalAlignment="Center"/>
+        </CheckBox>
+      </Border>
+
+      <StackPanel Grid.Row="3" Grid.Column="1"
+                  Height="32"
+                  Orientation="Horizontal"
+                  IsVisible="{Binding !Target.IsLocal, Mode=OneWay}">
+        <Path Width="14" Height="14"
+              Data="{StaticResource Icons.Error}"
+              Fill="DarkOrange"/>
+        <TextBlock Margin="4,0,0,0"
+                   Text="{DynamicResource Text.DeleteBranch.IsRemoteTip}"
+                   Foreground="{DynamicResource Brush.FG2}"
+                   FontStyle="Italic"/>
+      </StackPanel>
     </Grid>
   </StackPanel>
 </UserControl>

From 90ff73b15aa2fc641cac4c2c9a5d441c7b68d28b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Wed, 5 Aug 2026 04:02:54 +0000
Subject: [PATCH 28/34] doc: Update translation status and sort locale files

---
 TRANSLATION.md                    | 21 +++++++--------------
 src/Resources/Locales/de_DE.axaml |  1 -
 src/Resources/Locales/el_GR.axaml |  1 -
 src/Resources/Locales/es_ES.axaml |  1 -
 src/Resources/Locales/id_ID.axaml |  1 -
 src/Resources/Locales/ja_JP.axaml |  1 -
 src/Resources/Locales/ru_RU.axaml |  1 -
 src/Resources/Locales/zh_CN.axaml |  1 -
 src/Resources/Locales/zh_TW.axaml |  1 -
 9 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/TRANSLATION.md b/TRANSLATION.md
index fde5e623e..fd3fa5a93 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -48,7 +48,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![fr__FR](https://img.shields.io/badge/fr__FR-95.12%25-yellow)
+### ![fr__FR](https://img.shields.io/badge/fr__FR-95.22%25-yellow)
 
 <details>
 <summary>Missing keys in fr_FR.axaml</summary>
@@ -65,7 +65,6 @@ This document shows the translation status of each locale file in the repository
 - Text.CommitCM.CopyCommitterTime
 - Text.Configure.Git.EnableRecursiveWhenAutoUpdatingSubmodules
 - Text.CopyAsPatch
-- Text.DeleteBranch.AskForRemote
 - Text.DeleteBranch.Force
 - Text.Diff.Binary.ViewContentOfNew
 - Text.Diff.EmptyFile
@@ -106,7 +105,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![he__IL](https://img.shields.io/badge/he__IL-95.12%25-yellow)
+### ![he__IL](https://img.shields.io/badge/he__IL-95.22%25-yellow)
 
 <details>
 <summary>Missing keys in he_IL.axaml</summary>
@@ -123,7 +122,6 @@ This document shows the translation status of each locale file in the repository
 - Text.CommitCM.CopyCommitterTime
 - Text.Configure.Git.EnableRecursiveWhenAutoUpdatingSubmodules
 - Text.CopyAsPatch
-- Text.DeleteBranch.AskForRemote
 - Text.DeleteBranch.Force
 - Text.Diff.Binary.ViewContentOfNew
 - Text.Diff.EmptyFile
@@ -177,7 +175,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![it__IT](https://img.shields.io/badge/it__IT-88.68%25-yellow)
+### ![it__IT](https://img.shields.io/badge/it__IT-88.78%25-yellow)
 
 <details>
 <summary>Missing keys in it_IT.axaml</summary>
@@ -219,7 +217,6 @@ This document shows the translation status of each locale file in the repository
 - Text.ConfigureCustomActionControls.UseFriendlyName
 - Text.ConfirmEmptyCommit.StageSelectedThenCommit
 - Text.CopyAsPatch
-- Text.DeleteBranch.AskForRemote
 - Text.DeleteBranch.Force
 - Text.Diff.Binary.ViewContentOfNew
 - Text.Diff.EmptyFile
@@ -318,7 +315,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ko__KR](https://img.shields.io/badge/ko__KR-96.59%25-yellow)
+### ![ko__KR](https://img.shields.io/badge/ko__KR-96.68%25-yellow)
 
 <details>
 <summary>Missing keys in ko_KR.axaml</summary>
@@ -329,7 +326,6 @@ This document shows the translation status of each locale file in the repository
 - Text.CheckoutDetached.Target
 - Text.CheckoutDetached.Warning
 - Text.Configure.Git.EnableRecursiveWhenAutoUpdatingSubmodules
-- Text.DeleteBranch.AskForRemote
 - Text.DeleteBranch.Force
 - Text.Diff.Binary.ViewContentOfNew
 - Text.Diff.EmptyFile
@@ -361,7 +357,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![pt__BR](https://img.shields.io/badge/pt__BR-62.54%25-red)
+### ![pt__BR](https://img.shields.io/badge/pt__BR-62.63%25-red)
 
 <details>
 <summary>Missing keys in pt_BR.axaml</summary>
@@ -482,7 +478,6 @@ This document shows the translation status of each locale file in the repository
 - Text.DeinitSubmodule
 - Text.DeinitSubmodule.Force
 - Text.DeinitSubmodule.Path
-- Text.DeleteBranch.AskForRemote
 - Text.DeleteBranch.Force
 - Text.DeleteMultiTags
 - Text.DeleteMultiTags.DeleteFromRemotes
@@ -765,7 +760,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ta__IN](https://img.shields.io/badge/ta__IN-64.20%25-red)
+### ![ta__IN](https://img.shields.io/badge/ta__IN-64.29%25-red)
 
 <details>
 <summary>Missing keys in ta_IN.axaml</summary>
@@ -908,7 +903,6 @@ This document shows the translation status of each locale file in the repository
 - Text.DeinitSubmodule
 - Text.DeinitSubmodule.Force
 - Text.DeinitSubmodule.Path
-- Text.DeleteBranch.AskForRemote
 - Text.DeleteBranch.Force
 - Text.DeleteMultiTags
 - Text.DeleteMultiTags.DeleteFromRemotes
@@ -1140,7 +1134,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![uk__UA](https://img.shields.io/badge/uk__UA-64.98%25-red)
+### ![uk__UA](https://img.shields.io/badge/uk__UA-65.07%25-red)
 
 <details>
 <summary>Missing keys in uk_UA.axaml</summary>
@@ -1279,7 +1273,6 @@ This document shows the translation status of each locale file in the repository
 - Text.DeinitSubmodule
 - Text.DeinitSubmodule.Force
 - Text.DeinitSubmodule.Path
-- Text.DeleteBranch.AskForRemote
 - Text.DeleteBranch.Force
 - Text.DeleteMultiTags
 - Text.DeleteMultiTags.DeleteFromRemotes
diff --git a/src/Resources/Locales/de_DE.axaml b/src/Resources/Locales/de_DE.axaml
index 2ac45adea..32b68abc9 100644
--- a/src/Resources/Locales/de_DE.axaml
+++ b/src/Resources/Locales/de_DE.axaml
@@ -345,7 +345,6 @@ $1, $2, … Werte der Eingabe-Steuerelemente</x:String>
   <x:String x:Key="Text.DeinitSubmodule.Force" xml:space="preserve">Erzwinge Deinitialisierung, selbst wenn lokale Änderungen enthalten sind.</x:String>
   <x:String x:Key="Text.DeinitSubmodule.Path" xml:space="preserve">Submodul:</x:String>
   <x:String x:Key="Text.DeleteBranch" xml:space="preserve">Branch löschen</x:String>
-  <x:String x:Key="Text.DeleteBranch.AskForRemote" xml:space="preserve">Möchtest du auch den folgenden Remote-Branch löschen?</x:String>
   <x:String x:Key="Text.DeleteBranch.Branch" xml:space="preserve">Branch:</x:String>
   <x:String x:Key="Text.DeleteBranch.Force" xml:space="preserve">Löschen erzwingen, auch bei nicht gemergten Commits</x:String>
   <x:String x:Key="Text.DeleteBranch.IsRemoteTip" xml:space="preserve">Du bist dabei, einen Remote-Branch zu löschen!!!</x:String>
diff --git a/src/Resources/Locales/el_GR.axaml b/src/Resources/Locales/el_GR.axaml
index eea68e91b..f10a0179a 100644
--- a/src/Resources/Locales/el_GR.axaml
+++ b/src/Resources/Locales/el_GR.axaml
@@ -345,7 +345,6 @@
   <x:String x:Key="Text.DeinitSubmodule.Force" xml:space="preserve">Εξαναγκασμός απο-αρχικοποίησης ακόμη κι αν περιέχει τοπικές αλλαγές.</x:String>
   <x:String x:Key="Text.DeinitSubmodule.Path" xml:space="preserve">Υπομονάδα:</x:String>
   <x:String x:Key="Text.DeleteBranch" xml:space="preserve">Διαγραφή κλάδου</x:String>
-  <x:String x:Key="Text.DeleteBranch.AskForRemote" xml:space="preserve">Θέλετε να διαγράψετε και τον ακόλουθο απομακρυσμένο κλάδο;</x:String>
   <x:String x:Key="Text.DeleteBranch.Branch" xml:space="preserve">Κλάδος:</x:String>
   <x:String x:Key="Text.DeleteBranch.Force" xml:space="preserve">Εξαναγκασμένη διαγραφή ακόμη κι αν περιέχει μη συγχωνευμένα commit</x:String>
   <x:String x:Key="Text.DeleteBranch.IsRemoteTip" xml:space="preserve">Πρόκειται να διαγράψετε έναν απομακρυσμένο κλάδο!!!</x:String>
diff --git a/src/Resources/Locales/es_ES.axaml b/src/Resources/Locales/es_ES.axaml
index ea0ee6f00..d13f1d16b 100644
--- a/src/Resources/Locales/es_ES.axaml
+++ b/src/Resources/Locales/es_ES.axaml
@@ -345,7 +345,6 @@
   <x:String x:Key="Text.DeinitSubmodule.Force" xml:space="preserve">Forzar desinicialización incluso si contiene cambios locales.</x:String>
   <x:String x:Key="Text.DeinitSubmodule.Path" xml:space="preserve">Submódulo:</x:String>
   <x:String x:Key="Text.DeleteBranch" xml:space="preserve">Eliminar Rama</x:String>
-  <x:String x:Key="Text.DeleteBranch.AskForRemote" xml:space="preserve">¿Quieres que también se elimine la siguiente rama remota?</x:String>
   <x:String x:Key="Text.DeleteBranch.Branch" xml:space="preserve">Rama:</x:String>
   <x:String x:Key="Text.DeleteBranch.Force" xml:space="preserve">Forzar la eliminación incluso si contiene commit(s) sin fusionar</x:String>
   <x:String x:Key="Text.DeleteBranch.IsRemoteTip" xml:space="preserve">¡Estás a punto de eliminar una rama remota!</x:String>
diff --git a/src/Resources/Locales/id_ID.axaml b/src/Resources/Locales/id_ID.axaml
index b65dd27a2..6f7bff766 100644
--- a/src/Resources/Locales/id_ID.axaml
+++ b/src/Resources/Locales/id_ID.axaml
@@ -345,7 +345,6 @@
   <x:String x:Key="Text.DeinitSubmodule.Force" xml:space="preserve">Paksa de-init meski mengandung perubahan lokal.</x:String>
   <x:String x:Key="Text.DeinitSubmodule.Path" xml:space="preserve">Submodule:</x:String>
   <x:String x:Key="Text.DeleteBranch" xml:space="preserve">Hapus Branch</x:String>
-  <x:String x:Key="Text.DeleteBranch.AskForRemote" xml:space="preserve">Apakah Anda juga ingin menghapus remote branch berikut?</x:String>
   <x:String x:Key="Text.DeleteBranch.Branch" xml:space="preserve">Branch:</x:String>
   <x:String x:Key="Text.DeleteBranch.Force" xml:space="preserve">Paksa hapus meskipun berisi commit yang belum di-merge</x:String>
   <x:String x:Key="Text.DeleteBranch.IsRemoteTip" xml:space="preserve">Anda akan menghapus remote branch!!!</x:String>
diff --git a/src/Resources/Locales/ja_JP.axaml b/src/Resources/Locales/ja_JP.axaml
index f54401492..fca6427cd 100644
--- a/src/Resources/Locales/ja_JP.axaml
+++ b/src/Resources/Locales/ja_JP.axaml
@@ -345,7 +345,6 @@
   <x:String x:Key="Text.DeinitSubmodule.Force" xml:space="preserve">ローカルの変更の有無に関わらず、強制的に解除</x:String>
   <x:String x:Key="Text.DeinitSubmodule.Path" xml:space="preserve">サブモジュール:</x:String>
   <x:String x:Key="Text.DeleteBranch" xml:space="preserve">ブランチを削除</x:String>
-  <x:String x:Key="Text.DeleteBranch.AskForRemote" xml:space="preserve">次のリモートブランチも削除しますか？</x:String>
   <x:String x:Key="Text.DeleteBranch.Branch" xml:space="preserve">ブランチ:</x:String>
   <x:String x:Key="Text.DeleteBranch.Force" xml:space="preserve">未マージのコミットがあっても強制的に削除</x:String>
   <x:String x:Key="Text.DeleteBranch.IsRemoteTip" xml:space="preserve">リモートブランチを削除しようとしています！！！</x:String>
diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index 86d80f850..9609da834 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -345,7 +345,6 @@
   <x:String x:Key="Text.DeinitSubmodule.Force" xml:space="preserve">Принудительно удалить даже если содержит локальные изменения.</x:String>
   <x:String x:Key="Text.DeinitSubmodule.Path" xml:space="preserve">Подмодуль:</x:String>
   <x:String x:Key="Text.DeleteBranch" xml:space="preserve">Удалить ветку</x:String>
-  <x:String x:Key="Text.DeleteBranch.AskForRemote" xml:space="preserve">Вы хотите также удалить следующую удалённую ветку?</x:String>
   <x:String x:Key="Text.DeleteBranch.Branch" xml:space="preserve">Ветка:</x:String>
   <x:String x:Key="Text.DeleteBranch.Force" xml:space="preserve">Принудительно удалить, даже если содержит неслитые ревизии</x:String>
   <x:String x:Key="Text.DeleteBranch.IsRemoteTip" xml:space="preserve">Вы собираетесь удалить внешнюю ветку!!!</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 47f8a12da..ac7b73aba 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -345,7 +345,6 @@
   <x:String x:Key="Text.DeinitSubmodule.Force" xml:space="preserve">强制取消，即使包含本地变更</x:String>
   <x:String x:Key="Text.DeinitSubmodule.Path" xml:space="preserve">子模块 ：</x:String>
   <x:String x:Key="Text.DeleteBranch" xml:space="preserve">删除分支确认</x:String>
-  <x:String x:Key="Text.DeleteBranch.AskForRemote" xml:space="preserve">是否同时删除以下远程分支？</x:String>
   <x:String x:Key="Text.DeleteBranch.Branch" xml:space="preserve">分支名 ：</x:String>
   <x:String x:Key="Text.DeleteBranch.Force" xml:space="preserve">强制删除，即使包含未合并的提交</x:String>
   <x:String x:Key="Text.DeleteBranch.IsRemoteTip" xml:space="preserve">您正在删除远程上的分支，请务必小心！！！</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index f54868f43..54d749bdb 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -345,7 +345,6 @@
   <x:String x:Key="Text.DeinitSubmodule.Force" xml:space="preserve">強制取消，即使包含本機變更</x:String>
   <x:String x:Key="Text.DeinitSubmodule.Path" xml:space="preserve">子模組:</x:String>
   <x:String x:Key="Text.DeleteBranch" xml:space="preserve">刪除分支確認</x:String>
-  <x:String x:Key="Text.DeleteBranch.AskForRemote" xml:space="preserve">您是否也想刪除以下遠端分支?</x:String>
   <x:String x:Key="Text.DeleteBranch.Branch" xml:space="preserve">分支名稱:</x:String>
   <x:String x:Key="Text.DeleteBranch.Force" xml:space="preserve">強制刪除，即使包含未合併的提交</x:String>
   <x:String x:Key="Text.DeleteBranch.IsRemoteTip" xml:space="preserve">您正在刪除遠端上的分支，請務必小心!</x:String>

From 8190a8ff80932e3519bfd27b6617d91582b8e1f1 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 6 Aug 2026 16:15:32 +0800
Subject: [PATCH 29/34] enhance: force kill the previous `git status` process
 (#2358)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Commands/QueryLocalChanges.cs | 25 +++++++++++++++++++++++++
 src/ViewModels/Repository.cs      |  1 +
 2 files changed, 26 insertions(+)

diff --git a/src/Commands/QueryLocalChanges.cs b/src/Commands/QueryLocalChanges.cs
index d1bd30a2c..31d72a095 100644
--- a/src/Commands/QueryLocalChanges.cs
+++ b/src/Commands/QueryLocalChanges.cs
@@ -34,9 +34,24 @@ public QueryLocalChanges(string repo, bool includeUntracked = true, bool noOptio
             try
             {
                 using var proc = new Process();
+                var captured = new CapturedProcess() { Process = proc };
+                var capturedLock = new object();
+
                 proc.StartInfo = CreateGitStartInfo(true);
                 proc.Start();
 
+                if (CancellationToken.CanBeCanceled)
+                {
+                    CancellationToken.Register(() =>
+                    {
+                        lock (capturedLock)
+                        {
+                            if (captured is { Process: { HasExited: false } })
+                                captured.Process.Kill(true);
+                        }
+                    });
+                }
+
                 while (await proc.StandardOutput.ReadLineAsync().ConfigureAwait(false) is { } line)
                 {
                     var match = REG_FORMAT().Match(line);
@@ -165,6 +180,11 @@ public QueryLocalChanges(string repo, bool includeUntracked = true, bool noOptio
                     if (change.Index != Models.ChangeState.None || change.WorkTree != Models.ChangeState.None)
                         outs.Add(change);
                 }
+
+                lock (capturedLock)
+                {
+                    captured.Process = null;
+                }
             }
             catch
             {
@@ -173,5 +193,10 @@ public QueryLocalChanges(string repo, bool includeUntracked = true, bool noOptio
 
             return outs;
         }
+
+        private class CapturedProcess
+        {
+            public Process Process { get; set; } = null;
+        }
     }
 }
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
index 99a3a47e2..526a9dbd2 100644
--- a/src/ViewModels/Repository.cs
+++ b/src/ViewModels/Repository.cs
@@ -1330,6 +1330,7 @@ public void RefreshWorkingCopyChanges()
             Task.Run(async () =>
             {
                 var changes = await new Commands.QueryLocalChanges(FullPath, _uiStates.IncludeUntrackedInLocalChanges, noOptionalLocks)
+                    .WithCancellation(token)
                     .GetResultAsync()
                     .ConfigureAwait(false);
 

From 82831eff3547291c33e48356b675f539a6a80f68 Mon Sep 17 00:00:00 2001
From: AquariusStar <48148723+AquariusStar@users.noreply.github.com>
Date: Thu, 6 Aug 2026 11:59:46 +0300
Subject: [PATCH 30/34] localization: update Russian translate (#2607)

---
 src/Resources/Locales/ru_RU.axaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index 9609da834..3a000d825 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -368,6 +368,7 @@
   <x:String x:Key="Text.DeleteTag.Tag" xml:space="preserve">Метка:</x:String>
   <x:String x:Key="Text.DeleteTag.WithRemote" xml:space="preserve">Удалить из внешнего репозитория</x:String>
   <x:String x:Key="Text.Diff.Binary" xml:space="preserve">СРАВНЕНИЕ БИНАРНИКОВ</x:String>
+  <x:String x:Key="Text.Diff.Binary.ViewContentOfNew" xml:space="preserve">ПРОСМОТР НОВОГО СОДЕРЖИМОГО</x:String>
   <x:String x:Key="Text.Diff.EmptyFile" xml:space="preserve">ФАЙЛ ПУСТ</x:String>
   <x:String x:Key="Text.Diff.First" xml:space="preserve">Первое сравнение</x:String>
   <x:String x:Key="Text.Diff.IgnoreWhitespace" xml:space="preserve">Игнорировать изменения пробелов</x:String>
@@ -424,6 +425,9 @@
   <x:String x:Key="Text.Fetch.NoTags" xml:space="preserve">Извлечь без меток</x:String>
   <x:String x:Key="Text.Fetch.Remote" xml:space="preserve">Внешний репозиторий:</x:String>
   <x:String x:Key="Text.Fetch.Title" xml:space="preserve">Извлечь внешние изменения</x:String>
+  <x:String x:Key="Text.File.Binary" xml:space="preserve">ДВОИЧНЫЙ ФАЙЛ</x:String>
+  <x:String x:Key="Text.File.HexViewer" xml:space="preserve">ПРОСМОТР В ШЕСТНАДЦАТЕРИЧНОМ ФОРМАТЕ</x:String>
+  <x:String x:Key="Text.File.HexViewer.GotoAddress" xml:space="preserve">Перейти по адресу...</x:String>
   <x:String x:Key="Text.FileCM.AssumeUnchanged" xml:space="preserve">Не отслеживать</x:String>
   <x:String x:Key="Text.FileCM.CustomAction" xml:space="preserve">Пользовательское действие</x:String>
   <x:String x:Key="Text.FileCM.Discard" xml:space="preserve">Отклонить...</x:String>

From 8d7cde85bf8cab9143b62c70ac00496c435f2e29 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Thu, 6 Aug 2026 09:00:05 +0000
Subject: [PATCH 31/34] doc: Update translation status and sort locale files

---
 TRANSLATION.md | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/TRANSLATION.md b/TRANSLATION.md
index fd3fa5a93..52098abb3 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -748,17 +748,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ru__RU](https://img.shields.io/badge/ru__RU-99.61%25-yellow)
-
-<details>
-<summary>Missing keys in ru_RU.axaml</summary>
-
-- Text.Diff.Binary.ViewContentOfNew
-- Text.File.Binary
-- Text.File.HexViewer
-- Text.File.HexViewer.GotoAddress
-
-</details>
+### ![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)
 
 ### ![ta__IN](https://img.shields.io/badge/ta__IN-64.29%25-red)
 

From d31983f6f8d326f133def709fe1b68ee655fa8e3 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 6 Aug 2026 17:22:26 +0800
Subject: [PATCH 32/34] code_style: remove unused translation

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Resources/Locales/en_US.axaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 757b2dbe5..80a17f794 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -48,7 +48,6 @@
   <x:String x:Key="Text.AssumeUnchanged.Empty" xml:space="preserve">NO FILES ASSUMED AS UNCHANGED</x:String>
   <x:String x:Key="Text.Avatar.Load" xml:space="preserve">Load Image...</x:String>
   <x:String x:Key="Text.Avatar.Refetch" xml:space="preserve">Refresh</x:String>
-  <x:String x:Key="Text.BinaryNotSupported" xml:space="preserve">BINARY FILE NOT SUPPORTED!!!</x:String>
   <x:String x:Key="Text.Bisect">Bisect</x:String>
   <x:String x:Key="Text.Bisect.Abort">Abort</x:String>
   <x:String x:Key="Text.Bisect.Bad">Bad</x:String>

From 674fd959359707e6c339ddc601d1cb29810b522c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Thu, 6 Aug 2026 09:22:46 +0000
Subject: [PATCH 33/34] doc: Update translation status and sort locale files

---
 TRANSLATION.md                    | 12 ++++++------
 src/Resources/Locales/de_DE.axaml |  1 -
 src/Resources/Locales/el_GR.axaml |  1 -
 src/Resources/Locales/es_ES.axaml |  1 -
 src/Resources/Locales/fr_FR.axaml |  1 -
 src/Resources/Locales/he_IL.axaml |  1 -
 src/Resources/Locales/id_ID.axaml |  1 -
 src/Resources/Locales/it_IT.axaml |  1 -
 src/Resources/Locales/ja_JP.axaml |  1 -
 src/Resources/Locales/ko_KR.axaml |  1 -
 src/Resources/Locales/pt_BR.axaml |  1 -
 src/Resources/Locales/ru_RU.axaml |  1 -
 src/Resources/Locales/ta_IN.axaml |  1 -
 src/Resources/Locales/uk_UA.axaml |  1 -
 src/Resources/Locales/zh_CN.axaml |  1 -
 src/Resources/Locales/zh_TW.axaml |  1 -
 16 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/TRANSLATION.md b/TRANSLATION.md
index 52098abb3..f9cf17f91 100644
--- a/TRANSLATION.md
+++ b/TRANSLATION.md
@@ -48,7 +48,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![fr__FR](https://img.shields.io/badge/fr__FR-95.22%25-yellow)
+### ![fr__FR](https://img.shields.io/badge/fr__FR-95.21%25-yellow)
 
 <details>
 <summary>Missing keys in fr_FR.axaml</summary>
@@ -105,7 +105,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![he__IL](https://img.shields.io/badge/he__IL-95.22%25-yellow)
+### ![he__IL](https://img.shields.io/badge/he__IL-95.21%25-yellow)
 
 <details>
 <summary>Missing keys in he_IL.axaml</summary>
@@ -175,7 +175,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![it__IT](https://img.shields.io/badge/it__IT-88.78%25-yellow)
+### ![it__IT](https://img.shields.io/badge/it__IT-88.77%25-yellow)
 
 <details>
 <summary>Missing keys in it_IT.axaml</summary>
@@ -357,7 +357,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![pt__BR](https://img.shields.io/badge/pt__BR-62.63%25-red)
+### ![pt__BR](https://img.shields.io/badge/pt__BR-62.60%25-red)
 
 <details>
 <summary>Missing keys in pt_BR.axaml</summary>
@@ -750,7 +750,7 @@ This document shows the translation status of each locale file in the repository
 
 ### ![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)
 
-### ![ta__IN](https://img.shields.io/badge/ta__IN-64.29%25-red)
+### ![ta__IN](https://img.shields.io/badge/ta__IN-64.26%25-red)
 
 <details>
 <summary>Missing keys in ta_IN.axaml</summary>
@@ -1124,7 +1124,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![uk__UA](https://img.shields.io/badge/uk__UA-65.07%25-red)
+### ![uk__UA](https://img.shields.io/badge/uk__UA-65.04%25-red)
 
 <details>
 <summary>Missing keys in uk_UA.axaml</summary>
diff --git a/src/Resources/Locales/de_DE.axaml b/src/Resources/Locales/de_DE.axaml
index 32b68abc9..eeb9a43f7 100644
--- a/src/Resources/Locales/de_DE.axaml
+++ b/src/Resources/Locales/de_DE.axaml
@@ -52,7 +52,6 @@
   <x:String x:Key="Text.AssumeUnchanged.Empty" xml:space="preserve">KEINE ALS UNVERÄNDERT ANGENOMMENEN DATEIEN</x:String>
   <x:String x:Key="Text.Avatar.Load" xml:space="preserve">Bild laden…</x:String>
   <x:String x:Key="Text.Avatar.Refetch" xml:space="preserve">Aktualisieren</x:String>
-  <x:String x:Key="Text.BinaryNotSupported" xml:space="preserve">BINÄRE DATEI WIRD NICHT UNTERSTÜTZT!!!</x:String>
   <x:String x:Key="Text.Bisect">Bisect</x:String>
   <x:String x:Key="Text.Bisect.Abort">Abbrechen</x:String>
   <x:String x:Key="Text.Bisect.Bad">Schlecht</x:String>
diff --git a/src/Resources/Locales/el_GR.axaml b/src/Resources/Locales/el_GR.axaml
index f10a0179a..2b40a9811 100644
--- a/src/Resources/Locales/el_GR.axaml
+++ b/src/Resources/Locales/el_GR.axaml
@@ -52,7 +52,6 @@
   <x:String x:Key="Text.AssumeUnchanged.Empty" xml:space="preserve">ΚΑΝΕΝΑ ΑΡΧΕΙΟ ΔΕΝ ΘΕΩΡΕΙΤΑΙ ΑΜΕΤΑΒΛΗΤΟ</x:String>
   <x:String x:Key="Text.Avatar.Load" xml:space="preserve">Φόρτωση εικόνας...</x:String>
   <x:String x:Key="Text.Avatar.Refetch" xml:space="preserve">Ανανέωση</x:String>
-  <x:String x:Key="Text.BinaryNotSupported" xml:space="preserve">ΤΟ ΔΥΑΔΙΚΟ ΑΡΧΕΙΟ ΔΕΝ ΥΠΟΣΤΗΡΙΖΕΤΑΙ!!!</x:String>
   <x:String x:Key="Text.Bisect">Bisect</x:String>
   <x:String x:Key="Text.Bisect.Abort">Ματαίωση</x:String>
   <x:String x:Key="Text.Bisect.Bad">Κακό</x:String>
diff --git a/src/Resources/Locales/es_ES.axaml b/src/Resources/Locales/es_ES.axaml
index d13f1d16b..9579d594f 100644
--- a/src/Resources/Locales/es_ES.axaml
+++ b/src/Resources/Locales/es_ES.axaml
@@ -52,7 +52,6 @@
   <x:String x:Key="Text.AssumeUnchanged.Empty" xml:space="preserve">NO HAY ARCHIVOS ASUMIDOS COMO SIN CAMBIOS</x:String>
   <x:String x:Key="Text.Avatar.Load" xml:space="preserve">Cargar Imagen...</x:String>
   <x:String x:Key="Text.Avatar.Refetch" xml:space="preserve">Refrescar</x:String>
-  <x:String x:Key="Text.BinaryNotSupported" xml:space="preserve">¡ARCHIVO BINARIO NO SOPORTADO!</x:String>
   <x:String x:Key="Text.Bisect">Bisect</x:String>
   <x:String x:Key="Text.Bisect.Abort">Abortar</x:String>
   <x:String x:Key="Text.Bisect.Bad">Malo</x:String>
diff --git a/src/Resources/Locales/fr_FR.axaml b/src/Resources/Locales/fr_FR.axaml
index 97946656f..1fcf148d9 100644
--- a/src/Resources/Locales/fr_FR.axaml
+++ b/src/Resources/Locales/fr_FR.axaml
@@ -49,7 +49,6 @@
   <x:String x:Key="Text.AssumeUnchanged.Empty" xml:space="preserve">PAS DE FICHIERS PRÉSUMÉS INCHANGÉS</x:String>
   <x:String x:Key="Text.Avatar.Load" xml:space="preserve">Charger l'Image...</x:String>
   <x:String x:Key="Text.Avatar.Refetch" xml:space="preserve">Rafraîchir</x:String>
-  <x:String x:Key="Text.BinaryNotSupported" xml:space="preserve">FICHIER BINAIRE NON SUPPORTÉ !!!</x:String>
   <x:String x:Key="Text.Bisect">Bisect</x:String>
   <x:String x:Key="Text.Bisect.Abort">Annuler</x:String>
   <x:String x:Key="Text.Bisect.Bad">Mauvais</x:String>
diff --git a/src/Resources/Locales/he_IL.axaml b/src/Resources/Locales/he_IL.axaml
index 038554b02..988942439 100644
--- a/src/Resources/Locales/he_IL.axaml
+++ b/src/Resources/Locales/he_IL.axaml
@@ -49,7 +49,6 @@
   <x:String x:Key="Text.AssumeUnchanged.Empty" xml:space="preserve">אין קבצים בהנחת assume-unchanged</x:String>
   <x:String x:Key="Text.Avatar.Load" xml:space="preserve">טען תמונה...</x:String>
   <x:String x:Key="Text.Avatar.Refetch" xml:space="preserve">רענן</x:String>
-  <x:String x:Key="Text.BinaryNotSupported" xml:space="preserve">קובץ בינארי אינו נתמך!!!</x:String>
   <x:String x:Key="Text.Bisect">Bisect</x:String>
   <x:String x:Key="Text.Bisect.Abort">ביטול</x:String>
   <x:String x:Key="Text.Bisect.Bad">פגום (Bad)</x:String>
diff --git a/src/Resources/Locales/id_ID.axaml b/src/Resources/Locales/id_ID.axaml
index 6f7bff766..31c1bc55c 100644
--- a/src/Resources/Locales/id_ID.axaml
+++ b/src/Resources/Locales/id_ID.axaml
@@ -52,7 +52,6 @@
   <x:String x:Key="Text.AssumeUnchanged.Empty" xml:space="preserve">TIDAK ADA BERKAS YANG DIASUMSIKAN TIDAK BERUBAH</x:String>
   <x:String x:Key="Text.Avatar.Load" xml:space="preserve">Muat Gambar...</x:String>
   <x:String x:Key="Text.Avatar.Refetch" xml:space="preserve">Segarkan</x:String>
-  <x:String x:Key="Text.BinaryNotSupported" xml:space="preserve">BERKAS BINARY TIDAK DIDUKUNG!!!</x:String>
   <x:String x:Key="Text.Bisect">Bisect</x:String>
   <x:String x:Key="Text.Bisect.Abort">Batalkan</x:String>
   <x:String x:Key="Text.Bisect.Bad">Buruk</x:String>
diff --git a/src/Resources/Locales/it_IT.axaml b/src/Resources/Locales/it_IT.axaml
index 2ceaa6da6..59fba4f54 100644
--- a/src/Resources/Locales/it_IT.axaml
+++ b/src/Resources/Locales/it_IT.axaml
@@ -46,7 +46,6 @@
   <x:String x:Key="Text.AssumeUnchanged.Empty" xml:space="preserve">NESSUN FILE ASSUNTO COME INVARIATO</x:String>
   <x:String x:Key="Text.Avatar.Load" xml:space="preserve">Carico l'Immagine...</x:String>
   <x:String x:Key="Text.Avatar.Refetch" xml:space="preserve">Aggiorna</x:String>
-  <x:String x:Key="Text.BinaryNotSupported" xml:space="preserve">FILE BINARIO NON SUPPORTATO!!!</x:String>
   <x:String x:Key="Text.Bisect" xml:space="preserve">Biseca</x:String>
   <x:String x:Key="Text.Bisect.Abort" xml:space="preserve">Annulla</x:String>
   <x:String x:Key="Text.Bisect.Bad" xml:space="preserve">Cattiva</x:String>
diff --git a/src/Resources/Locales/ja_JP.axaml b/src/Resources/Locales/ja_JP.axaml
index fca6427cd..ef1389569 100644
--- a/src/Resources/Locales/ja_JP.axaml
+++ b/src/Resources/Locales/ja_JP.axaml
@@ -52,7 +52,6 @@
   <x:String x:Key="Text.AssumeUnchanged.Empty" xml:space="preserve">未変更と見なしたファイルはありません</x:String>
   <x:String x:Key="Text.Avatar.Load" xml:space="preserve">画像を選択...</x:String>
   <x:String x:Key="Text.Avatar.Refetch" xml:space="preserve">再読み込み</x:String>
-  <x:String x:Key="Text.BinaryNotSupported" xml:space="preserve">バイナリファイルはサポートされていません！！！</x:String>
   <x:String x:Key="Text.Bisect">問題の発生源を特定</x:String>
   <x:String x:Key="Text.Bisect.Abort">中止</x:String>
   <x:String x:Key="Text.Bisect.Bad">問題あり</x:String>
diff --git a/src/Resources/Locales/ko_KR.axaml b/src/Resources/Locales/ko_KR.axaml
index 3224c0f1d..cecfefb98 100644
--- a/src/Resources/Locales/ko_KR.axaml
+++ b/src/Resources/Locales/ko_KR.axaml
@@ -52,7 +52,6 @@
   <x:String x:Key="Text.AssumeUnchanged.Empty" xml:space="preserve">변경되지 않음으로 간주된 파일 없음</x:String>
   <x:String x:Key="Text.Avatar.Load" xml:space="preserve">이미지 불러오기...</x:String>
   <x:String x:Key="Text.Avatar.Refetch" xml:space="preserve">새로 고침</x:String>
-  <x:String x:Key="Text.BinaryNotSupported" xml:space="preserve">바이너리 파일은 지원되지 않습니다!!!</x:String>
   <x:String x:Key="Text.Bisect">이진 탐색</x:String>
   <x:String x:Key="Text.Bisect.Abort">중단</x:String>
   <x:String x:Key="Text.Bisect.Bad">나쁨</x:String>
diff --git a/src/Resources/Locales/pt_BR.axaml b/src/Resources/Locales/pt_BR.axaml
index 0a3540d09..c4904c975 100644
--- a/src/Resources/Locales/pt_BR.axaml
+++ b/src/Resources/Locales/pt_BR.axaml
@@ -46,7 +46,6 @@
   <x:String x:Key="Text.AssumeUnchanged.Empty" xml:space="preserve">NENHUM ARQUIVO CONSIDERADO SEM ALTERAÇÕES</x:String>
   <x:String x:Key="Text.Avatar.Load" xml:space="preserve">Carregar imagem...</x:String>
   <x:String x:Key="Text.Avatar.Refetch" xml:space="preserve">Atualizar</x:String>
-  <x:String x:Key="Text.BinaryNotSupported" xml:space="preserve">ARQUIVO BINÁRIO NÃO SUPORTADO!!!</x:String>
   <x:String x:Key="Text.Bisect" xml:space="preserve">Bisect</x:String>
   <x:String x:Key="Text.Bisect.Abort" xml:space="preserve">Abortar</x:String>
   <x:String x:Key="Text.Bisect.Bad" xml:space="preserve">Inválido</x:String>
diff --git a/src/Resources/Locales/ru_RU.axaml b/src/Resources/Locales/ru_RU.axaml
index 3a000d825..4166f03c7 100644
--- a/src/Resources/Locales/ru_RU.axaml
+++ b/src/Resources/Locales/ru_RU.axaml
@@ -52,7 +52,6 @@
   <x:String x:Key="Text.AssumeUnchanged.Empty" xml:space="preserve">СПИСОК ПУСТ</x:String>
   <x:String x:Key="Text.Avatar.Load" xml:space="preserve">Загрузить картинку...</x:String>
   <x:String x:Key="Text.Avatar.Refetch" xml:space="preserve">Обновить</x:String>
-  <x:String x:Key="Text.BinaryNotSupported" xml:space="preserve">ДВОИЧНЫЙ ФАЙЛ НЕ ПОДДЕРЖИВАЕТСЯ!!!</x:String>
   <x:String x:Key="Text.Bisect">Раздвоить</x:String>
   <x:String x:Key="Text.Bisect.Abort">О</x:String>
   <x:String x:Key="Text.Bisect.Bad">Плохая</x:String>
diff --git a/src/Resources/Locales/ta_IN.axaml b/src/Resources/Locales/ta_IN.axaml
index 09edf56bc..9606d3f54 100644
--- a/src/Resources/Locales/ta_IN.axaml
+++ b/src/Resources/Locales/ta_IN.axaml
@@ -37,7 +37,6 @@
   <x:String x:Key="Text.AssumeUnchanged" xml:space="preserve">கோப்புகள் மாற்றப்படவில்லை எனக் கருதப்படுகிறது</x:String>
   <x:String x:Key="Text.AssumeUnchanged.Empty" xml:space="preserve">எந்த கோப்புகளும் மாற்றப்படவில்லை எனக் கருதப்படுகிறது</x:String>
   <x:String x:Key="Text.Avatar.Refetch" xml:space="preserve">புதுப்பி</x:String>
-  <x:String x:Key="Text.BinaryNotSupported" xml:space="preserve">இருமம் கோப்பு ஆதரிக்கப்படவில்லை!!!</x:String>
   <x:String x:Key="Text.Blame" xml:space="preserve">குற்றச்சாட்டு</x:String>
   <x:String x:Key="Text.Blame.TypeNotSupported" xml:space="preserve">இந்த கோப்பில் குற்றம் சாட்ட ஆதரிக்கப்படவில்லை!!!</x:String>
   <x:String x:Key="Text.BranchCM.Checkout" xml:space="preserve">${0}$ சரிபார்...</x:String>
diff --git a/src/Resources/Locales/uk_UA.axaml b/src/Resources/Locales/uk_UA.axaml
index eecb8c343..47288eb9c 100644
--- a/src/Resources/Locales/uk_UA.axaml
+++ b/src/Resources/Locales/uk_UA.axaml
@@ -37,7 +37,6 @@
   <x:String x:Key="Text.AssumeUnchanged" xml:space="preserve">ФАЙЛИ, ЩО ВВАЖАЮТЬСЯ НЕЗМІНЕНИМИ</x:String>
   <x:String x:Key="Text.AssumeUnchanged.Empty" xml:space="preserve">НЕМАЄ ФАЙЛІВ, ЩО ВВАЖАЮТЬСЯ НЕЗМІНЕНИМИ</x:String>
   <x:String x:Key="Text.Avatar.Refetch" xml:space="preserve">Оновити</x:String>
-  <x:String x:Key="Text.BinaryNotSupported" xml:space="preserve">БІНАРНИЙ ФАЙЛ НЕ ПІДТРИМУЄТЬСЯ!!!</x:String>
   <x:String x:Key="Text.Blame" xml:space="preserve">Автор рядка</x:String>
   <x:String x:Key="Text.Blame.TypeNotSupported" xml:space="preserve">ПОШУК АВТОРА РЯДКА ДЛЯ ЦЬОГО ФАЙЛУ НЕ ПІДТРИМУЄТЬСЯ!!!</x:String>
   <x:String x:Key="Text.BranchCM.Checkout" xml:space="preserve">Перейти на ${0}$...</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index ac7b73aba..1da3f3c5d 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -52,7 +52,6 @@
   <x:String x:Key="Text.AssumeUnchanged.Empty" xml:space="preserve">没有不跟踪更改的文件</x:String>
   <x:String x:Key="Text.Avatar.Load" xml:space="preserve">加载本地图片</x:String>
   <x:String x:Key="Text.Avatar.Refetch" xml:space="preserve">重新加载</x:String>
-  <x:String x:Key="Text.BinaryNotSupported" xml:space="preserve">二进制文件不支持该操作!!!</x:String>
   <x:String x:Key="Text.Bisect">二分定位(bisect)</x:String>
   <x:String x:Key="Text.Bisect.Abort">终止</x:String>
   <x:String x:Key="Text.Bisect.Bad">标记错误</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 54d749bdb..a9d3bf364 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -52,7 +52,6 @@
   <x:String x:Key="Text.AssumeUnchanged.Empty" xml:space="preserve">沒有不追蹤變更的檔案</x:String>
   <x:String x:Key="Text.Avatar.Load" xml:space="preserve">載入本機圖片...</x:String>
   <x:String x:Key="Text.Avatar.Refetch" xml:space="preserve">重新載入</x:String>
-  <x:String x:Key="Text.BinaryNotSupported" xml:space="preserve">二進位檔案不支援該操作!</x:String>
   <x:String x:Key="Text.Bisect">二分搜尋 (bisect)</x:String>
   <x:String x:Key="Text.Bisect.Abort">中止</x:String>
   <x:String x:Key="Text.Bisect.Bad">標記為錯誤</x:String>

From bb7eef200f435dd1ee86d8ed2ad8e8d35bfb9b86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Enner=20P=C3=A9rez?= <ennerperez@gmail.com>
Date: Sun, 26 Jul 2026 22:08:15 -0500
Subject: [PATCH 34/34] feat(themes): New Theme Selector

---
 src/App.axaml.cs               | 16 ++++++---
 src/Models/ThemeOverrides.cs   | 14 ++++++++
 src/ViewModels/Preferences.cs  | 55 +++++++++++++++++++++++--------
 src/Views/Preferences.axaml    | 59 ++++++++++++++-------------------
 src/Views/Preferences.axaml.cs | 60 ++++++++++------------------------
 5 files changed, 108 insertions(+), 96 deletions(-)

diff --git a/src/App.axaml.cs b/src/App.axaml.cs
index a22f764d6..c8d94d78c 100644
--- a/src/App.axaml.cs
+++ b/src/App.axaml.cs
@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Linq;
 using System.Net.Http;
 using System.Text.Json;
 using System.Threading.Tasks;
@@ -14,6 +15,7 @@
 using Avalonia.Platform;
 using Avalonia.Styling;
 using Avalonia.Threading;
+using SourceGit.Models;
 
 namespace SourceGit
 {
@@ -117,17 +119,21 @@ app.Resources[finalLocaleKey] is not ResourceDictionary targetLocale ||
             app._activeLocale = targetLocale;
         }
 
-        public static void SetTheme(string theme, string themeOverridesFile)
+        public static void SetTheme(ThemeOverrides theme)
         {
             if (Current is not App app)
                 return;
 
-            if (theme.Equals("Light", StringComparison.OrdinalIgnoreCase))
+            string themeOverridesFile = string.Empty;
+
+            if (theme.Name.Equals("Light", StringComparison.OrdinalIgnoreCase))
                 app.RequestedThemeVariant = ThemeVariant.Light;
-            else if (theme.Equals("Dark", StringComparison.OrdinalIgnoreCase))
+            else if (theme.Name.Equals("Dark", StringComparison.OrdinalIgnoreCase))
                 app.RequestedThemeVariant = ThemeVariant.Dark;
-            else
+            else if (theme.Name.Equals("Default", StringComparison.OrdinalIgnoreCase))
                 app.RequestedThemeVariant = ThemeVariant.Default;
+            else
+                themeOverridesFile = theme.FilePath;
 
             if (app._themeOverrides != null)
             {
@@ -243,7 +249,7 @@ public override void Initialize()
 
             var pref = ViewModels.Preferences.Instance;
             SetLocale(pref.Locale);
-            SetTheme(pref.Theme, pref.ThemeOverrides);
+            SetTheme(pref.Themes.FirstOrDefault(m=> m.Name == pref.Theme) ?? new ThemeOverrides("Default"));
             SetFonts(pref.DefaultFontFamily, pref.MonospaceFontFamily);
         }
 
diff --git a/src/Models/ThemeOverrides.cs b/src/Models/ThemeOverrides.cs
index c80576dc8..80f3d40c0 100644
--- a/src/Models/ThemeOverrides.cs
+++ b/src/Models/ThemeOverrides.cs
@@ -5,9 +5,23 @@ namespace SourceGit.Models
 {
     public class ThemeOverrides
     {
+        public ThemeOverrides()
+        {
+            
+        }
+
+        public ThemeOverrides(string name)
+        {
+            Name = name;
+        }
+        public string Version { get; set; }
+        public string Name { get; set; }
+        public string Author { get; set; }
+        public string Url { get; set; }
         public Dictionary<string, Color> BasicColors { get; set; } = new Dictionary<string, Color>();
         public double GraphPenThickness { get; set; } = 2;
         public double OpacityForNotMergedCommits { get; set; } = 0.5;
         public List<Color> GraphColors { get; set; } = new List<Color>();
+        public string FilePath { get; set; }
     }
 }
diff --git a/src/ViewModels/Preferences.cs b/src/ViewModels/Preferences.cs
index 25bbb431f..6c7fa7d2e 100644
--- a/src/ViewModels/Preferences.cs
+++ b/src/ViewModels/Preferences.cs
@@ -1,11 +1,14 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.IO;
+using System.Linq;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using System.Threading.Tasks;
 using Avalonia.Collections;
 using CommunityToolkit.Mvvm.ComponentModel;
+using SourceGit.Models;
 
 namespace SourceGit.ViewModels
 {
@@ -41,26 +44,33 @@ public string Locale
             }
         }
 
-        public string Theme
+        [JsonIgnore]
+        public List<ThemeOverrides> Themes
         {
-            get => _theme;
+            get => _themes;
             set
             {
-                if (SetProperty(ref _theme, value) && !_isLoading)
-                    App.SetTheme(_theme, _themeOverrides);
+                SetProperty(ref _themes, value);
             }
         }
 
-        public string ThemeOverrides
+        [JsonIgnore]
+        public ThemeOverrides SelectedTheme
         {
-            get => _themeOverrides;
+            get
+            {
+                return Themes.FirstOrDefault(m => m.Name == Theme) ?? new ThemeOverrides("Default");
+            }
             set
             {
-                if (SetProperty(ref _themeOverrides, value) && !_isLoading)
-                    App.SetTheme(_theme, value);
+                if (SetProperty(ref _selectedTheme, value) && !_isLoading)
+                    App.SetTheme(_selectedTheme);
+                Theme = _selectedTheme.Name;
             }
         }
-
+        
+        public string Theme { get; set; }
+        
         public string DefaultFontFamily
         {
             get => _defaultFontFamily;
@@ -566,10 +576,7 @@ public RepositoryNode FindOrAddNodeByRepositoryPath(string repo, RepositoryNode
             {
                 node = new RepositoryNode()
                 {
-                    Id = normalized,
-                    Name = Path.GetFileName(normalized),
-                    Bookmark = 0,
-                    IsRepository = true,
+                    Id = normalized, Name = Path.GetFileName(normalized), Bookmark = 0, IsRepository = true,
                 };
 
                 AddNode(node, parent, save);
@@ -649,6 +656,25 @@ public void Save()
 
         private static Preferences Load()
         {
+            try
+            {
+                var themesPath = Path.Combine(Native.OS.DataDir, "themes");
+                var themeFiles = Directory.GetFiles(themesPath, "theme.json", SearchOption.AllDirectories);
+                foreach (var file in themeFiles)
+                {
+                    using var stream = File.OpenRead(file);
+                    var theme = JsonSerializer.Deserialize(stream, JsonCodeGen.Default.ThemeOverrides);
+                    if (theme == null)
+                        continue;
+                    theme.FilePath = file;
+                    _themes.Add(theme);
+                }
+            }
+            catch
+            {
+                // ignored
+            }
+
             var path = Path.Combine(Native.OS.DataDir, "preference.json");
             if (!File.Exists(path))
                 return new Preferences();
@@ -791,7 +817,8 @@ private bool RemoveInvalidRepositoriesRecursive(List<RepositoryNode> collection)
         private bool _isLoading = true;
         private bool _isReadonly = true;
         private string _locale = "en_US";
-        private string _theme = "Default";
+        private ThemeOverrides _selectedTheme = new("Default");
+        private static List<ThemeOverrides> _themes = new() { new ThemeOverrides("Default"), new ThemeOverrides("Dark"), new ThemeOverrides("Light") };
         private string _themeOverrides = string.Empty;
         private string _defaultFontFamily = string.Empty;
         private string _monospaceFontFamily = string.Empty;
diff --git a/src/Views/Preferences.axaml b/src/Views/Preferences.axaml
index b0a4753bb..cbd9b9bdc 100644
--- a/src/Views/Preferences.axaml
+++ b/src/Views/Preferences.axaml
@@ -193,19 +193,31 @@
                        Text="{DynamicResource Text.Preferences.Appearance.Theme}"
                        HorizontalAlignment="Right"
                        Margin="0,0,16,0"/>
-            <ComboBox Grid.Row="0" Grid.Column="1"
-                      MinHeight="28"
-                      Padding="8,0"
-                      HorizontalAlignment="Stretch"
-                      DisplayMemberBinding="{Binding Key, x:DataType=ThemeVariant}"
-                      SelectedItem="{Binding Theme, Mode=TwoWay, Converter={x:Static c:StringConverters.ToTheme}}">
-              <ComboBox.Items>
-                <ThemeVariant>Default</ThemeVariant>
-                <ThemeVariant>Dark</ThemeVariant>
-                <ThemeVariant>Light</ThemeVariant>
-              </ComboBox.Items>
-            </ComboBox>
-
+            <Grid Grid.Row="0" Grid.Column="1">
+              <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="28" /> 
+                <ColumnDefinition Width="28" />
+              </Grid.ColumnDefinitions>
+              <ComboBox Grid.Column="0" Grid.Row="0" MinHeight="28"
+                        HorizontalContentAlignment="Stretch" HorizontalAlignment="Stretch"
+                        Padding="8,0"
+                        ItemsSource="{Binding Themes, Mode=OneWay}"
+                        SelectedItem="{Binding SelectedTheme, Mode=TwoWay}">
+                <ComboBox.ItemTemplate>
+                  <DataTemplate x:DataType="{x:Type m:ThemeOverrides}">
+                    <TextBlock Text="{Binding Name, Mode=OneWay}"/>
+                  </DataTemplate>
+                </ComboBox.ItemTemplate>
+              </ComboBox>
+              <Button Grid.Column="1" Grid.Row="0" Classes="icon_button" Width="28" Height="28" Click="OpenThemeRepository">
+                <Path Width="14" Height="14" Data="{StaticResource Icons.Remotes}" Fill="{DynamicResource Brush.FG1}"/>
+              </Button>
+              <Button Grid.Column="2" Grid.Row="0" Classes="icon_button" Width="28" Height="28" Click="OpenThemeFolder">
+                <Path Width="14" Height="14" Data="{StaticResource Icons.Folder.Open}" Fill="{DynamicResource Brush.FG1}"/>
+              </Button>
+            </Grid>
+            
             <TextBlock Grid.Row="1" Grid.Column="0"
                        Text="{DynamicResource Text.Preferences.Appearance.DefaultFont}"
                        HorizontalAlignment="Right"
@@ -270,27 +282,6 @@
                              Value="{Binding EditorTabWidth, Mode=TwoWay}"/>
             </Grid>
 
-            <TextBlock Grid.Row="5" Grid.Column="0"
-                       Text="{DynamicResource Text.Preferences.Appearance.ThemeOverrides}"
-                       HorizontalAlignment="Right"
-                       Margin="0,0,16,0"/>
-            <TextBox Grid.Row="5" Grid.Column="1"
-                     Height="28"
-                     CornerRadius="3"
-                     Text="{Binding ThemeOverrides, Mode=TwoWay}">
-              <TextBox.InnerRightContent>
-                <StackPanel Orientation="Horizontal">
-                  <Button Classes="icon_button" Width="28" Height="28" Click="SelectThemeOverrideFile">
-                    <Path Width="16" Height="16" Data="{StaticResource Icons.Folder.Open}" Margin="0,2,0,0" Fill="{DynamicResource Brush.FG1}"/>
-                  </Button>
-
-                  <Button Classes="icon_button" Width="28" Height="28" Click="OpenThemeRepository">
-                    <Path Width="14" Height="14" Data="{StaticResource Icons.Remotes}" Fill="{DynamicResource Brush.FG1}"/>
-                  </Button>
-                </StackPanel>
-              </TextBox.InnerRightContent>
-            </TextBox>
-
             <CheckBox Grid.Row="6" Grid.Column="1"
                       Height="32"
                       Content="{DynamicResource Text.Preferences.Appearance.UseFixedTabWidth}"
diff --git a/src/Views/Preferences.axaml.cs b/src/Views/Preferences.axaml.cs
index 99ec73a5f..d35f2ee26 100644
--- a/src/Views/Preferences.axaml.cs
+++ b/src/Views/Preferences.axaml.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Threading.Tasks;
-
 using Avalonia;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
@@ -226,42 +226,32 @@ protected override async void OnClosing(WindowClosingEventArgs e)
             preferences.Save();
         }
 
-        private async void SelectThemeOverrideFile(object _, RoutedEventArgs e)
+        private void OpenThemeRepository(object _, RoutedEventArgs e)
         {
-            var options = new FilePickerOpenOptions()
-            {
-                FileTypeFilter = [new FilePickerFileType("Theme Overrides File") { Patterns = ["*.json"] }],
-                AllowMultiple = false,
-            };
+            Native.OS.OpenBrowser($"https://github.com/sourcegit-scm/sourcegit-theme");
+            e.Handled = true;
+        }
 
+        private async void OpenThemeFolder(object _, RoutedEventArgs e)
+        {
+            var themesPath = Path.Combine(Native.OS.DataDir, "themes");
             try
             {
-                var selected = await StorageProvider.OpenFilePickerAsync(options);
-                if (selected is { Count: 1 })
-                    ViewModels.Preferences.Instance.ThemeOverrides = selected[0].Path.LocalPath;
+                if (!Directory.Exists(themesPath)) Directory.CreateDirectory(themesPath);
+                Native.OS.OpenInFileManager(themesPath);
             }
-            catch (Exception ex)
+            catch
             {
-                await new Alert().ShowAsync(this, $"Failed to select theme override file: {ex.Message}", true);
+                // Ignore
             }
 
             e.Handled = true;
         }
 
-        private void OpenThemeRepository(object _, RoutedEventArgs e)
-        {
-            Native.OS.OpenBrowser($"https://github.com/sourcegit-scm/sourcegit-theme");
-            e.Handled = true;
-        }
-
         private async void SelectGitExecutable(object _, RoutedEventArgs e)
         {
             var pattern = OperatingSystem.IsWindows() ? "git.exe" : "git";
-            var options = new FilePickerOpenOptions()
-            {
-                FileTypeFilter = [new FilePickerFileType("Git Executable") { Patterns = [pattern] }],
-                AllowMultiple = false,
-            };
+            var options = new FilePickerOpenOptions() { FileTypeFilter = [new FilePickerFileType("Git Executable") { Patterns = [pattern] }], AllowMultiple = false, };
 
             try
             {
@@ -309,11 +299,7 @@ private async void SelectGPGExecutable(object _, RoutedEventArgs e)
             else
                 patterns.Add(GPGFormat.Program);
 
-            var options = new FilePickerOpenOptions()
-            {
-                FileTypeFilter = [new FilePickerFileType("GPG Program") { Patterns = patterns }],
-                AllowMultiple = false,
-            };
+            var options = new FilePickerOpenOptions() { FileTypeFilter = [new FilePickerFileType("GPG Program") { Patterns = patterns }], AllowMultiple = false, };
 
             try
             {
@@ -339,11 +325,7 @@ private async void SelectShellOrTerminal(object _, RoutedEventArgs e)
             var options = new FilePickerOpenOptions() { AllowMultiple = false };
             if (shell.Type != "custom")
             {
-                options = new FilePickerOpenOptions()
-                {
-                    FileTypeFilter = [new FilePickerFileType(shell.Name) { Patterns = [shell.Exec] }],
-                    AllowMultiple = false,
-                };
+                options = new FilePickerOpenOptions() { FileTypeFilter = [new FilePickerFileType(shell.Name) { Patterns = [shell.Exec] }], AllowMultiple = false, };
             }
 
             try
@@ -371,11 +353,7 @@ private async void SelectExternalMergeTool(object _, RoutedEventArgs e)
             }
 
             var tool = Models.ExternalMerger.Supported[type];
-            var options = new FilePickerOpenOptions()
-            {
-                FileTypeFilter = [new FilePickerFileType(tool.Name) { Patterns = tool.GetPatternsToFindExecFile() }],
-                AllowMultiple = false,
-            };
+            var options = new FilePickerOpenOptions() { FileTypeFilter = [new FilePickerFileType(tool.Name) { Patterns = tool.GetPatternsToFindExecFile() }], AllowMultiple = false, };
 
             try
             {
@@ -449,11 +427,7 @@ private void OnAddCustomAction(object sender, RoutedEventArgs e)
 
         private async void SelectExecutableForCustomAction(object sender, RoutedEventArgs e)
         {
-            var options = new FilePickerOpenOptions()
-            {
-                AllowMultiple = false,
-                FileTypeFilter = [new("Executable file(script)") { Patterns = ["*"] }]
-            };
+            var options = new FilePickerOpenOptions() { AllowMultiple = false, FileTypeFilter = [new("Executable file(script)") { Patterns = ["*"] }] };
 
             try
             {