feature: warn when commit subject line goes beyond a certain number of characters (#201)

src/Commands/LFS.cs

@@ -77,7 +77,7 @@ namespace SourceGit.Commands
             var rs = cmd.ReadToEnd();
             if (rs.IsSuccess)
             {
-                var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
+                var lines = rs.StdOut.Split(new char[] {'\n', '\r'}, StringSplitOptions.RemoveEmptyEntries);
                 foreach (var line in lines)
                 {
                     var match = REG_LOCK().Match(line);

src/Converters/IntConverters.cs

@@ -18,5 +18,8 @@ namespace SourceGit.Converters
 
         public static readonly FuncValueConverter<int, bool> IsNotOne =
             new FuncValueConverter<int, bool>(v => v != 1);
+
+        public static readonly FuncValueConverter<int, bool> IsBadSubjectLength =
+            new FuncValueConverter<int, bool>(v => v > ViewModels.Preference.Instance.SubjectGuideLength);
     }
 }

src/Models/InteractiveRebaseEditor.cs

@@ -79,7 +79,7 @@ namespace SourceGit.Models
                     if (!File.Exists(doneFile))
                         return -1;
 
-                    var done = File.ReadAllText(doneFile).Split(['\n', '\r'], StringSplitOptions.RemoveEmptyEntries);
+                    var done = File.ReadAllText(doneFile).Split(new char[] {'\n', '\r'}, StringSplitOptions.RemoveEmptyEntries);
                     if (done.Length > jobs.Count)
                         return -1;
 

src/Resources/Locales/en_US.axaml

@@ -105,6 +105,8 @@
   <x:String x:Key="Text.CommitDetail.Info.Parents" xml:space="preserve">PARENTS</x:String>
   <x:String x:Key="Text.CommitDetail.Info.Refs" xml:space="preserve">REFS</x:String>
   <x:String x:Key="Text.CommitDetail.Info.SHA" xml:space="preserve">SHA</x:String>
+  <x:String x:Key="Text.CommitMessageTextBox.Placeholder" xml:space="preserve">Enter commit subject &amp; message</x:String>
+  <x:String x:Key="Text.CommitMessageTextBox.Tip" xml:space="preserve">Git uses an empty line to separate the subject and extra message body.</x:String>
   <x:String x:Key="Text.Configure" xml:space="preserve">Repository Configure</x:String>
   <x:String x:Key="Text.Configure.Email" xml:space="preserve">Email Address</x:String>
   <x:String x:Key="Text.Configure.Email.Placeholder" xml:space="preserve">Email address</x:String>
@@ -328,6 +330,7 @@
   <x:String x:Key="Text.Preference.General.Locale" xml:space="preserve">Language</x:String>
   <x:String x:Key="Text.Preference.General.MaxHistoryCommits" xml:space="preserve">History Commits</x:String>
   <x:String x:Key="Text.Preference.General.RestoreTabs" xml:space="preserve">Restore windows</x:String>
+  <x:String x:Key="Text.Preference.General.SubjectGuideLength" xml:space="preserve">Subject Guide Length</x:String>
   <x:String x:Key="Text.Preference.General.UseFixedTabWidth" xml:space="preserve">Use fixed tab width in titlebar</x:String>
   <x:String x:Key="Text.Preference.Git" xml:space="preserve">GIT</x:String>
   <x:String x:Key="Text.Preference.Git.AutoFetch" xml:space="preserve">Fetch remotes automatically</x:String>
@@ -520,7 +523,6 @@
   <x:String x:Key="Text.WorkingCopy.CanStageTip" xml:space="preserve">You can stage this file now.</x:String>
   <x:String x:Key="Text.WorkingCopy.Commit" xml:space="preserve">COMMIT</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitAndPush" xml:space="preserve">COMMIT &amp; PUSH</x:String>
-  <x:String x:Key="Text.WorkingCopy.CommitMessageTip" xml:space="preserve">Enter commit message</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitTip" xml:space="preserve">CTRL + Enter</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts" xml:space="preserve">CONFLICTS DETECTED</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts.Resolved" xml:space="preserve">FILE CONFLICTS ARE RESOLVED</x:String>

src/Resources/Locales/zh_CN.axaml

@@ -108,6 +108,8 @@
   <x:String x:Key="Text.CommitDetail.Info.Parents" xml:space="preserve">父提交</x:String>
   <x:String x:Key="Text.CommitDetail.Info.Refs" xml:space="preserve">相关引用</x:String>
   <x:String x:Key="Text.CommitDetail.Info.SHA" xml:space="preserve">提交指纹</x:String>
+  <x:String x:Key="Text.CommitMessageTextBox.Placeholder" xml:space="preserve">填写提交信息</x:String>
+  <x:String x:Key="Text.CommitMessageTextBox.Tip" xml:space="preserve">Git使用空白行来划分提交信息中的主题与内容</x:String>
   <x:String x:Key="Text.Configure" xml:space="preserve">仓库配置</x:String>
   <x:String x:Key="Text.Configure.Email" xml:space="preserve">电子邮箱</x:String>
   <x:String x:Key="Text.Configure.Email.Placeholder" xml:space="preserve">邮箱地址</x:String>
@@ -331,6 +333,7 @@
   <x:String x:Key="Text.Preference.General.Locale" xml:space="preserve">显示语言</x:String>
   <x:String x:Key="Text.Preference.General.MaxHistoryCommits" xml:space="preserve">最大历史提交数</x:String>
   <x:String x:Key="Text.Preference.General.RestoreTabs" xml:space="preserve">启动时恢复上次打开的仓库</x:String>
+  <x:String x:Key="Text.Preference.General.SubjectGuideLength" xml:space="preserve">SUBJECT字数检测</x:String>
   <x:String x:Key="Text.Preference.General.UseFixedTabWidth" xml:space="preserve">使用固定宽度的标题栏标签</x:String>
   <x:String x:Key="Text.Preference.Git" xml:space="preserve">GIT配置</x:String>
   <x:String x:Key="Text.Preference.Git.AutoFetch" xml:space="preserve">启用定时自动拉取远程更新</x:String>
@@ -522,7 +525,6 @@
   <x:String x:Key="Text.WorkingCopy.CanStageTip" xml:space="preserve">现在您已可将其加入暂存区中</x:String>
   <x:String x:Key="Text.WorkingCopy.Commit" xml:space="preserve">提交</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitAndPush" xml:space="preserve">提交并推送</x:String>
-  <x:String x:Key="Text.WorkingCopy.CommitMessageTip" xml:space="preserve">填写提交信息</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitTip" xml:space="preserve">CTRL + Enter</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts" xml:space="preserve">检测到冲突</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts.Resolved" xml:space="preserve">文件冲突已解决</x:String>

src/Resources/Locales/zh_TW.axaml

@@ -108,6 +108,8 @@
   <x:String x:Key="Text.CommitDetail.Info.Parents" xml:space="preserve">父提交</x:String>
   <x:String x:Key="Text.CommitDetail.Info.Refs" xml:space="preserve">相關引用</x:String>
   <x:String x:Key="Text.CommitDetail.Info.SHA" xml:space="preserve">提交指紋</x:String>
+  <x:String x:Key="Text.CommitMessageTextBox.Placeholder" xml:space="preserve">填寫提交資訊</x:String>
+  <x:String x:Key="Text.CommitMessageTextBox.Tip" xml:space="preserve">Git使用空白行來劃分提交資訊中的主題與內容</x:String>
   <x:String x:Key="Text.Configure" xml:space="preserve">倉庫配置</x:String>
   <x:String x:Key="Text.Configure.Email" xml:space="preserve">電子郵箱</x:String>
   <x:String x:Key="Text.Configure.Email.Placeholder" xml:space="preserve">郵箱地址</x:String>
@@ -331,6 +333,7 @@
   <x:String x:Key="Text.Preference.General.Locale" xml:space="preserve">顯示語言</x:String>
   <x:String x:Key="Text.Preference.General.MaxHistoryCommits" xml:space="preserve">最大歷史提交數</x:String>
   <x:String x:Key="Text.Preference.General.RestoreTabs" xml:space="preserve">啟動時恢復上次開啟的倉庫</x:String>
+  <x:String x:Key="Text.Preference.General.SubjectGuideLength" xml:space="preserve">SUBJECT字數檢測</x:String>
   <x:String x:Key="Text.Preference.General.UseFixedTabWidth" xml:space="preserve">使用固定寬度的標題欄標籤</x:String>
   <x:String x:Key="Text.Preference.Git" xml:space="preserve">GIT配置</x:String>
   <x:String x:Key="Text.Preference.Git.AutoFetch" xml:space="preserve">啟用定時自動拉取遠端更新</x:String>
@@ -522,7 +525,6 @@
   <x:String x:Key="Text.WorkingCopy.CanStageTip" xml:space="preserve">現在您已可將其加入暫存區中</x:String>
   <x:String x:Key="Text.WorkingCopy.Commit" xml:space="preserve">提交</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitAndPush" xml:space="preserve">提交併推送</x:String>
-  <x:String x:Key="Text.WorkingCopy.CommitMessageTip" xml:space="preserve">填寫提交資訊</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitTip" xml:space="preserve">CTRL + Enter</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts" xml:space="preserve">檢測到衝突</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts.Resolved" xml:space="preserve">檔案衝突已解決</x:String>

src/Resources/Styles.axaml

@@ -1,7 +1,6 @@
 <Styles xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:vm="using:SourceGit.ViewModels"
-        xmlns:c="using:SourceGit.Converters"
         xmlns:ae="using:AvaloniaEdit"
         xmlns:aes="using:AvaloniaEdit.Search">
   <Design.PreviewWith>

src/ViewModels/Preference.cs

@@ -134,6 +134,12 @@ namespace SourceGit.ViewModels
             set => SetProperty(ref _maxHistoryCommits, value);
         }
 
+        public int SubjectGuideLength
+        {
+            get => _subjectGuideLength;
+            set => SetProperty(ref _subjectGuideLength, value);
+        }
+
         public bool RestoreTabs
         {
             get => _restoreTabs;
@@ -534,9 +540,11 @@ namespace SourceGit.ViewModels
         private LayoutInfo _layout = new LayoutInfo();
 
         private int _maxHistoryCommits = 20000;
+        private int _subjectGuideLength = 50;
         private bool _restoreTabs = false;
         private bool _useFixedTabWidth = true;
         private bool _check4UpdatesOnStartup = true;
+        
         private bool _useTwoColumnsLayoutInHistories = false;
         private bool _useSideBySideDiff = false;
         private bool _useSyntaxHighlighting = false;

src/Views/CommitMessageTextBox.axaml

@@ -0,0 +1,60 @@
+<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:ae="using:AvaloniaEdit"
+             xmlns:c="using:SourceGit.Converters"
+             xmlns:vm="using:SourceGit.ViewModels"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="SourceGit.Views.CommitMessageTextBox"
+             x:Name="ThisControl">
+  <Border Background="{DynamicResource Brush.Contents}"
+          BorderThickness="1"
+          BorderBrush="{DynamicResource Brush.Border2}"
+          CornerRadius="4">
+    <Grid RowDefinitions="*,Auto">
+      <Grid Grid.Row="0">
+        <ae:TextEditor x:Name="TextEditor"
+                       Foreground="{DynamicResource Brush.FG1}"
+                       Background="Transparent"
+                       Padding="2,1"
+                       BorderThickness="0"
+                       WordWrap="True"
+                       Document="{Binding #ThisControl.Document}"
+                       TextChanged="OnTextEditorTextChanged"
+                       LayoutUpdated="OnTextEditorLayoutUpdated"/>
+        
+        <TextBlock Text="{DynamicResource Text.CommitMessageTextBox.Placeholder}"
+                   Foreground="{DynamicResource Brush.FG2}"
+                   HorizontalAlignment="Left"
+                   VerticalAlignment="Top"
+                   Margin="2,1"
+                   IsVisible="{Binding #ThisControl.Text, Converter={x:Static StringConverters.IsNullOrEmpty}}"
+                   IsHitTestVisible="False"/>
+    
+        <Rectangle x:Name="SubjectGuideLine"
+                   Height="1"
+                   HorizontalAlignment="Stretch"
+                   VerticalAlignment="Top"
+                   IsHitTestVisible="False"
+                   Fill="{DynamicResource Brush.Border2}"/>
+      </Grid>
+      
+      <Border Grid.Row="1" CornerRadius="0,0,4,4" BorderThickness="0,1,0,0" BorderBrush="{DynamicResource Brush.Border2}" Background="{DynamicResource Brush.Window}" ClipToBounds="True">
+        <Grid ColumnDefinitions="Auto,*,Auto">
+          <Path Grid.Column="0" Height="12" Width="12" Margin="4,0,0,0" Data="{DynamicResource Icons.Info}" ToolTip.Tip="{DynamicResource Text.CommitMessageTextBox.Tip}"/>
+          <StackPanel Grid.Column="2" Orientation="Horizontal" Margin="4,2">
+            <TextBlock Text="Subject:" FontSize="10" Foreground="{DynamicResource Brush.FG2}"/>
+            <TextBlock Classes="monospace" Margin="2,0,0,0" FontSize="10" Text="{Binding #ThisControl.SubjectLength}"/>
+            <TextBlock Classes="monospace" FontSize="10" Text="/"/>
+            <TextBlock Classes="monospace" FontSize="10" Text="{Binding Source={x:Static vm:Preference.Instance}, Path=SubjectGuideLength}"/>
+            <Path Width="10" Height="10" Margin="4,0,0,0" Data="{StaticResource Icons.Error}" Fill="DarkGoldenrod" IsVisible="{Binding #ThisControl.SubjectLength, Converter={x:Static c:IntConverters.IsBadSubjectLength}}"/>
+            <TextBlock Margin="8,0,0,0" Text="Total:" FontSize="10" Foreground="{DynamicResource Brush.FG2}"/>
+            <TextBlock Classes="monospace" Margin="2,0,0,0" FontSize="10" Text="{Binding #ThisControl.Text.Length}"/>
+          </StackPanel>
+        </Grid>
+      </Border>
+    </Grid>
+  </Border>
+</UserControl>
+

src/Views/CommitMessageTextBox.axaml.cs

@@ -0,0 +1,112 @@
+using System;
+
+using Avalonia;
+using Avalonia.Controls;
+
+using AvaloniaEdit.Document;
+using AvaloniaEdit.Rendering;
+
+namespace SourceGit.Views
+{
+    public partial class CommitMessageTextBox : UserControl
+    {
+        public static readonly StyledProperty<string> TextProperty =
+            AvaloniaProperty.Register<CommitMessageTextBox, string>(nameof(Text), string.Empty);
+
+        public static readonly StyledProperty<int> SubjectLengthProperty =
+            AvaloniaProperty.Register<CommitMessageTextBox, int>(nameof(SubjectLength));
+ 
+        public string Text
+        {
+            get => GetValue(TextProperty);
+            set => SetValue(TextProperty, value);
+        }
+
+        public int SubjectLength
+        {
+            get => GetValue(SubjectLengthProperty);
+            set => SetValue(SubjectLengthProperty, value);
+        }
+
+        public TextDocument Document
+        {
+            get;
+            private set;
+        }
+        
+        public CommitMessageTextBox()
+        {
+            Document = new TextDocument(Text);
+            InitializeComponent();
+        }
+        
+        protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
+        {
+            base.OnPropertyChanged(change);
+
+            if (change.Property == TextProperty)
+            {
+                if (!_isDocumentTextChanging)
+                    Document.Text = Text;
+            }
+        }
+
+        private void OnTextEditorLayoutUpdated(object sender, EventArgs e)
+        {
+            var view = TextEditor.TextArea?.TextView;
+            if (view is { VisualLinesValid: true })
+            {
+                if (_subjectEndLineNumber == 0)
+                {
+                    SubjectGuideLine.Margin = new Thickness(1, view.DefaultLineHeight + 2, 1, 0);
+                    SubjectGuideLine.IsVisible = true;
+                    return;
+                }
+                
+                foreach (var line in view.VisualLines)
+                {
+                    var lineNumber = line.FirstDocumentLine.LineNumber;
+                    if (lineNumber == _subjectEndLineNumber)
+                    {
+                        var y = line.GetTextLineVisualYPosition(line.TextLines[^1], VisualYPosition.TextBottom) - view.VerticalOffset + 2;
+                        SubjectGuideLine.Margin = new Thickness(1, y, 1, 0);
+                        SubjectGuideLine.IsVisible = true;
+                        return;
+                    }
+                }
+            }
+            
+            SubjectGuideLine.IsVisible = false;
+        }
+
+        private void OnTextEditorTextChanged(object sender, EventArgs e)
+        {
+            _isDocumentTextChanging = true;
+            SetCurrentValue(TextProperty, Document.Text);
+            _isDocumentTextChanging = false;
+            
+            var setSubject = false;
+            for (int i = 0; i < Document.LineCount; i++)
+            {
+                var line = Document.Lines[i];
+                if (line.LineNumber > 1 && line.Length == 0)
+                {
+                    var subject = Text.Substring(0, line.Offset).ReplaceLineEndings(" ").Trim();
+                    SetCurrentValue(SubjectLengthProperty, subject.Length);
+                    setSubject = true;
+                    break;
+                }
+                
+                _subjectEndLineNumber = line.LineNumber;
+            }
+
+            if (setSubject)
+                return;
+            
+            SetCurrentValue(SubjectLengthProperty, Text.ReplaceLineEndings(" ").Trim().Length);
+        }
+
+        private bool _isDocumentTextChanging = false;
+        private int _subjectEndLineNumber = 0;
+    }
+}

src/Views/CreateTag.axaml

@@ -14,11 +14,11 @@
                Classes="bold"
                Text="{DynamicResource Text.CreateTag.Title}"/>
     <Grid Margin="0,16,8,0" RowDefinitions="32,32,32,Auto,Auto,32" ColumnDefinitions="120,*">
-      <TextBlock Grid.Column="0"
+      <TextBlock Grid.Row="0" Grid.Column="0"
                  HorizontalAlignment="Right" VerticalAlignment="Center"
                  Margin="0,0,8,0"
                  Text="{DynamicResource Text.CreateTag.BasedOn}"/>
-      <ContentControl Grid.Column="1" Content="{Binding BasedOn}">
+      <ContentControl Grid.Row="0" Grid.Column="1" Content="{Binding BasedOn}">
         <ContentControl.DataTemplates>
           <DataTemplate DataType="m:Branch">
             <StackPanel Orientation="Horizontal">

src/Views/InteractiveRebase.axaml

@@ -163,8 +163,8 @@
                     </Button.Flyout>
                     
                     <StackPanel Orientation="Horizontal">
-                      <Ellipse Grid.Column="0" Width="14" Height="14" Fill="{Binding Action, Converter={x:Static c:InteractiveRebaseActionConverters.ToIconBrush}}"/>
+                      <Ellipse Width="14" Height="14" Fill="{Binding Action, Converter={x:Static c:InteractiveRebaseActionConverters.ToIconBrush}}"/>
-                      <TextBlock Grid.Column="1" Classes="monospace" Margin="8,0" Text="{Binding Action, Converter={x:Static c:InteractiveRebaseActionConverters.ToName}}"/>
+                      <TextBlock Classes="monospace" Margin="8,0" Text="{Binding Action, Converter={x:Static c:InteractiveRebaseActionConverters.ToName}}"/>
                     </StackPanel>
                   </Button>
                 </DataTemplate>
@@ -179,12 +179,7 @@
                       <Button.Flyout>
                         <Flyout Placement="BottomEdgeAlignedLeft">
                           <Panel Width="600" Height="120">
-                            <TextBox Grid.Row="0"
+                            <v:CommitMessageTextBox Text="{Binding FullMessage, Mode=TwoWay}"/>
-                                     CornerRadius="2"
-                                     AcceptsReturn="True"
-                                     VerticalContentAlignment="Top"
-                                     Text="{Binding FullMessage, Mode=TwoWay}"
-                                     v:AutoFocusBehaviour.IsEnabled="True"/>
                           </Panel>
                         </Flyout>
                       </Button.Flyout>

src/Views/Preference.axaml

@@ -58,7 +58,7 @@
           <TabItem.Header>
             <TextBlock Classes="tab_header" Text="{DynamicResource Text.Preference.General}"/>
           </TabItem.Header>
-          <Grid Margin="8" RowDefinitions="32,32,32,32,32,32" ColumnDefinitions="Auto,*">
+          <Grid Margin="8" RowDefinitions="32,32,32,32,32,32,32" ColumnDefinitions="Auto,*">
             <TextBlock Grid.Row="0" Grid.Column="0"
                        Text="{DynamicResource Text.Preference.General.Locale}"
                        HorizontalAlignment="Right"
@@ -113,17 +113,45 @@
                          Foreground="{DynamicResource Brush.FG1}"
                          Text="{Binding MaxHistoryCommits}"/>
             </Grid>
+            
+            <TextBlock Grid.Row="3" Grid.Column="0"
+                       Text="{DynamicResource Text.Preference.General.SubjectGuideLength}"
+                       HorizontalAlignment="Right"
+                       Margin="0,0,16,0"/>
+            <Grid Grid.Row="3" Grid.Column="1" ColumnDefinitions="*,64">
+              <Slider Grid.Column="0"
+                      Minimum="50" Maximum="250"
+                      TickPlacement="BottomRight" TickFrequency="4"
+                      IsSnapToTickEnabled="False"
+                      VerticalAlignment="Center"
+                      Foreground="{DynamicResource Brush.Border1}"
+                      Value="{Binding SubjectGuideLength, Mode=TwoWay}">
+                <Slider.Resources>
+                  <Thickness x:Key="SliderTopHeaderMargin">0,0,0,4</Thickness>
+                  <GridLength x:Key="SliderPreContentMargin">0</GridLength>
+                  <GridLength x:Key="SliderPostContentMargin">0</GridLength>
+                  <CornerRadius x:Key="SliderThumbCornerRadius">8</CornerRadius>
+                  <x:Double x:Key="SliderHorizontalThumbWidth">16</x:Double>
+                  <x:Double x:Key="SliderHorizontalThumbHeight">16</x:Double>
+                </Slider.Resources>
+              </Slider>
 
-            <CheckBox Grid.Row="3" Grid.Column="1"
+              <TextBlock Grid.Column="1"
+                         HorizontalAlignment="Right" VerticalAlignment="Center"
+                         Foreground="{DynamicResource Brush.FG1}"
+                         Text="{Binding SubjectGuideLength}"/>
+            </Grid>
+
+            <CheckBox Grid.Row="4" Grid.Column="1"
                       Content="{DynamicResource Text.Preference.General.RestoreTabs}"
                       IsChecked="{Binding RestoreTabs, Mode=TwoWay}"/>
 
-            <CheckBox Grid.Row="4" Grid.Column="1"
+            <CheckBox Grid.Row="5" Grid.Column="1"
                       Height="32"
                       Content="{DynamicResource Text.Preference.General.UseFixedTabWidth}"
                       IsChecked="{Binding Source={x:Static vm:Preference.Instance}, Path=UseFixedTabWidth, Mode=TwoWay}"/>
 
-            <CheckBox Grid.Row="5" Grid.Column="1"
+            <CheckBox Grid.Row="6" Grid.Column="1"
                       Height="32"
                       Content="{DynamicResource Text.Preference.General.Check4UpdatesOnStartup}"
                       IsChecked="{Binding Source={x:Static vm:Preference.Instance}, Path=Check4UpdatesOnStartup, Mode=TwoWay}"/>

src/Views/RevisionFiles.axaml

@@ -2,11 +2,9 @@
              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:ae="using:AvaloniaEdit"
              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.RevisionFiles"
              x:DataType="vm:CommitDetail">

src/Views/TextDiffView.axaml.cs

@@ -105,19 +105,12 @@ namespace SourceGit.Views
             set => SetValue(UseSyntaxHighlightingProperty, value);
         }
 
-        /// <summary>
-        /// ShowHiddenSymbols StyledProperty definition
-        /// </summary>
         public static readonly StyledProperty<bool> ShowHiddenSymbolsProperty =
             AvaloniaProperty.Register<IThemedTextDiffPresenter, bool>(nameof(ShowHiddenSymbols), false);
 
-        /// <summary>
-        /// Gets or sets the ShowHiddenSymbols property. This StyledProperty
-        /// indicates that show hidden symbol like space and tab
-        /// </summary>
         public bool ShowHiddenSymbols
         {
-            get => this.GetValue(ShowHiddenSymbolsProperty);
+            get => GetValue(ShowHiddenSymbolsProperty);
             set => SetValue(ShowHiddenSymbolsProperty, value);
         }
 

src/Views/WorkingCopy.axaml

@@ -159,19 +159,10 @@
       </Grid>
 
       <!-- Commit Message -->
-      <TextBox Grid.Row="1"
+      <v:CommitMessageTextBox Grid.Row="1"
-               Height="80"
+                              Height="100"
-               Margin="0,4" Padding="2,1"
+                              Margin="0,4"
-               AcceptsReturn="True" AcceptsTab="True"
+                              Text="{Binding CommitMessage, Mode=TwoWay}"/>
-               TextWrapping="Wrap"
-               VerticalContentAlignment="Top"
-               ScrollViewer.HorizontalScrollBarVisibility="Disabled"
-               ScrollViewer.VerticalScrollBarVisibility="Auto"
-               Background="{DynamicResource Brush.Contents}"
-               BorderThickness="1"
-               BorderBrush="{DynamicResource Brush.Border2}"
-               Watermark="{DynamicResource Text.WorkingCopy.CommitMessageTip}"
-               Text="{Binding CommitMessage, Mode=TwoWay}"/>
 
       <!-- Commit Options -->
       <Grid Grid.Row="2" ColumnDefinitions="Auto,Auto,*,Auto,Auto,Auto">