Some code cleanup

Author: paul1956

CodeCoverage/Assets/BigFace.xml

@@ -8821,4 +8821,4 @@
             </Color>
         </Category>
     </Theme>
-</Themes>
+</Themes>

CodeCoverage/CodeCoverage.vbproj

@@ -74,9 +74,6 @@
             <Version>3.7.0</Version>
         </PackageReference>
         <PackageReference Include="Microsoft.VisualBasic" Version="10.3.0" />
-        <PackageReference Include="Newtonsoft.Json">
-            <Version>12.0.3</Version>
-        </PackageReference>
         <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
     </ItemGroup>
     <ItemGroup>

CodeCoverage/Coverlet/ColorRTB.vb

@@ -9,8 +9,6 @@ Imports CodeCoverage.Coverlet.Core
 
 Imports Microsoft.CodeAnalysis
 
-Imports VBMsgBox
-
 Public Module ColorRTB
 
     Private Sub BuildLineTables(ConversionBuffer As RichTextBox, ByRef LineStarts() As Integer, ByRef LineEnds() As Integer)
@@ -162,14 +160,8 @@ Public Module ColorRTB
         Try ' Prevent crash when exiting
             With ConversionBuffer
                 .Clear()
-                .Select(.TextLength, 0)
-                Dim TextToCompile As String = Nothing
-                Using FileStream As FileStream = File.OpenRead(FileName)
-                    TextToCompile = GetFileTextFromStream(FileStream)
-                    Application.DoEvents()
-                    Colorize(CallingForm, TextToCompile, ConversionBuffer, FileName, ProgressBar)
-                End Using
-
+                Call .Select(.TextLength, 0)
+                Colorize(CallingForm, File.ReadAllText(FileName), ConversionBuffer, FileName, ProgressBar)
             End With
         Catch ex As Exception
             Stop

CodeCoverage/Coverlet/CoverageColorSelector.vb renamed to CodeCoverage/Coverlet/CoverageColorColors.vb

@@ -1,6 +1,6 @@
 Imports System.IO
 
-Public Module CoverageColorSelector
+Public Module CoverageColorColors
 
     Private ReadOnly FullPath As String = Path.Combine(FileIO.SpecialDirectories.MyDocuments, "CodeCoverageColorDictionary.csv")
 
@@ -59,13 +59,13 @@ Public Module CoverageColorSelector
     Friend Function GetColorFromName(Name As String) As (Foreground As Color, Background As Color)
         Try
             If String.IsNullOrWhiteSpace(Name) Then
-                Return CodeColorSelector.ColorMappingDictionary("default")
+                Return SyntaxHighlightingColors.ColorMappingDictionary("default")
             End If
-            Return CodeColorSelector.ColorMappingDictionary(Name)
+            Return SyntaxHighlightingColors.ColorMappingDictionary(Name)
         Catch ex As Exception
             Debug.Print($"GetColorFromName missing({Name})")
             Stop
-            Return CodeColorSelector.ColorMappingDictionary("error")
+            Return SyntaxHighlightingColors.ColorMappingDictionary("error")
         End Try
     End Function
 

CodeCoverage/Coverlet/CoverageColors.vb

@@ -72,4 +72,5 @@
             ColorMappingDictionary("Method Missed") = (value, ColorMappingDictionary("Default").Background)
         End Set
     End Property
+
 End Class

CodeCoverage/Coverlet/CoverageResult.vb

@@ -4,64 +4,83 @@
 
 Namespace Coverlet.Core
 
+    Public Class BranchesCollection
+        Inherits List(Of BranchInfo)
+
+        Sub New()
+
+        End Sub
+
+    End Class
+
     Public Class BranchInfo
 
+        Public Property EndOffset As Integer
+        Public Property Hits As Integer
         Public Property Line As Integer
 
         Public Property Offset As Integer
+        Public Property Ordinal As UInteger
+        Public Property Path As Integer
+    End Class
 
-        Public Property EndOffset As Integer
+    Public Class ClassesDictionary
+        Inherits Dictionary(Of String, MethodsDictionary)
 
-        Public Property Path As Integer
+        Sub New()
 
-        Public Property Ordinal As UInteger
+        End Sub
 
-        Public Property Hits As Integer
+    End Class
+
+    Public Class DocumentsDictionary
+        Inherits Dictionary(Of String, ClassesDictionary)
+
+        Sub New()
+
+        End Sub
 
     End Class
 
     Public Class LinesDictionary
         Inherits SortedDictionary(Of Integer, Integer)
-    End Class
 
-    Public Class BranchesCollection
-        Inherits List(Of BranchInfo)
+        Sub New()
+
+        End Sub
+
     End Class
 
     Public Class Method
 
-        Friend Sub New()
+        Public Sub New()
 
             Lines = New LinesDictionary
 
             Branches = New BranchesCollection()
 
         End Sub
 
-        Public ReadOnly Property Lines As LinesDictionary
-
         Public ReadOnly Property Branches As BranchesCollection
-
+        Public ReadOnly Property Lines As LinesDictionary
     End Class
 
     Public Class MethodsDictionary
         Inherits Dictionary(Of String, Method)
 
-    End Class
-
-    Public Class ClassesDictionary
-        Inherits Dictionary(Of String, MethodsDictionary)
-
-    End Class
+        Sub New()
 
-    Public Class DocumentsDictionary
-        Inherits Dictionary(Of String, ClassesDictionary)
+        End Sub
 
     End Class
 
     Public Class ModulesDictionary
         Inherits Dictionary(Of String, DocumentsDictionary)
 
+        Sub New()
+
+        End Sub
+
     End Class
 
 End Namespace

CodeCoverage/Coverlet/CoverletTreeView.vb

@@ -15,12 +15,12 @@ Namespace Coverlet.Core
 
         Friend Sub New(JSONFileWithPath As String, TreeView1 As TreeView, ByRef DocumentList As List(Of DirectoryClass), MethodsList As List(Of MethodClass))
             Dim jsonString As String
-            Using FileStream As FileStream = File.OpenRead(JSONFileWithPath)
-                jsonString = GetFileTextFromStream(FileStream)
-            End Using
+            jsonString = File.ReadAllText(JSONFileWithPath)
             DocumentCoverageModifiedDate = File.GetLastWriteTime(JSONFileWithPath)
             DocumentCoverageSummary = New CoverageSummary
-            _CodeCoverageRoot = Newtonsoft.Json.JsonConvert.DeserializeObject(Of ModulesDictionary)(jsonString)
+
+            _CodeCoverageRoot = Text.Json.JsonSerializer.Deserialize(Of ModulesDictionary)(jsonString)
+
             Dim FileInfo As FileInfo = New FileInfo(JSONFileWithPath)
             Dim parentNode As TreeNode = TreeView1.Nodes.Add($"Code Coverage, file {FileInfo.Directory.Name}{Path.PathSeparator}{FileInfo.Name}, Last Updated {FileInfo.LastWriteTime.Date.ToShortDateString} {FileInfo.LastWriteTime.TimeOfDay.Hours}:{FileInfo.LastWriteTime.ToShortTimeString}")
             TreeView1.Nodes(0).Tag = CodeCoverageTag
@@ -197,6 +197,7 @@ Namespace Coverlet.Core
             ColorParentNodes(parentNode, BackColor)
             Return Hit
         End Function
+
         Public Shared Function GetModule(FileNameWithPath As String) As ClassesDictionary
             If CodeCoverageRoot IsNot Nothing AndAlso CodeCoverageRoot.Count > 0 Then
                 For Each ngObject As KeyValuePair(Of String, DocumentsDictionary) In CodeCoverageRoot

CodeCoverage/Coverlet/Extensions/ControlExtensions.vb

@@ -1,11 +1,13 @@
 Option Explicit On
 Option Infer Off
 Option Strict On
+
 Imports System.Runtime.CompilerServices
 
 Imports CodeCoverage.Microsoft.VisualBasic.CompilerServices.NativeMethods
 
 Public Module ControlExtensions
+
     <Extension()>
     Friend Sub Suspend(Crtl As Control)
         LockWindowUpdate(Crtl.Handle)

CodeCoverage/DirectoryClass.vb

@@ -3,6 +3,7 @@
 ' See the LICENSE file in the project root for more information.
 
 Public Class DirectoryClass
+
     Sub New(mShortName As String, mFullname As String, mDirectoryNode As TreeNode)
         _ShortName = mShortName
         _FullPath = mFullname

CodeCoverage/Extensions/StringExtensions.vb

@@ -18,4 +18,5 @@ Public Module StringExtensions
         Contracts.Contract.Requires(value IsNot Nothing)
         Return value.Count(Function(c As Char) c = ch)
     End Function
+
 End Module

CodeCoverage/Form1.vb

@@ -49,8 +49,8 @@ Public Class Form1
             My.Settings.Save()
         End If
 
-        CoverageColorSelector.UpdateColorDictionaryFromFile()
-        CodeColorSelector.UpdateDictionaryFromFile()
+        CoverageColorColors.UpdateColorDictionaryFromFile()
+        SyntaxHighlightingColors.UpdateDictionaryFromFile()
 
         Dim ExecutablePath As String = Reflection.Assembly.GetExecutingAssembly().Location
         Dim ExecutableDirectory As String = Directory.GetParent(ExecutablePath).FullName

CodeCoverage/GlobalSuppressions.vb

@@ -0,0 +1,9 @@
+' This file is used by Code Analysis to maintain SuppressMessage
+' attributes that are applied to this project.
+' Project-level suppressions either have no target or are given
+' a specific target and scoped to a namespace, type, member, etc.
+
+Imports System.Diagnostics.CodeAnalysis
+
+<Assembly: SuppressMessage("Performance", "CA1819:Properties should not return arrays", Justification:="<Pending>", Scope:="member", Target:="~P:CodeCoverage.ThemesTheme.Category")>
+<Assembly: SuppressMessage("Performance", "CA1819:Properties should not return arrays", Justification:="<Pending>", Scope:="member", Target:="~P:CodeCoverage.ThemesThemeCategory.Color")>

CodeCoverage/MethodClass.vb

@@ -35,4 +35,5 @@ Public Class MethodClass
         End If
         Return MethodNameWithParameters.Substring(0, Math.Min(70, MethodNameWithParameters.Length)) & "..."
     End Function
+
 End Class

CodeCoverage/My Project/MySettingsProperty.vb

@@ -1,5 +1,4 @@
-
-Imports CodeCoverage.CodeCoverage.My_Project
+Imports CodeCoverage.CodeCoverage.My_Project
 
 Namespace My
 

CodeCoverage/MyListItem.vb

@@ -1,4 +1,5 @@
 Public Class MyListItem
+
     Sub New(pText As String, pValue As String)
         _Text = pText
         _Value = pValue