Refactoring and fixing code analyse issues

Baudin999 · Dec 19, 2019 · 6bc2bd5 · 6bc2bd5
1 parent 11b1e0c
commit 6bc2bd5
Show file tree

Hide file tree

Showing 46 changed files with 121 additions and 132 deletions.
diff --git a/ApplicationTests/ParseMultipleFiles.cs b/ApplicationTests/ParseMultipleFiles.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using System.IO;
 using System.Threading.Tasks;
 using CLI;
@@ -9,15 +10,17 @@ namespace ApplicationTests
 {
     public class ParseMultipleFiles : IDisposable
     {
-        private readonly ITestOutputHelper output;
+
         private readonly string dir = Path.GetFullPath("ParseMultipleFiles", Directory.GetCurrentDirectory());
         private readonly Project project;
-        public ParseMultipleFiles(ITestOutputHelper output)
+        public ParseMultipleFiles()
         {
             try
             {
                 Directory.Delete(dir, true);
-            } catch (Exception) { }
+            } catch (Exception) {
+                Debug.WriteLine("Delete Directory failed in unit test.");
+            }
             Directory.CreateDirectory(dir);
             File.WriteAllText(path("First.car"), @"# The first document
 
@@ -29,12 +32,13 @@ open Person
 type School
 ");
 
-            this.output = output;
             project = new Project(dir);
         }
 
         [Fact]
+#pragma warning disable IDE0051 // Remove unused private members
         private void CreateModule()
+#pragma warning restore IDE0051 // Remove unused private members
         {
             Assert.Equal(2, project.Modules.Count);
             var second = project.FindModule("Second");

diff --git a/ApplicationTests/ProjectFileWatcher.cs b/ApplicationTests/ProjectFileWatcher.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using System.IO;
 using System.Threading.Tasks;
 using CLI;
@@ -17,7 +18,9 @@ public ProjectFileWatcher(ITestOutputHelper output)
             try
             {
                 Directory.Delete(dir, true);
-            } catch (Exception) { }
+            } catch (Exception) {
+                Debug.WriteLine("Delete Directory failed in unit test.");
+            }
 
             this.output = output;
             project = new Project(dir);
@@ -30,7 +33,9 @@ public ProjectFileWatcher(ITestOutputHelper output)
         }
 
         [Fact]
+#pragma warning disable IDE0051 // Remove unused private members
         private void CreateModule()
+#pragma warning restore IDE0051 // Remove unused private members
         {
             project.CreateModule("Test");
             Assert.True(File.Exists(path("Test.car")));

diff --git a/CLI/CLI.csproj b/CLI/CLI.csproj
@@ -17,12 +17,13 @@
     <ProjectReference Include="..\Mapper.JSON\Mapper.JSON.csproj" />
     <ProjectReference Include="..\Mapper.HTML\Mapper.HTML.csproj" />
     <ProjectReference Include="..\Mapper.Application\Mapper.Application.csproj" />
+    <ProjectReference Include="..\Configuration\Configuration.csproj" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
     <PackageReference Include="System.IO.FileSystem" Version="4.3.0" />
     <PackageReference Include="System.IO.FileSystem.Watcher" Version="4.3.0" />
-    <PackageReference Include="Bogus" Version="28.4.2" />
+    <PackageReference Include="Bogus" Version="28.4.4" />
     <PackageReference Include="LiteDB" Version="4.1.4" />
   </ItemGroup>
   <ItemGroup>

diff --git a/CLI/Controllers/ModuleController.cs b/CLI/Controllers/ModuleController.cs
@@ -104,7 +104,7 @@ public async Task<IActionResult> SaveModuleTextAsync(string module)
 
             if (m is null)
             {
-                return await Task.Run(() => NotFound());
+                return await Task.Run(NotFound);
             }
             else { 
                 using (var reader = new StreamReader(Request.Body, Encoding.UTF8))

diff --git a/CLI/Controllers/RouteController.cs b/CLI/Controllers/RouteController.cs
@@ -18,11 +18,11 @@ public MonitorController(IActionDescriptorCollectionProvider provider)
         public IActionResult GetRoutes()
         {
             var rs = _provider.ActionDescriptors.Items;
-            var routes = rs.Select(x => new {
-                Controller = x.RouteValues["controller"],
-                Action = x.RouteValues["action"],
-                Url = $"{x.RouteValues["controller"]}/{x.RouteValues["action"]}"
-            }).ToList();
+            var routes = rs.Select(x => (
+                Controller: x.RouteValues["controller"],
+                Action: x.RouteValues["action"],
+                Url: $"{x.RouteValues["controller"]}/{x.RouteValues["action"]}"
+            )).ToList();
             return Ok(routes);
         }
     }

diff --git a/CLI/Database.cs b/CLI/Database.cs
@@ -7,7 +7,7 @@
 
 namespace CLI
 {
-    public class Database
+    public static class Database
     {
         private static string path = Path.Combine(Project.Current?.OutPath ?? "", "Lexicon.db");
         private static ConnectionString ConnectionString()

diff --git a/CLI/Module.cs b/CLI/Module.cs
@@ -5,6 +5,7 @@
 using Compiler;
 using Compiler.AST;
 using Mapper.Application;
+using Configuration;
 
 namespace CLI
 {
@@ -20,7 +21,6 @@ public class Module : IDisposable
         public ASTGenerator Generator { get; private set; }
         public DateTime LastParsed { get; private set; }
 
-
         public Module(string path, string basePath, Project project)
         {
             this.Path = path;
@@ -45,7 +45,7 @@ public void Parse()
 
         public void SaveModuleOutput(bool decend = true, bool suppressMessage = false)
         {
-            this.Transpiler.StartTranspilation(this.Name);
+            this.Transpiler.StartTranspilation(this.Name, Project.CarConfig?.ErdConfig ?? new ErdConfig());
             if (!suppressMessage)
             {
                 Console.WriteLine($"Perfectly parsed: {Name}");
@@ -114,7 +114,7 @@ private string ReadModuleText()
             }
             catch (IOException ioe)
             {
-                Console.WriteLine("ReadModuleText: Caught Exception reading file [{0}]", ioe.ToString());
+                Console.WriteLine("ReadModuleText: Caught Exception reading file [{0}]", ioe);
                 throw ioe;
             }
         }

diff --git a/CLI/Project.CarConfig.cs b/CLI/Project.CarConfig.cs
@@ -1,4 +1,5 @@
 using System;
+using Configuration;
 
 namespace CLI
 {

diff --git a/CLI/Project.cs b/CLI/Project.cs
@@ -8,6 +8,7 @@
 using System.Threading.Tasks;
 using CLI.Signals;
 using Compiler.AST;
+using Configuration;
 
 namespace CLI
 {
@@ -103,7 +104,7 @@ Have fun with your module!
             }
             catch (IOException ioe)
             {
-                Console.WriteLine("ReadModuleText: Caught Exception reading file [{0}]", ioe.ToString());
+                Console.WriteLine("ReadModuleText: Caught Exception reading file [{0}]", ioe);
                 throw ioe;
             }
         }
@@ -249,7 +250,7 @@ public void Dispose()
 
         }
 
-        private class Helpers
+        private static class Helpers
         {
             public static string ReadAsset(string name)
             {

diff --git a/CLI/Transpiler.cs b/CLI/Transpiler.cs
@@ -8,6 +8,7 @@
 using Mapper.HTML;
 using Mapper.JSON;
 using Mapper.XSD;
+using Configuration;
 
 namespace CLI
 {
@@ -63,15 +64,15 @@ public Dictionary<string, string> JsonToString()
         }
 
 
-        public void StartTranspilation(string moduleName = "")
+        public void StartTranspilation(string moduleName, ErdConfig erdConfig)
         {
             this.Imports = ImportResolver.ResolveImports(this.Generator);
             this.Generator.Resolve(this.Imports);
 
             this.XsdMapper = new XSDMapper(this.Generator);
             this.XsdMapper.Start().ToList();
 
-            this.HtmlMapper = new HtmlMapper(this.Generator);
+            this.HtmlMapper = new HtmlMapper(this.Generator, erdConfig);
             this.HtmlMapper.Start().ToList();
 
             this.JsonMapper = new JsonMapper(this.Generator);

diff --git a/CLI/WebServer.cs b/CLI/WebServer.cs
@@ -9,7 +9,7 @@
 
 namespace CLI
 {
-    public class WebServer
+    public static class WebServer
     {
         public static string RootPath = "";
         public static Task Start(string rootPath)

diff --git a/Compiler/AST/ASTData.cs b/Compiler/AST/ASTData.cs
@@ -66,7 +66,6 @@ public object Clone()
                 ObjectCloner.CloneList(this.Annotations.ToList()),
                 ObjectCloner.CloneList(this.Directives.ToList()),
                 ObjectCloner.CloneList(this.Options.ToList()));
-            { };
         }
     }
 }
diff --git a/Compiler/AST/ASTMarkdown.cs b/Compiler/AST/ASTMarkdown.cs
diff --git a/Compiler/AST/ASTTypeField.cs b/Compiler/AST/ASTTypeField.cs
@@ -168,7 +168,7 @@ public void SetRestriction(string key, string value, ASTRestriction original)
         }
 
         public bool Equals([AllowNull] ASTTypeField x, [AllowNull] ASTTypeField y) => x.Name == y.Name;
-        public int GetHashCode([DisallowNull] ASTTypeField obj) => ((object)obj).GetHashCode();
+        public int GetHashCode([DisallowNull] ASTTypeField obj) => obj.GetHashCode();
 
         public override string ToString() => $"{Name}: {String.Join(" ", Types)};";
     }

diff --git a/Compiler/Lexer.cs b/Compiler/Lexer.cs
@@ -46,7 +46,7 @@ public IEnumerable<Token> Lex(string code)
                 {
                     context = true;
                     var token = TokenLexers.Word(input);
-                    yield return new Token() {
+                    yield return new Token {
                         EndLine = input.Line,
                         EndColumn = 0,
                         StartLine = input.Line,
@@ -75,7 +75,7 @@ public IEnumerable<Token> Lex(string code)
                     yield return TokenLexers.TakeUntillEndOfContext(input);
                     if (context)
                     {
-                        yield return new Token() {
+                        yield return new Token {
                             EndLine = input.Line,
                             EndColumn = 0,
                             StartLine = input.Line,
@@ -87,7 +87,7 @@ public IEnumerable<Token> Lex(string code)
                 else if (context && Char2.IsNewLine(input.Current) && TokenLexers.EndContext(input, 1))
                 {
                     context = false;
-                    yield return new Token() {
+                    yield return new Token {
                         EndLine = input.Line,
                         EndColumn = 0,
                         StartLine = input.Line,
@@ -203,7 +203,7 @@ public IEnumerable<Token> Lex(string code)
             // we'll want to end the context, jsut for good measure!
             if (context)
             {
-                yield return new Token() {
+                yield return new Token {
                     EndLine = input.Line,
                     EndColumn = 0,
                     StartLine = input.Line,
@@ -213,7 +213,7 @@ public IEnumerable<Token> Lex(string code)
                 context = false;
             }
 
-            yield return new Token() {
+            yield return new Token {
                 EndLine = input.Line,
                 EndColumn = 0,
                 StartLine = input.Line,

diff --git a/Compiler/Pipeline.cs b/Compiler/Pipeline.cs
diff --git a/Compiler/Token.cs b/Compiler/Token.cs
@@ -45,7 +45,7 @@ public object Clone()
             {
                 Value = (string)this.Value.Clone(),
                 // Performing a lookup will ensure copy by value
-                TokenType = (TokenType)((int)this.TokenType),
+                TokenType = (TokenType)this.TokenType,
 
                 // int's are never copied by reference, no need to clone
                 StartColumn = this.StartColumn,

diff --git a/Compiler/Tokens/Lexer.GenericParameter.cs b/Compiler/Tokens/Lexer.GenericParameter.cs
@@ -17,15 +17,15 @@ public static Token GenericParameter(Input input)
             var startColumn = input.Column;
             var startLine = input.Line;
 
-            StringBuilder builder = new StringBuilder();
+            var builder = new StringBuilder();
             builder.Append(input.Current);
 
             while (input.HasNext() && Char.IsLetter(input.Next()))
             {
                 builder.Append(input.Current);
             }
 
-            return new Token()
+            return new Token
             {
                 StartIndex = start,
                 StartColumn = startColumn,

diff --git a/Compiler/Tokens/Lexer.Identifier.cs b/Compiler/Tokens/Lexer.Identifier.cs
@@ -16,13 +16,13 @@ public static Token Identifier(Input input)
             var startColumn = input.Column;
             var startLine = input.Line;
 
-            StringBuilder builder = new StringBuilder();
+            var builder = new StringBuilder();
             while (input.HasNext() && (char.IsLetter(input.Current) || char.IsNumber(input.Current)))
             {
                 builder.Append(input.Current);
                 input.Next();
             }
-            return new Token()
+            return new Token
             {
                 StartIndex = start,
                 StartColumn = startColumn,
@@ -46,13 +46,13 @@ public static Token QualifiedIdentifier(Input input)
             var startColumn = input.Column;
             var startLine = input.Line;
 
-            StringBuilder builder = new StringBuilder();
+            var builder = new StringBuilder();
             while (input.HasNext() && (char.IsLetter(input.Current) || char.IsNumber(input.Current) || input.Current == '.'))
             {
                 builder.Append(input.Current);
                 input.Next();
             }
-            return new Token()
+            return new Token
             {
                 StartIndex = start,
                 StartColumn = startColumn,

diff --git a/Compiler/Tokens/Lexer.Indent.cs b/Compiler/Tokens/Lexer.Indent.cs
@@ -7,7 +7,7 @@ internal static Token TakeIndent(Input input)
         {
             input.Next();
 
-            return new Token()
+            return new Token
             {
                 StartIndex = input.Position - 1,
                 StartColumn = input.Column - 1,

diff --git a/Compiler/Tokens/Lexer.NewLine.cs b/Compiler/Tokens/Lexer.NewLine.cs
@@ -5,7 +5,7 @@ public static partial class TokenLexers
     {
         internal static Token TakeNewLine(Input input)
         {
-            var result = new Token()
+            var result = new Token
             {
                 StartIndex = input.Position,
                 StartColumn = input.Column,