From 05841da0b0b4668c19b7560a8dd358ac7e1f7cbd Mon Sep 17 00:00:00 2001
From: i2van <ivan.ivon@gmail.com>
Date: Sat, 26 Jun 2021 00:01:52 +0300
Subject: [PATCH] Add encoding auto-detection. (#4)

Bugfixes.

Co-authored-by: Ivan Ivon <ivan.ivon@zerto.com>
---
 Deploy/buildlpx.cmd                           |   2 +-
 README.md                                     |   8 +-
 .../CodeGen/CsvCSharpCodeGenerator.cs         |   3 +-
 Src/CsvLINQPadDriver/CodeGen/CsvTableBase.cs  |   5 +-
 .../CodeGen/CsvTableEnumerable.cs             |   3 +-
 .../CodeGen/CsvTableFactory.cs                |   5 +-
 Src/CsvLINQPadDriver/CodeGen/CsvTableList.cs  |   3 +-
 Src/CsvLINQPadDriver/ConnectionDialog.xaml    | 119 +++++++++++-------
 Src/CsvLINQPadDriver/ConnectionDialog.xaml.cs |  36 ++++--
 .../CsvDataContextDriverProperties.cs         |   6 +
 Src/CsvLINQPadDriver/CsvLINQPadDriver.csproj  |  15 +--
 .../DataModel/CsvDataModelGenerator.cs        |   5 +-
 Src/CsvLINQPadDriver/Directory.Build.props    |   6 +-
 .../Extensions/CodeGenExtensions.cs           |  39 +++---
 .../Extensions/FileExtensions.cs              |  88 ++++++++++---
 Src/CsvLINQPadDriver/Extensions/Functions.cs  |   8 ++
 .../ICsvDataContextDriverProperties.cs        |   5 +
 Src/CsvLINQPadDriver/SchemaBuilder.cs         |   8 +-
 Src/CsvLINQPadDriver/Wpf/ControlExtensions.cs |  65 ++++++++++
 Src/CsvLINQPadDriver/Wpf/DialogExtensions.cs  |   4 +-
 Src/CsvLINQPadDriver/app.manifest             |   2 +-
 Src/LPRun/LPRun.csproj                        |   4 +-
 .../CsvLINQPadDriverTest.csproj               |   7 +-
 Tests/CsvLINQPadDriverTest/LPRunTests.cs      |  32 +++--
 24 files changed, 342 insertions(+), 136 deletions(-)
 create mode 100644 Src/CsvLINQPadDriver/Extensions/Functions.cs
 create mode 100644 Src/CsvLINQPadDriver/Wpf/ControlExtensions.cs

diff --git a/Deploy/buildlpx.cmd b/Deploy/buildlpx.cmd
index 14a3d2f..bb2412e 100644
--- a/Deploy/buildlpx.cmd
+++ b/Deploy/buildlpx.cmd
@@ -1,4 +1,4 @@
-@set version=6.12.0
+@set version=6.13.0
 @set zip="%ProgramFiles%\7-Zip\7z.exe"
 @set output="CsvLINQPadDriver.%version%.lpx6"
 
diff --git a/README.md b/README.md
index 48518ea..cf4c0ab 100644
--- a/README.md
+++ b/README.md
@@ -159,15 +159,16 @@ CSV files connection can be added to LINQPad 6 the same way as any other connect
   * `c:\Books\Books?.csv`: `Books.csv`, `Books1.csv`, etc. files in folder `c:\Books`
   * `c:\Books\*.csv`: all `*.csv` files in folder `c:\Books`
   * `c:\Books\**.csv`: all `*.csv` files in folder `c:\Books` and its sub-folders.
-* Order files by: specifies files sort order. Affects similar files order.
-* No BOM encoding: specifies encoding for files without [BOM](https://en.wikipedia.org/wiki/Byte_order_mark). `UTF-8` is default.
+* Order files by: specify files sort order. Affects similar files order.
+* Fallback encoding: specify encoding to use if file encoding could not be detected, e.g. due to missing [BOM](https://en.wikipedia.org/wiki/Byte_order_mark). `UTF-8` is default.
+* Auto-detect file encodings: try to detect file encodings.
 * Validate file paths: check if file paths are valid.
 * Ignore files with invalid format: files with content which does not resemble CSV will be ignored.
 
 ### Format ###
 
 * CSV separator: character used to separate columns in files. Can be `,`, `\t`, etc. Auto-detected if empty.
-* Use CsvHelper library separator auto-detection: use CsvHelper library separator auto-detection instead of internal one.
+* Use [CsvHelper](https://joshclose.github.io/CsvHelper) library separator auto-detection: use CsvHelper library separator auto-detection instead of internal one.
 * Ignore bad data: ignore malformed CSV data.
 * Allow comments: lines starting with `#` will be ignored.
 
@@ -402,6 +403,7 @@ TimeSpan? ToTimeSpan(
 * [Moq](https://github.com/moq/moq4)
 * [NUnit](https://github.com/nunit/nunit)
 * [Windows API Code Pack](https://github.com/contre/Windows-API-Code-Pack-1.1)
+* [UnicodeCharsetDetector](https://github.com/i2van/UnicodeCharsetDetector)
 
 ## License ##
 
diff --git a/Src/CsvLINQPadDriver/CodeGen/CsvCSharpCodeGenerator.cs b/Src/CsvLINQPadDriver/CodeGen/CsvCSharpCodeGenerator.cs
index 9c26305..71d5ba2 100644
--- a/Src/CsvLINQPadDriver/CodeGen/CsvCSharpCodeGenerator.cs
+++ b/Src/CsvLINQPadDriver/CodeGen/CsvCSharpCodeGenerator.cs
@@ -68,6 +68,7 @@ public class {_contextTypeName} : {typeof(CsvDataContextBase).GetCodeTypeClassNa
                 {typeof(NoBomEncoding).GetCodeTypeClassName()}.{_properties.NoBomEncoding},
                 {GetBoolConst(_properties.AllowComments)},
                 {GetBoolConst(_properties.IgnoreBadData)},
+                {GetBoolConst(_properties.AutoDetectEncoding)},
                 {table.FilePath.AsValidCSharpCode()},
                 new {typeof(CsvColumnInfoList<>).GetCodeTypeClassName(GetClassName(table))} {{
                     {string.Join(string.Empty, table.Columns.Select(c => $@"{{ {c.Index}, x => x.{c.CodeName} }}, "))}
@@ -81,7 +82,7 @@ public class {_contextTypeName} : {typeof(CsvDataContextBase).GetCodeTypeClassNa
         }}
     }} // context class
 
-    // Data types {string.Join(Environment.NewLine, groups.Select(grouping => grouping.First().Code))} // data types
+    // Data types {string.Join(Environment.NewLine, groups.Select(grouping => grouping.OrderByDescending(code => code.Code.Length).First().Code))} // data types
 }} // namespace
 ", groups);
 
diff --git a/Src/CsvLINQPadDriver/CodeGen/CsvTableBase.cs b/Src/CsvLINQPadDriver/CodeGen/CsvTableBase.cs
index b43a8b1..af21ec7 100644
--- a/Src/CsvLINQPadDriver/CodeGen/CsvTableBase.cs
+++ b/Src/CsvLINQPadDriver/CodeGen/CsvTableBase.cs
@@ -25,6 +25,7 @@ public abstract class CsvTableBase<TRow> : CsvTableBase, IEnumerable<TRow>
         private readonly NoBomEncoding _noBomEncoding;
         private readonly bool _allowComments;
         private readonly bool _ignoreBadData;
+        private readonly bool _autoDetectEncoding;
 
         protected readonly string FilePath;
 
@@ -34,6 +35,7 @@ protected CsvTableBase(
             NoBomEncoding noBomEncoding,
             bool allowComments,
             bool ignoreBadData,
+            bool autoDetectEncoding,
             string filePath,
             IEnumerable<CsvColumnInfo> propertiesInfo,
             Action<TRow> relationsInit)
@@ -43,6 +45,7 @@ protected CsvTableBase(
             _noBomEncoding = noBomEncoding;
             _allowComments = allowComments;
             _ignoreBadData = ignoreBadData;
+            _autoDetectEncoding = autoDetectEncoding;
 
             FilePath = filePath;
 
@@ -50,7 +53,7 @@ protected CsvTableBase(
         }
 
         protected IEnumerable<TRow> ReadData() =>
-            FilePath.CsvReadRows(_csvSeparator, IsStringInternEnabled, _noBomEncoding, _allowComments, _ignoreBadData, _cachedCsvRowMappingBase!);
+            FilePath.CsvReadRows(_csvSeparator, IsStringInternEnabled, _noBomEncoding, _allowComments, _ignoreBadData, _autoDetectEncoding, _cachedCsvRowMappingBase!);
 
         // ReSharper disable once UnusedMember.Global
         public abstract IEnumerable<TRow> WhereIndexed(Func<TRow, string> getProperty, string propertyName, params string[] values);
diff --git a/Src/CsvLINQPadDriver/CodeGen/CsvTableEnumerable.cs b/Src/CsvLINQPadDriver/CodeGen/CsvTableEnumerable.cs
index b99d3ab..4ae0801 100644
--- a/Src/CsvLINQPadDriver/CodeGen/CsvTableEnumerable.cs
+++ b/Src/CsvLINQPadDriver/CodeGen/CsvTableEnumerable.cs
@@ -13,10 +13,11 @@ public CsvTableEnumerable(
             NoBomEncoding noBomEncoding,
             bool allowComments,
             bool ignoreBadData,
+            bool autoDetectEncoding,
             string filePath,
             IEnumerable<CsvColumnInfo> propertiesInfo,
             Action<TRow> relationsInit)
-            : base(isStringInternEnabled, csvSeparator, noBomEncoding, allowComments, ignoreBadData, filePath, propertiesInfo, relationsInit)
+            : base(isStringInternEnabled, csvSeparator, noBomEncoding, allowComments, ignoreBadData, autoDetectEncoding, filePath, propertiesInfo, relationsInit)
         {
         }
 
diff --git a/Src/CsvLINQPadDriver/CodeGen/CsvTableFactory.cs b/Src/CsvLINQPadDriver/CodeGen/CsvTableFactory.cs
index 5fecea8..fc60119 100644
--- a/Src/CsvLINQPadDriver/CodeGen/CsvTableFactory.cs
+++ b/Src/CsvLINQPadDriver/CodeGen/CsvTableFactory.cs
@@ -13,12 +13,13 @@ public static CsvTableBase<TRow> CreateTable<TRow>(
             NoBomEncoding noBomEncoding,
             bool allowComments,
             bool ignoreBadData,
+            bool autoDetectEncoding,
             string filePath,
             IEnumerable<CsvColumnInfo> propertiesInfo,
             Action<TRow> relationsInit)
             where TRow : ICsvRowBase, new() =>
             isCacheEnabled
-                ? new CsvTableList<TRow>(isStringInternEnabled, csvSeparator, noBomEncoding, allowComments, ignoreBadData, filePath, propertiesInfo, relationsInit)
-                : new CsvTableEnumerable<TRow>(isStringInternEnabled, csvSeparator, noBomEncoding, allowComments, ignoreBadData, filePath, propertiesInfo, relationsInit);
+                ? new CsvTableList<TRow>(isStringInternEnabled, csvSeparator, noBomEncoding, allowComments, ignoreBadData, autoDetectEncoding, filePath, propertiesInfo, relationsInit)
+                : new CsvTableEnumerable<TRow>(isStringInternEnabled, csvSeparator, noBomEncoding, allowComments, ignoreBadData, autoDetectEncoding, filePath, propertiesInfo, relationsInit);
     }
 }
\ No newline at end of file
diff --git a/Src/CsvLINQPadDriver/CodeGen/CsvTableList.cs b/Src/CsvLINQPadDriver/CodeGen/CsvTableList.cs
index 9345a57..3eb384c 100644
--- a/Src/CsvLINQPadDriver/CodeGen/CsvTableList.cs
+++ b/Src/CsvLINQPadDriver/CodeGen/CsvTableList.cs
@@ -18,10 +18,11 @@ public CsvTableList(
             NoBomEncoding noBomEncoding,
             bool allowComments,
             bool ignoreBadData,
+            bool autoDetectEncoding,
             string filePath,
             IEnumerable<CsvColumnInfo> propertiesInfo,
             Action<TRow> relationsInit)
-            : base(isStringInternEnabled, csvSeparator, noBomEncoding, allowComments, ignoreBadData, filePath, propertiesInfo, relationsInit) =>
+            : base(isStringInternEnabled, csvSeparator, noBomEncoding, allowComments, ignoreBadData, autoDetectEncoding, filePath, propertiesInfo, relationsInit) =>
             _dataCache = new Lazy<IList<TRow>>(() => ReadData().Cache($"{typeof(TRow).Name}:{FilePath}"));
 
         private IList<TRow> DataCache =>
diff --git a/Src/CsvLINQPadDriver/ConnectionDialog.xaml b/Src/CsvLINQPadDriver/ConnectionDialog.xaml
index ebd9aa0..399f355 100644
--- a/Src/CsvLINQPadDriver/ConnectionDialog.xaml
+++ b/Src/CsvLINQPadDriver/ConnectionDialog.xaml
@@ -20,17 +20,20 @@
         <ObjectDataProvider x:Key="FilesOrderByData" MethodName="GetValues" ObjectType="{x:Type wpf:FilesOrderByEnumObjectDataSource}"/>
         <ObjectDataProvider x:Key="StringComparisonData" MethodName="GetValues" ObjectType="{x:Type wpf:StringComparisonEnumObjectDataSource}"/>
 
-        <Style x:Key="HelpTextBlock" TargetType="{x:Type TextBlock}">
-            <Setter Property="Text" Value="?"/>
-        </Style>
-
         <Style TargetType="{x:Type CheckBox}">
             <Setter Property="VerticalContentAlignment" Value="Center"/>
         </Style>
 
         <Style TargetType="{x:Type Hyperlink}">
             <Setter Property="TextDecorations" Value=""/>
-            <Setter Property="ToolTipService.ShowOnDisabled" Value="True"/>
+        </Style>
+
+        <Style x:Key="HelpTextBlock" TargetType="{x:Type TextBlock}">
+            <Setter Property="Text" Value="?"/>
+        </Style>
+
+        <Style x:Key="HelpHyperlink" TargetType="{x:Type Hyperlink}" BasedOn="{StaticResource {x:Type Hyperlink}}">
+            <Setter Property="Command" Value="{x:Static this:ConnectionDialog.HelpCommand}"/>
         </Style>
 
         <Style x:Key="WrappedTextBlock" TargetType="{x:Type TextBlock}">
@@ -41,6 +44,10 @@
             <Setter Property="Margin" Value="0 0 5 0"/>
         </Style>
 
+        <Style x:Key="TextBlockHyperlinkSingleContainer" TargetType="{x:Type TextBlock}" BasedOn="{StaticResource WrappedTextBlock}">
+            <Setter Property="Margin" Value="0"/>
+        </Style>
+
         <Thickness x:Key="GroupMarginStyle" Left="2" Right="2" Top="2" Bottom="2"/>
 
         <Style x:Key="GroupStackPanelStyle" TargetType="{x:Type StackPanel}">
@@ -75,9 +82,8 @@
             <Setter Property="MinWidth" Value="85"/>
         </Style>
 
-        <Style x:Key="DependentCheckBoxStyle" TargetType="{x:Type CheckBox}">
+        <Style x:Key="DependentCheckBoxStyle" TargetType="{x:Type CheckBox}" BasedOn="{StaticResource {x:Type CheckBox}}">
             <Setter Property="Margin" Value="16 0 0 0"/>
-            <Setter Property="ToolTipService.ShowOnDisabled" Value="True"/>
         </Style>
     </Window.Resources>
 
@@ -102,14 +108,18 @@
             Command="{x:Static this:ConnectionDialog.PasteFromClipboardForFolderAndProceedCommand}"
             Executed="PasteFromClipboardForFolderAndProceedCommandBinding_OnExecuted"
             CanExecute="ClipboardCommandBinding_OnCanExecute"/>
+        <CommandBinding
+            Command="{x:Static this:ConnectionDialog.BrowseCommand}"
+            Executed="BrowseCommandBinding_OnExecuted"
+            CanExecute="BrowseCommandBinding_OnCanExecute"/>
         <CommandBinding
             Command="{x:Static this:ConnectionDialog.ClearCommand}"
             Executed="ClearCommandBinding_OnExecuted"
             CanExecute="ClearCommandBinding_OnCanExecute"/>
         <CommandBinding
-            Command="{x:Static this:ConnectionDialog.BrowseCommand}"
-            Executed="BrowseCommandBinding_OnExecuted"
-            CanExecute="BrowseCommandBinding_OnCanExecute"/>
+            Command="{x:Static this:ConnectionDialog.WrapFilesTextCommand}"
+            Executed="WrapFilesTextCommand_OnExecuted"
+            CanExecute="CommandBinding_OnCanAlwaysExecute"/>
         <CommandBinding
             Command="{x:Static this:ConnectionDialog.HelpCommand}"
             Executed="HelpCommandBinding_OnExecuted"
@@ -147,7 +157,7 @@
 
         <GroupBox>
             <GroupBox.Header>
-                <StackPanel Margin="-1 1 0 0" Orientation="Horizontal" VerticalAlignment="Center">
+                <StackPanel Margin="-1 1 0 0" Orientation="Horizontal">
                     <ComboBox
                         Style="{StaticResource EnumComboBoxStyle}"
                         ToolTip="Active file type"
@@ -172,35 +182,53 @@
                     <RowDefinition Height="Auto"/>
                 </Grid.RowDefinitions>
 
-                <WrapPanel Grid.ColumnSpan="3" Margin="0 0 0 2" Orientation="Horizontal" HorizontalAlignment="Stretch">
-                    <TextBlock Style="{StaticResource WrappedTextBlock}">
-                        <TextBlock Style="{StaticResource TextBlockHyperlinkContainer}">
-                            <Hyperlink Command="{x:Static this:ConnectionDialog.AddFilesCommand}">
-                                <TextBlock Text="Add files" ToolTip="Add files (Ctrl+O)" Style="{StaticResource WrappedTextBlock}"/>
-                            </Hyperlink>
-                        </TextBlock>
-                        <TextBlock Style="{StaticResource TextBlockHyperlinkContainer}">
-                            <Hyperlink Command="{x:Static this:ConnectionDialog.AddFolderCommand}">
-                                <TextBlock Text="Add folder" ToolTip="Add folder (Ctrl+Shift+O)" Style="{StaticResource WrappedTextBlock}"/>
-                            </Hyperlink>
-                        </TextBlock>
-                        <TextBlock Style="{StaticResource TextBlockHyperlinkContainer}">
-                            <Hyperlink Command="{x:Static this:ConnectionDialog.AddFolderAndItsSubfoldersCommand}">
-                                <TextBlock Text="Add folder and its sub-folders" ToolTip="Add folder and its sub-folders (Ctrl+Shift+Alt+O)" Style="{StaticResource WrappedTextBlock}"/>
-                            </Hyperlink>
-                        </TextBlock>
-                        <TextBlock Style="{StaticResource TextBlockHyperlinkContainer}" ToolTip="Browse file or folder at the current line (Ctrl+F) or any line (Ctrl+Click)">
-                            <Hyperlink Command="{x:Static this:ConnectionDialog.BrowseCommand}">
-                                <TextBlock Text="Browse" Style="{StaticResource WrappedTextBlock}"/>
-                            </Hyperlink>
+                <Grid Grid.ColumnSpan="3">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto"/>
+                    </Grid.ColumnDefinitions>
+
+                    <WrapPanel Grid.Column="0" Margin="0 0 0 2" Orientation="Horizontal" HorizontalAlignment="Stretch">
+                        <TextBlock Style="{StaticResource WrappedTextBlock}">
+                            <TextBlock Style="{StaticResource TextBlockHyperlinkContainer}">
+                                <Hyperlink Command="{x:Static this:ConnectionDialog.AddFilesCommand}" ToolTip="Add files (Ctrl+O)">Add files</Hyperlink>
+                            </TextBlock>
+                            <TextBlock Style="{StaticResource TextBlockHyperlinkContainer}">
+                                <Hyperlink Command="{x:Static this:ConnectionDialog.AddFolderCommand}" ToolTip="Add folder (Ctrl+Shift+O)">Add folder</Hyperlink>
+                            </TextBlock>
+                            <TextBlock Style="{StaticResource TextBlockHyperlinkContainer}">
+                                <Hyperlink Command="{x:Static this:ConnectionDialog.AddFolderAndItsSubfoldersCommand}" ToolTip="Add folder and its sub-folders (Ctrl+Shift+Alt+O)">Add folder and its sub-folders</Hyperlink>
+                            </TextBlock>
+                            <TextBlock Style="{StaticResource TextBlockHyperlinkContainer}">
+                                <Hyperlink Command="{x:Static this:ConnectionDialog.BrowseCommand}" ToolTip="Browse file or folder at the current line (Ctrl+F) or any line (Ctrl+Click)">Browse</Hyperlink>
+                            </TextBlock>
+                            <TextBlock Style="{StaticResource TextBlockHyperlinkContainer}">
+                                <Hyperlink Command="{x:Static this:ConnectionDialog.ClearCommand}" ToolTip="Clear (Ctrl+L)">Clear</Hyperlink>
+                            </TextBlock>
                         </TextBlock>
-                        <TextBlock Style="{StaticResource TextBlockHyperlinkContainer}">
-                            <Hyperlink Command="{x:Static this:ConnectionDialog.ClearCommand}">
-                                <TextBlock Text="Clear" ToolTip="Clear (Ctrl+L)" Style="{StaticResource WrappedTextBlock}"/>
+                    </WrapPanel>
+
+                    <Grid Grid.Column="1">
+                        <TextBlock Style="{StaticResource TextBlockHyperlinkSingleContainer}">
+                            <Hyperlink Command="{x:Static this:ConnectionDialog.WrapFilesTextCommand}">
+                                <TextBlock>
+                                    <TextBlock.Style>
+                                        <Style TargetType="{x:Type TextBlock}">
+                                            <Setter Property="Text" Value="⮨"/>
+                                            <Setter Property="ToolTip" Value="Turn on word wrap (Ctrl+W)"/>
+                                            <Style.Triggers>
+                                                <DataTrigger Binding="{Binding TextWrapping, ElementName=FilesTextBox}" Value="Wrap">
+                                                    <Setter Property="Text" Value="➞"/>
+                                                    <Setter Property="ToolTip" Value="Turn off word wrap (Ctrl+W)"/>
+                                                </DataTrigger>
+                                            </Style.Triggers>
+                                        </Style>
+                                    </TextBlock.Style>
+                                </TextBlock>
                             </Hyperlink>
                         </TextBlock>
-                    </TextBlock>
-                </WrapPanel>
+                    </Grid>
+                </Grid>
 
                 <TextBox Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3"
                     Name="FilesTextBox"
@@ -228,6 +256,9 @@
                         <KeyBinding
                             Command="{x:Static this:ConnectionDialog.ClearCommand}"
                             Gesture="Ctrl+L"/>
+                        <KeyBinding
+                            Command="{x:Static this:ConnectionDialog.WrapFilesTextCommand}"
+                            Gesture="Ctrl+W"/>
                         <KeyBinding
                             Command="{x:Static this:ConnectionDialog.PasteFromClipboardForFolderAndProceedCommand}"
                             Gesture="Ctrl+Shift+V"/>
@@ -246,20 +277,22 @@
                     SelectedValue="{Binding FilesOrderBy}"
                     ItemsSource="{Binding Source={StaticResource FilesOrderByData}}"/>
 
-                <Label Grid.Row="3" Grid.Column="0" Padding="0 5 4 0" Content="No _BOM encoding" Target="{Binding ElementName=NoBomEncodingComboBox}"/>
+                <Label Grid.Row="3" Grid.Column="0" Padding="0 5 4 0" Content="Fall_back encoding" Target="{Binding ElementName=NoBomEncodingComboBox}"/>
                 <ComboBox Grid.Row="3" Grid.Column="1"
                     Name="NoBomEncodingComboBox"
                     Style="{StaticResource FilesGroupComboBoxStyle}"
-                    ToolTip="Encoding for files without BOM"
+                    ToolTip="Specify encoding to use if file encoding could not be detected, e.g. due to missing BOM"
                     SelectedValue="{Binding NoBomEncoding}"
                     ItemsSource="{Binding Source={StaticResource NoBomEncodingData}}"/>
                 <TextBlock Grid.Row="3" Grid.Column="2" Padding="5 5 0 0">
-                    <Hyperlink NavigateUri="https://en.wikipedia.org/wiki/Byte_order_mark" Command="{x:Static this:ConnectionDialog.HelpCommand}">
-                        <TextBlock Style="{StaticResource HelpTextBlock}" ToolTip="BOM on Wikipedia"/>
+                    <Hyperlink NavigateUri="https://en.wikipedia.org/wiki/Byte_order_mark" ToolTip="BOM on Wikipedia" Style="{StaticResource HelpHyperlink}">
+                        <TextBlock Style="{StaticResource HelpTextBlock}"/>
                     </Hyperlink>
                 </TextBlock>
 
                 <StackPanel Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="3" Margin="0 5 0 0" Orientation="Vertical">
+                    <!-- ReSharper disable once MarkupAttributeTypo -->
+                    <CheckBox IsChecked="{Binding AutoDetectEncoding}" Content="Auto-detect file encodin_gs" ToolTip="Try to detect file encodings"/>
                     <CheckBox IsChecked="{Binding ValidateFilePaths}" Content="_Validate file paths" ToolTip="Check if file paths are valid" Name="ValidateFilePathsCheckBox"/>
                     <CheckBox IsChecked="{Binding IgnoreInvalidFiles}" Content="Ignore files _with invalid format" ToolTip="Ignore files with content which does not resemble CSV"/>
                 </StackPanel>
@@ -312,8 +345,8 @@
                             SelectedValue="{Binding Path=StringComparison}"
                             ItemsSource="{Binding Source={StaticResource StringComparisonData}}"/>
                         <TextBlock Grid.Row="0" Grid.Column="2" Padding="5 3 0 0">
-                            <Hyperlink NavigateUri="https://docs.microsoft.com/en-us/dotnet/api/system.stringcomparison#fields" Command="{x:Static this:ConnectionDialog.HelpCommand}">
-                                <TextBlock Style="{StaticResource HelpTextBlock}" ToolTip="StringComparison on Microsoft Docs"/>
+                            <Hyperlink NavigateUri="https://docs.microsoft.com/en-us/dotnet/api/system.stringcomparison#fields" ToolTip="StringComparison on Microsoft Docs" Style="{StaticResource HelpHyperlink}">
+                                <TextBlock Style="{StaticResource HelpTextBlock}"/>
                             </Hyperlink>
                         </TextBlock>
                     </Grid>
diff --git a/Src/CsvLINQPadDriver/ConnectionDialog.xaml.cs b/Src/CsvLINQPadDriver/ConnectionDialog.xaml.cs
index c1db81d..46110ce 100644
--- a/Src/CsvLINQPadDriver/ConnectionDialog.xaml.cs
+++ b/Src/CsvLINQPadDriver/ConnectionDialog.xaml.cs
@@ -29,6 +29,7 @@ internal partial class ConnectionDialog
         public static readonly RoutedUICommand BrowseCommand = new();
         public static readonly RoutedUICommand CtrlLeftClickCommand = new();
         public static readonly RoutedUICommand PasteWithFolderAndItsSubfoldersCommand = new();
+        public static readonly RoutedUICommand WrapFilesTextCommand = new();
 
         public static readonly string WildcardsToolTip = $"Type one file/folder per line. Wildcards ? and * are supported; {FileExtensions.DefaultRecursiveMask} searches in folder and its sub-folders";
 
@@ -38,6 +39,8 @@ public ConnectionDialog(ICsvDataContextDriverProperties csvDataContextDriverProp
         {
             DataContext = csvDataContextDriverProperties;
 
+            Array.ForEach(new[] { typeof(Control), typeof(Hyperlink) }, type => ToolTipService.ShowOnDisabledProperty.OverrideMetadata(type, new FrameworkPropertyMetadata(true)));
+
             InitializeComponent();
 
             FilesTextBox.ToolTip += $" or {char.ToLower(WildcardsToolTip[0])}{WildcardsToolTip[1..]}";
@@ -90,7 +93,7 @@ bool CanClose()
                         ref validateFilePaths) == false;
 
                 TypedDataContext.ValidateFilePaths = validateFilePaths;
-                ValidateFilePathsCheckBox.GetBindingExpression(ToggleButton.IsCheckedProperty)!.UpdateTarget();
+                ValidateFilePathsCheckBox.UpdateTargetBinding(ToggleButton.IsCheckedProperty);
 
                 if (!canClose)
                 {
@@ -247,15 +250,22 @@ private void AddFolderCommandBinding_OnExecuted(object sender, ExecutedRoutedEve
         private void AddFolderAndItsSubfoldersCommandBinding_OnExecuted(object sender, ExecutedRoutedEventArgs e) =>
             AddFolder(true);
 
-        private void ClearCommandBinding_OnExecuted(object sender, ExecutedRoutedEventArgs e)
-        {
+        private void ClearCommandBinding_OnExecuted(object sender, ExecutedRoutedEventArgs e) =>
             FilesTextBox.Clear();
-            FilesTextBox.Focus();
-        }
 
         private void ClearCommandBinding_OnCanExecute(object sender, CanExecuteRoutedEventArgs e) =>
             e.CanExecute = FilesTextBox?.Text.Any() == true;
 
+        private void WrapFilesTextCommand_OnExecuted(object sender, ExecutedRoutedEventArgs e)
+        {
+            FilesTextBox.TextWrapping =
+                FilesTextBox.TextWrapping == TextWrapping.Wrap
+                    ? TextWrapping.NoWrap
+                    : TextWrapping.Wrap;
+
+            ScrollToActiveLine();
+        }
+
         private void CtrlLeftClickCommandBinding_OnExecuted(object sender, ExecutedRoutedEventArgs e)
         {
             SetCaretIndexFromMousePosition();
@@ -280,6 +290,8 @@ private void BrowseCommandBinding_OnExecuted(object sender, ExecutedRoutedEventA
                 return;
             }
 
+            ScrollToActiveLine();
+
             var (isFile, path) = fullPath!.DeduceIsFileOrFolder(true);
             var shellResult = path.Explore(isFile);
 
@@ -294,6 +306,14 @@ private void BrowseCommandBinding_OnExecuted(object sender, ExecutedRoutedEventA
             }
         }
 
+        private void ScrollToActiveLine()
+        {
+            FilesTextBox.ScrollToLine(GetActiveLineIndex());
+
+            int GetActiveLineIndex() =>
+                FilesTextBox.GetLineIndexFromCharacterIndex(FilesTextBox.CaretIndex);
+        }
+
         private void BrowseCommandBinding_OnCanExecute(object sender, CanExecuteRoutedEventArgs e) =>
             e.CanExecute = TryGetFullPathAtLineIncludingInlineComment(out _);
 
@@ -311,9 +331,7 @@ private bool TryGetFullPathAtLine(out string? fullPath, Func<string, string>? st
             return TryGetLineAtCaret(out fullPath) && IsPathValid(fullPath!);
 
             bool TryGetLineAtCaret(out string? line) =>
-                !string.IsNullOrWhiteSpace(line = (strip ?? PassFunc)(FilesTextBox.GetLineText(FilesTextBox.GetLineIndexFromCharacterIndex(FilesTextBox.CaretIndex))).Trim());
-
-            static string PassFunc(string value) => value;
+                !string.IsNullOrWhiteSpace(line = (strip ?? Functions.Pass)(FilesTextBox.GetLineTextAtCaretIndex()).Trim());
         }
 
         private bool TryGetFullPathAtLineIncludingInlineComment(out string? fullPath) =>
@@ -380,7 +398,7 @@ private void UnstableOption_OnChecked(object sender, RoutedEventArgs e)
 
             checkBox.IsChecked = this.ShowYesNoDialog(
                 ReplaceHotKeyChar((string)checkBox.Content, string.Empty),
-                "This option might mangle CSV parsing. Use at your own risk",
+                "This option might mangle CSV parsing. Would you like to use it anyway?",
                 "I understand and want to use it",
                 "Do not use",
                 false) == true;
diff --git a/Src/CsvLINQPadDriver/CsvDataContextDriverProperties.cs b/Src/CsvLINQPadDriver/CsvDataContextDriverProperties.cs
index 4d60ee2..d468e55 100644
--- a/Src/CsvLINQPadDriver/CsvDataContextDriverProperties.cs
+++ b/Src/CsvLINQPadDriver/CsvDataContextDriverProperties.cs
@@ -64,6 +64,12 @@ public bool IgnoreBadData
             set => SetValue(value);
         }
 
+        public bool AutoDetectEncoding
+        {
+            get => GetValue(true);
+            set => SetValue(value);
+        }
+
         public bool AllowComments
         {
             get => GetValue(false);
diff --git a/Src/CsvLINQPadDriver/CsvLINQPadDriver.csproj b/Src/CsvLINQPadDriver/CsvLINQPadDriver.csproj
index f14eca4..647b3af 100644
--- a/Src/CsvLINQPadDriver/CsvLINQPadDriver.csproj
+++ b/Src/CsvLINQPadDriver/CsvLINQPadDriver.csproj
@@ -6,7 +6,7 @@
     <UseWindowsForms>true</UseWindowsForms>
     <Deterministic>true</Deterministic>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
-    <LangVersion>9.0</LangVersion>
+    <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
@@ -14,6 +14,10 @@
     <OutputPath>..\..\bin\Debug\</OutputPath>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <OutputPath>..\..\bin\Release\</OutputPath>
+  </PropertyGroup>
+
   <PropertyGroup>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -31,10 +35,6 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <OutputPath>..\..\bin\Release\</OutputPath>
-  </PropertyGroup>
-
   <ItemGroup>
     <None Remove="Connection.ico" />
     <Content Include="Connection.png">
@@ -58,14 +58,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CsvHelper" Version="27.1.0" />
+    <PackageReference Include="CsvHelper" Version="27.1.1" />
     <PackageReference Include="Humanizer.Core" Version="2.11.10" />
-    <PackageReference Include="IsExternalInit" Version="1.0.0">
+    <PackageReference Include="IsExternalInit" Version="1.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="LINQPad.Reference" Version="1.1.0" />
     <PackageReference Include="Microsoft-WindowsAPICodePack-Core" Version="1.1.4" />
+    <PackageReference Include="UnicodeCharsetDetector.Standard" Version="1.0.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Src/CsvLINQPadDriver/DataModel/CsvDataModelGenerator.cs b/Src/CsvLINQPadDriver/DataModel/CsvDataModelGenerator.cs
index 50eebda..072463f 100644
--- a/Src/CsvLINQPadDriver/DataModel/CsvDataModelGenerator.cs
+++ b/Src/CsvLINQPadDriver/DataModel/CsvDataModelGenerator.cs
@@ -72,9 +72,10 @@ IEnumerable<CsvTable> CreateTables()
                     var noBomEncoding = _csvDataContextDriverProperties.NoBomEncoding;
                     var allowComments = _csvDataContextDriverProperties.AllowComments;
                     var ignoreBadData = _csvDataContextDriverProperties.IgnoreBadData;
+                    var autoDetectEncoding = _csvDataContextDriverProperties.AutoDetectEncoding;
 
                     if (_csvDataContextDriverProperties.IgnoreInvalidFiles &&
-                        !file.IsCsvFormatValid(csvSeparator, noBomEncoding, allowComments, ignoreBadData))
+                        !file.IsCsvFormatValid(csvSeparator, noBomEncoding, allowComments, ignoreBadData, autoDetectEncoding))
                     {
                         continue;
                     }
@@ -87,7 +88,7 @@ IEnumerable<CsvTable> CreateTables()
 
                     try
                     {
-                        columns = file.CsvReadHeader(csvSeparator, noBomEncoding, allowComments, ignoreBadData)
+                        columns = file.CsvReadHeader(csvSeparator, noBomEncoding, allowComments, ignoreBadData, autoDetectEncoding)
                             .Select((value, index) => (value, index))
                             .Select(col => new CsvColumn(col.value ?? string.Empty, col.index)
                             {
diff --git a/Src/CsvLINQPadDriver/Directory.Build.props b/Src/CsvLINQPadDriver/Directory.Build.props
index 9085ce4..0d8ccbf 100644
--- a/Src/CsvLINQPadDriver/Directory.Build.props
+++ b/Src/CsvLINQPadDriver/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
-    <Version>6.12.0</Version>
-    <PackageReleaseNotes>UI improvements.
-Files handling improvements.</PackageReleaseNotes>
+    <Version>6.13.0</Version>
+    <PackageReleaseNotes>Added encoding auto-detection.
+Bugfixes.</PackageReleaseNotes>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Src/CsvLINQPadDriver/Extensions/CodeGenExtensions.cs b/Src/CsvLINQPadDriver/Extensions/CodeGenExtensions.cs
index ab962ff..ae09763 100644
--- a/Src/CsvLINQPadDriver/Extensions/CodeGenExtensions.cs
+++ b/Src/CsvLINQPadDriver/Extensions/CodeGenExtensions.cs
@@ -1,5 +1,6 @@
 using System;
 using System.CodeDom.Compiler;
+using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
 
@@ -7,43 +8,41 @@ namespace CsvLINQPadDriver.Extensions
 {
     internal static class CodeGenExtensions
     {
-        private const string SafeChar = "_";
-        private const int MaxLength = 128;
-
-        private static readonly Lazy<CodeDomProvider> CodeDomProvider = new(() => System.CodeDom.Compiler.CodeDomProvider.CreateProvider("C#"));
-        private static readonly Regex CodeNameInvalidCharacters = new(@"[^\p{Ll}\p{Lu}\p{Lt}\p{Lo}\p{Nd}\p{Nl}\p{Mn}\p{Mc}\p{Cf}\p{Pc}\p{Lm}]");
-
+        private static readonly Lazy<CodeDomProvider> CsCodeDomProvider = new(() => CodeDomProvider.CreateProvider("C#"));
         private static readonly string[] InvalidIdentifierNames = { nameof(System), nameof(ToString), nameof(Equals), nameof(GetHashCode) };
 
         public static string GetSafeCodeName(this string? name)
         {
-            var safeName = name ?? string.Empty;
+            const string safeChar = "_";
+            const int maxLength = 128;
 
-            if (safeName.Length > MaxLength)
-            {
-                safeName = safeName[..MaxLength];
-            }
+            var safeName = name ?? string.Empty;
 
-            safeName = CodeNameInvalidCharacters.Replace(safeName, SafeChar);
-            safeName = Regex.Replace(safeName, $"{SafeChar}+", SafeChar);
-            safeName = Regex.Replace(safeName, $"^{SafeChar}+", string.Empty);
+            safeName = Replaces().Aggregate(safeName[..Math.Min(safeName.Length, maxLength)], Replace);
 
             if (string.IsNullOrWhiteSpace(safeName))
             {
-                return $"{SafeChar}empty";
+                return $"{safeChar}empty";
             }
 
             if (!char.IsLetter(safeName, 0))
             {
-                safeName = SafeChar + safeName;
+                safeName = safeChar + safeName;
             }
 
-            if (!CodeDomProvider.Value.IsValidIdentifier(safeName) || InvalidIdentifierNames.Contains(safeName))
+            return !CsCodeDomProvider.Value.IsValidIdentifier(safeName) || InvalidIdentifierNames.Contains(safeName)
+                ? safeName + safeChar
+                : safeName;
+
+            static string Replace(string input, (string Pattern, string Replacement) replace) =>
+                Regex.Replace(input, replace.Pattern, replace.Replacement);
+
+            static IEnumerable<(string Pattern, string Replacement)> Replaces()
             {
-                safeName += SafeChar;
+                yield return (@"[^\p{Ll}\p{Lu}\p{Lt}\p{Lo}\p{Nd}\p{Nl}\p{Mn}\p{Mc}\p{Cf}\p{Pc}\p{Lm}]", safeChar);
+                yield return ($"{safeChar}+", safeChar);
+                yield return ($"^{safeChar}|{safeChar}$", string.Empty);
             }
-
-            return safeName;
         }
     }
 }
diff --git a/Src/CsvLINQPadDriver/Extensions/FileExtensions.cs b/Src/CsvLINQPadDriver/Extensions/FileExtensions.cs
index eed12ca..866b62b 100644
--- a/Src/CsvLINQPadDriver/Extensions/FileExtensions.cs
+++ b/Src/CsvLINQPadDriver/Extensions/FileExtensions.cs
@@ -10,6 +10,8 @@
 
 using Humanizer;
 
+using UnicodeCharsetDetector;
+
 using CsvHelper;
 using CsvHelper.Configuration;
 
@@ -23,6 +25,11 @@ internal static class FileExtensions
 
         private const StringComparison FileNameComparison = StringComparison.OrdinalIgnoreCase;
 
+        private static readonly UnicodeCharsetDetector.UnicodeCharsetDetector UnicodeCharsetDetector = new();
+
+        private static readonly char[] TsvSeparators = "\t,;".ToCharArray();
+        private static readonly char[] CsvSeparators = ",;\t".ToCharArray();
+
         private static readonly StringComparer FileNameComparer = StringComparer.OrdinalIgnoreCase;
         private static readonly HashSet<string> StringInternCache = new();
 
@@ -75,10 +82,18 @@ private static SupportedFileType GetSupportedFileType(this FileType fileType) =>
 
         public static readonly string Filter = string.Join("|", SupportedFileTypes.Select(supportedFileType => $"{supportedFileType.Description} Files (*.{supportedFileType.Mask})|*.{supportedFileType.Mask}"));
 
-        public static IEnumerable<T> CsvReadRows<T>(this string fileName, char? csvSeparator, bool internString, NoBomEncoding noBomEncoding, bool allowComments, bool ignoreBadData, CsvRowMappingBase<T> csvClassMap)
+        public static IEnumerable<T> CsvReadRows<T>(
+            this string fileName,
+            char? csvSeparator,
+            bool internString,
+            NoBomEncoding noBomEncoding,
+            bool allowComments,
+            bool ignoreBadData,
+            bool autoDetectEncoding,
+            CsvRowMappingBase<T> csvClassMap)
             where T : ICsvRowBase, new()
         {
-            return CsvReadRows(fileName, csvSeparator, noBomEncoding, allowComments, ignoreBadData)
+            return CsvReadRows(fileName, csvSeparator, noBomEncoding, allowComments, ignoreBadData, autoDetectEncoding)
                     .Skip(1) // Skip header.
                     .Select(GetRecord);
 
@@ -96,20 +111,28 @@ T GetRecord(string?[] rowColumns)
             }
         }
 
-        public static IEnumerable<string> CsvReadHeader(this string fileName, char? csvSeparator, NoBomEncoding noBomEncoding, bool allowComments, bool ignoreBadData)
+        public static IEnumerable<string> CsvReadHeader(
+            this string fileName,
+            char? csvSeparator,
+            NoBomEncoding noBomEncoding,
+            bool allowComments,
+            bool ignoreBadData,
+            bool autoDetectEncoding)
         {
-            using var csvParser = CreateCsvParser(fileName, csvSeparator, noBomEncoding, allowComments, ignoreBadData);
+            using var csvParser = CreateCsvParser(fileName, csvSeparator, noBomEncoding, allowComments, ignoreBadData, autoDetectEncoding);
 
-            return csvParser.Read() ? csvParser.Record : new string[0];
+            return csvParser.Read()
+                    ? csvParser.Record
+                    : Array.Empty<string>();
         }
 
         public static char CsvDetectSeparator(this string fileName, string[]? csvData = null)
         {
-            var defaultCsvSeparators = (Path.GetExtension(fileName).ToLowerInvariant() switch
+            var defaultCsvSeparators = Path.GetExtension(fileName).ToLowerInvariant() switch
             {
-                "tsv" => "\t,;",
-                _     => ",;\t"
-            }).ToCharArray();
+                ".tsv" => TsvSeparators,
+                _      => CsvSeparators
+            };
 
             var csvSeparator = defaultCsvSeparators.First();
 
@@ -145,7 +168,13 @@ public static char CsvDetectSeparator(this string fileName, string[]? csvData =
             return csvSeparator;
         }
 
-        public static bool IsCsvFormatValid(this string fileName, char? csvSeparator, NoBomEncoding noBomEncoding, bool allowComments, bool ignoreBadData)
+        public static bool IsCsvFormatValid(
+            this string fileName,
+            char? csvSeparator,
+            NoBomEncoding noBomEncoding,
+            bool allowComments,
+            bool ignoreBadData,
+            bool autoDetectEncoding)
         {
             var header = $"{fileName} is not valid CSV file:";
 
@@ -158,7 +187,7 @@ public static bool IsCsvFormatValid(this string fileName, char? csvSeparator, No
 
             try
             {
-                using var csvParser = CreateCsvParser(fileName, csvSeparator, noBomEncoding, allowComments, ignoreBadData);
+                using var csvParser = CreateCsvParser(fileName, csvSeparator, noBomEncoding, allowComments, ignoreBadData, autoDetectEncoding);
 
                 if (!csvParser.Read())
                 {
@@ -220,7 +249,7 @@ public static string GetLongestCommonPrefixPath(this IEnumerable<string> paths)
             var pathsValid = paths.GetFilesOnly().ToImmutableList();
 
             // Get longest common path prefix.
-            var filePaths = pathsValid.FirstOrDefault()?.Split(Path.DirectorySeparatorChar) ?? new string[0];
+            var filePaths = pathsValid.FirstOrDefault()?.Split(Path.DirectorySeparatorChar) ?? Array.Empty<string>();
 
             return Enumerable.Range(1, filePaths.Length)
                 .Select(i => string.Join(Path.DirectorySeparatorChar, filePaths.Take(i).ToImmutableList()))
@@ -292,7 +321,13 @@ private static long GetFileSize(string fileName)
         private static string GetHumanizedFileSize(long size) =>
             size.Bytes().Humanize("0.#");
 
-        private static CsvParser CreateCsvParser(string fileName, char? csvSeparator, NoBomEncoding noBomEncoding, bool allowComments, bool ignoreBadData)
+        private static CsvParser CreateCsvParser(
+            string fileName,
+            char? csvSeparator,
+            NoBomEncoding noBomEncoding,
+            bool allowComments,
+            bool ignoreBadData,
+            bool autoDetectEncoding)
         {
             const int bufferSize = 4096 * 20;
 
@@ -309,7 +344,9 @@ private static CsvParser CreateCsvParser(string fileName, char? csvSeparator, No
             csvConfiguration.Delimiter = csvSeparator?.ToString() ?? csvConfiguration.Delimiter;
             csvConfiguration.BadDataFound = ignoreBadData ? null : csvConfiguration.BadDataFound;
 
-            return new CsvParser(new StreamReader(fileName, NoBomEncodings.Value[noBomEncoding], true, bufferSize / sizeof(char)), csvConfiguration);
+            var encoding = (autoDetectEncoding ? DetectEncoding(fileName) : null) ?? NoBomEncodings.Value[noBomEncoding];
+
+            return new CsvParser(new StreamReader(fileName, encoding, !autoDetectEncoding, bufferSize / sizeof(char)), csvConfiguration);
         }
 
         public record DeduceFileOrFolderResult(bool IsFile, string Path);
@@ -394,9 +431,15 @@ private static IEnumerable<T> SafeWalk<T>(this IEnumerable<T> source, ICollectio
             } while (hasCurrent ?? true);
         }
 
-        private static IEnumerable<string[]> CsvReadRows(string fileName, char? csvSeparator, NoBomEncoding noBomEncoding, bool allowComments, bool ignoreBadData)
+        private static IEnumerable<string[]> CsvReadRows(
+            string fileName,
+            char? csvSeparator,
+            NoBomEncoding noBomEncoding,
+            bool allowComments,
+            bool ignoreBadData,
+            bool autoDetectEncoding)
         {
-            using var csvParser = CreateCsvParser(fileName, csvSeparator, noBomEncoding, allowComments, ignoreBadData);
+            using var csvParser = CreateCsvParser(fileName, csvSeparator, noBomEncoding, allowComments, ignoreBadData, autoDetectEncoding);
 
             while (csvParser.Read())
             {
@@ -430,6 +473,19 @@ static Encoding GetCodePageEncoding(bool user) =>
                 Encoding.GetEncoding(CultureInfo.GetCultureInfo(user ? GetUserDefaultLCID() : GetSystemDefaultLCID()).TextInfo.ANSICodePage);
         }
 
+        private static Encoding? DetectEncoding(string fileName)
+        {
+            try
+            {
+                using var stream = File.OpenRead(fileName);
+                return UnicodeCharsetDetector.Check(stream).ToEncoding();
+            }
+            catch
+            {
+                return null;
+            }
+        }
+
         private static string? StringIntern(string? str)
         {
             if (str is null)
diff --git a/Src/CsvLINQPadDriver/Extensions/Functions.cs b/Src/CsvLINQPadDriver/Extensions/Functions.cs
new file mode 100644
index 0000000..2107c23
--- /dev/null
+++ b/Src/CsvLINQPadDriver/Extensions/Functions.cs
@@ -0,0 +1,8 @@
+namespace CsvLINQPadDriver.Extensions
+{
+    internal static class Functions
+    {
+        public static T Pass<T>(T value) =>
+            value;
+    }
+}
diff --git a/Src/CsvLINQPadDriver/ICsvDataContextDriverProperties.cs b/Src/CsvLINQPadDriver/ICsvDataContextDriverProperties.cs
index a3da4c6..44164a7 100644
--- a/Src/CsvLINQPadDriver/ICsvDataContextDriverProperties.cs
+++ b/Src/CsvLINQPadDriver/ICsvDataContextDriverProperties.cs
@@ -37,6 +37,11 @@ public interface ICsvDataContextDriverProperties
         /// </summary>
         bool IgnoreBadData { get; set; }
 
+        /// <summary>
+        /// Auto-detect encoding.
+        /// </summary>
+        bool AutoDetectEncoding { get; set; }
+
         /// <summary>
         /// Allow CSV comments.
         /// </summary>
diff --git a/Src/CsvLINQPadDriver/SchemaBuilder.cs b/Src/CsvLINQPadDriver/SchemaBuilder.cs
index f3d9c62..02df7ce 100644
--- a/Src/CsvLINQPadDriver/SchemaBuilder.cs
+++ b/Src/CsvLINQPadDriver/SchemaBuilder.cs
@@ -76,7 +76,7 @@ internal static List<ExplorerItem> GetSchemaAndBuildAssembly(ICsvDataContextDriv
                         ToolTipText =
                             $"Drag&drop {similarFilesCount} similar files joined data to text window".JoinNewLine(
                             string.Empty,
-                            $"{string.Join(Environment.NewLine, similarFilesCount <= 3 ? codeNames : codeNames.Take(2).Concat(new []{ "..." }).Concat(codeNames.Skip(similarFilesCount - 1)))}"),
+                            $"{string.Join(Environment.NewLine, similarFilesCount <= 4 ? codeNames : codeNames.Take(2).Concat(new []{ "..." }).Concat(codeNames.Skip(similarFilesCount - 1)))}"),
                         DragText = $@"new []
 {{
 {string.Join(Environment.NewLine, codeNames.Select(n => $"\t{n},"))}
@@ -90,7 +90,7 @@ internal static List<ExplorerItem> GetSchemaAndBuildAssembly(ICsvDataContextDriv
                     }
 
                     bool IsSimilarFile(ExplorerItem explorerItem) =>
-                        filePaths!.Contains(explorerItem.Tag);
+                        filePaths.Contains(explorerItem.Tag);
                 }
             }
 
@@ -117,7 +117,9 @@ private static string[] BuildAssembly(string code, AssemblyName name)
                 SourceCode = new[] { code }
             });
 
-            return result.Successful ? new string[0] : result.Errors;
+            return result.Successful
+                    ? Array.Empty<string>()
+                    : result.Errors;
         }
 
         private static List<ExplorerItem> GetSchema(CsvDatabase db) =>
diff --git a/Src/CsvLINQPadDriver/Wpf/ControlExtensions.cs b/Src/CsvLINQPadDriver/Wpf/ControlExtensions.cs
new file mode 100644
index 0000000..465bd0e
--- /dev/null
+++ b/Src/CsvLINQPadDriver/Wpf/ControlExtensions.cs
@@ -0,0 +1,65 @@
+using System;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace CsvLINQPadDriver.Wpf
+{
+    internal static class ControlExtensions
+    {
+        private static readonly char[] NewLineChars = Environment.NewLine.ToCharArray();
+
+        public static string GetLineTextAtCaretIndex(this TextBox textBox)
+        {
+            var caretIndex = textBox.CaretIndex;
+            var text = textBox.Text;
+            var textLength = text.Length;
+
+            return text[ScanLeft()..ScanRight()];
+
+            int ScanLeft()
+            {
+                var pos = GetCurrentPos();
+
+                for (var newLineCheck = NewLineChars.Length; --newLineCheck != 0 && pos >= 0 && IsNewLine(pos); pos--)
+                {
+                }
+
+                for (; pos >= 0; pos--)
+                {
+                    if (IsNewLine(pos))
+                    {
+                        return pos;
+                    }
+                }
+
+                return 0;
+            }
+
+            int ScanRight()
+            {
+                var pos = GetCurrentPos();
+
+                for (; pos < textLength; pos++)
+                {
+                    if (IsNewLine(pos))
+                    {
+                        return pos;
+                    }
+                }
+
+                return textLength;
+            }
+
+            int GetCurrentPos() =>
+                caretIndex == 0 || caretIndex < textLength
+                    ? caretIndex
+                    : textLength - 1;
+
+            bool IsNewLine(int pos) =>
+                textLength > pos && Array.IndexOf(NewLineChars, text[pos]) != -1;
+        }
+
+        public static void UpdateTargetBinding(this FrameworkElement frameworkElement, DependencyProperty dependencyProperty) =>
+            frameworkElement.GetBindingExpression(dependencyProperty)!.UpdateTarget();
+    }
+}
diff --git a/Src/CsvLINQPadDriver/Wpf/DialogExtensions.cs b/Src/CsvLINQPadDriver/Wpf/DialogExtensions.cs
index a869770..9921d3e 100644
--- a/Src/CsvLINQPadDriver/Wpf/DialogExtensions.cs
+++ b/Src/CsvLINQPadDriver/Wpf/DialogExtensions.cs
@@ -28,8 +28,8 @@ public static bool TryOpenFile(this string title, string filter, string defaultE
             var result = openFileDialog.ShowDialog() == true;
 
             fileNames = result
-                ? openFileDialog.FileNames
-                : new string[0];
+                        ? openFileDialog.FileNames
+                        : Array.Empty<string>();
 
             return result;
         }
diff --git a/Src/CsvLINQPadDriver/app.manifest b/Src/CsvLINQPadDriver/app.manifest
index c04fa24..a0a0b86 100644
--- a/Src/CsvLINQPadDriver/app.manifest
+++ b/Src/CsvLINQPadDriver/app.manifest
@@ -8,7 +8,7 @@
 
     <assemblyIdentity
         name="CsvLINQPadDriver"
-        version="6.12.0.0"
+        version="6.13.0.0"
         type="win32"
     />
 
diff --git a/Src/LPRun/LPRun.csproj b/Src/LPRun/LPRun.csproj
index b77f9cd..e15eac0 100644
--- a/Src/LPRun/LPRun.csproj
+++ b/Src/LPRun/LPRun.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.1</TargetFramework>
     <Deterministic>true</Deterministic>
-    <LangVersion>9.0</LangVersion>
+    <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
@@ -59,7 +59,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="IsExternalInit" Version="1.0.0">
+    <PackageReference Include="IsExternalInit" Version="1.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/Tests/CsvLINQPadDriverTest/CsvLINQPadDriverTest.csproj b/Tests/CsvLINQPadDriverTest/CsvLINQPadDriverTest.csproj
index 87d71bc..486ae93 100644
--- a/Tests/CsvLINQPadDriverTest/CsvLINQPadDriverTest.csproj
+++ b/Tests/CsvLINQPadDriverTest/CsvLINQPadDriverTest.csproj
@@ -3,18 +3,15 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <Deterministic>true</Deterministic>
-    <LangVersion>9.0</LangVersion>
+    <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <OutputPath>..\..\bin\Debug\Tests\</OutputPath>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-  </PropertyGroup>
-
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <OutputPath>..\..\bin\Release\Tests\</OutputPath>
   </PropertyGroup>
diff --git a/Tests/CsvLINQPadDriverTest/LPRunTests.cs b/Tests/CsvLINQPadDriverTest/LPRunTests.cs
index e66ce52..66b3189 100644
--- a/Tests/CsvLINQPadDriverTest/LPRunTests.cs
+++ b/Tests/CsvLINQPadDriverTest/LPRunTests.cs
@@ -26,7 +26,8 @@ public void Init()
             Driver.Install("CsvLINQPadDriver",
                 "CsvLINQPadDriver.dll",
                 "CsvHelper.dll",
-                "Humanizer.dll"
+                "Humanizer.dll",
+                "UnicodeCharsetDetector.dll"
             );
 
             CreateEncodingFiles();
@@ -35,7 +36,10 @@ static void CreateEncodingFiles()
             {
                 var contents = File.ReadAllText(GetFilePath("Utf8Cp65001"), Encoding.Default);
 
-                Array.ForEach(GetEncodings().ToArray(), fileEncoding => File.WriteAllText(GetFilePath(fileEncoding.FileName), contents, fileEncoding.Encoding));
+                Array.ForEach(GetEncodings().ToArray(), WriteFiles);
+
+                void WriteFiles((string FileName, Encoding Encoding) fileEncoding) =>
+                    File.WriteAllText(GetFilePath(fileEncoding.FileName), contents, fileEncoding.Encoding);
 
                 static IEnumerable<(string FileName, Encoding Encoding)> GetEncodings()
                 {
@@ -50,15 +54,17 @@ static string GetFilePath(string fileName) =>
             }
         }
 
+        public record ScriptWithDriverPropertiesTestData(string LinqScriptName, string? Context, ICsvDataContextDriverProperties DriverProperties);
+
         [Test]
-        [TestCaseSource(nameof(TestsData))]
-        public void Execute_ScriptWithDriverProperties_Success((string linqScriptName, string? context, ICsvDataContextDriverProperties driverProperties) testData)
+        [TestCaseSource(nameof(ScriptWithDriverPropertiesTestDataTestsData))]
+        public void Execute_ScriptWithDriverProperties_Success(ScriptWithDriverPropertiesTestData testData)
         {
             var (linqScriptName, context, driverProperties) = testData;
 
-            var queryConfig = GetQueryHeaders().Aggregate(new StringBuilder(), (stringBuilder, h) =>
+            var queryConfig = GetQueryHeaders().Aggregate(new StringBuilder(), (stringBuilder, header) =>
             {
-                stringBuilder.AppendLine(h);
+                stringBuilder.AppendLine(header);
                 stringBuilder.AppendLine();
                 return stringBuilder;
             }).ToString();
@@ -88,7 +94,7 @@ IEnumerable<string> GetQueryHeaders()
             }
         }
 
-        private static IEnumerable<(string linqScriptName, string? context, ICsvDataContextDriverProperties driverProperties)> TestsData()
+        private static IEnumerable<ScriptWithDriverPropertiesTestData> ScriptWithDriverPropertiesTestDataTestsData()
         {
             const string? noContext = null;
             const StringComparison defaultStringComparison = StringComparison.InvariantCulture;
@@ -103,34 +109,34 @@ IEnumerable<string> GetQueryHeaders()
 
             var multipleDriverPropertiesTestData = GetCsvDataContextDriverProperties()
                 .SelectMany(driverProperties =>
-                    linqScriptNames.Select(linqScriptName =>
+                    linqScriptNames.Select(linqScriptName => new ScriptWithDriverPropertiesTestData
                         (linqScriptName, 
                          $"new {{ {nameof(driverProperties.UseSingleClassForSameFiles)} = {driverProperties.UseSingleClassForSameFiles.ToString().ToLowerInvariant()} }}",
                          driverProperties)));
 
             var singleDriverPropertiesTestData = new[] { "Extensions", "SimilarFilesRelations" }
-                .Select(linqFile =>
+                .Select(linqFile => new ScriptWithDriverPropertiesTestData
                     (linqFile, 
                      noContext,
                      defaultCsvDataContextDriverProperties));
 
             var stringComparisonDriverPropertiesTestData = ((StringComparison[])Enum.GetValues(typeof(StringComparison)))
                 .SelectMany(stringComparison =>
-                    new [] { "StringComparison", "Encoding" }.Select(linqFile =>
+                    new [] { "StringComparison", "Encoding" }.Select(linqFile => new ScriptWithDriverPropertiesTestData
                         (linqFile,
                          $"new {{ {nameof(defaultCsvDataContextDriverProperties.StringComparison)} = {nameof(StringComparison)}.{stringComparison} }}",
                          GetDefaultCsvDataContextDriverPropertiesObject(stringComparison))));
 
             var allowCommentsTestData = new[] { true, false }
-                .Select(allowComments =>
+                .Select(allowComments => new ScriptWithDriverPropertiesTestData
                         ("Comments",
                          $"new {{ ExpectedCount = {(allowComments ? 1 : 2)} }}",
                          GetDefaultCsvDataContextDriverPropertiesObject(defaultStringComparison, allowComments)));
 
             return multipleDriverPropertiesTestData
-                    .Concat(singleDriverPropertiesTestData!)
+                    .Concat(singleDriverPropertiesTestData)
                     .Concat(allowCommentsTestData)
-                    .Concat(stringComparisonDriverPropertiesTestData)!;
+                    .Concat(stringComparisonDriverPropertiesTestData);
 
             IEnumerable<ICsvDataContextDriverProperties> GetCsvDataContextDriverProperties()
             {