Поправлены правила. Исправлен параметр формирования деталировки

SQLLinter.CLI/Program.cs

@@ -43,6 +43,7 @@ namespace SQLLinter.CLI
                     ["UpdateWhere"] = Common.RuleViolationSeverity.Critical,
                     ["UpperLower"] = Common.RuleViolationSeverity.Critical,
                     ["SetVariable"] = Common.RuleViolationSeverity.Critical,
+                    ["CreateProcedureInDbo"] = Common.RuleViolationSeverity.Warning,
                 },
                 GenerateDetails = false,
             };
@@ -62,30 +63,30 @@ namespace SQLLinter.CLI
 
                 Dictionary<string, Stream> files = new();
 
-                for (int i = 0; i < 2; i++)
+                for (int i = 0; i < 5; i++)
                 {
                     files[name + i + ".sql"] = reader.BaseStream;
                 }
 
                 linter.Run(files);
-                //diagramer.Run("test.sql", reader.BaseStream);
+                diagramer.Run("test.sql", reader.BaseStream);
             }
 
             //linter.Run(@"C:\Users\frost\Desktop\DISTR-2599\test.sql");
 
             IReportFormatter formatter = new F.v3.HtmlReportFormatter();
-            var content = formatter.Format(rep.Violations, null);
+            var content = formatter.Format(rep.Violations, bpmn);
 
             File.WriteAllText(@"C:\Users\frost\Downloads\Telegram Desktop\test3.html", content);
 
 
             formatter = new F.v2.HtmlReportFormatter();
-            content = formatter.Format(rep.Violations, null);
+            content = formatter.Format(rep.Violations, bpmn);
             File.WriteAllText(@"C:\Users\frost\Downloads\Telegram Desktop\test2.html", content);
 
 
             formatter = new F.v1.HtmlReportFormatter();
-            content = formatter.Format(rep.Violations, null);
+            content = formatter.Format(rep.Violations, bpmn);
             File.WriteAllText(@"C:\Users\frost\Downloads\Telegram Desktop\test1.html", content);
         }
     }

SQLLinter/Common/BaseRuleVisitor.cs

@@ -83,8 +83,12 @@ public abstract class BaseRuleVisitor : TSqlFragmentVisitor, IRule
         return string.Format(this.Text, param);
     }
 
+
     private TSqlFragment? FindContextBlock(TSqlFragment node)
     {
+        if (_parents == null) return null;
+        return node;
+
         var current = node;
 
         while (current != null)
@@ -104,6 +108,14 @@ public abstract class BaseRuleVisitor : TSqlFragmentVisitor, IRule
                 case SchemaObjectFunctionTableReference:
                     return current;
 
+                // DML
+                case InsertStatement:
+                case UpdateStatement:
+                case DeleteStatement:
+                case MergeStatement:
+                    return current;
+
+
                 // ---- Новые блоки для SqlDataTypeReference ----
 
                 // Определение столбца
@@ -131,7 +143,6 @@ public abstract class BaseRuleVisitor : TSqlFragmentVisitor, IRule
     }
 
 
-
     // Вспомогательные классы
     public class ExtractedBlock
     {
@@ -157,13 +168,15 @@ public abstract class BaseRuleVisitor : TSqlFragmentVisitor, IRule
 
     protected ExtractedBlock? ExtractBlock(TSqlFragment? node, TSqlFragment errorNode)
     {
-        if (node == null || node.ScriptTokenStream == null)
+        if (node == null || errorNode.ScriptTokenStream == null)
             return null;
 
+        var endLine = errorNode.ScriptTokenStream.Where(t => t.Offset < node.StartOffset + node.FragmentLength).Max(t => t.Line) + 2;
+
         // 1. Получаем токены для блока
-        var tokens = node.ScriptTokenStream
-            .Where(t => t.Line >= node.StartLine &&
-                        t.Offset < node.StartOffset + node.FragmentLength)
+        var tokens = errorNode.ScriptTokenStream
+            .Where(t => t.Line >= node.StartLine - 2 &&
+                        t.Line <= endLine)
             .ToList();
 
         if (tokens.Count == 0)

SQLLinter/Common/IRule.cs

@@ -13,5 +13,6 @@ public interface IRule
     int DynamicSqlStartLine { get; set; }
 
     IEnumerable<Violation> Analyze(TSqlFragment fragment);
+
     void SetParents(Dictionary<TSqlFragment, TSqlFragment?>? parents);
 }

SQLLinter/Infrastructure/Parser/SqlRuleVisitor.cs

@@ -3,7 +3,6 @@ using SQLLinter.Common;
 using SQLLinter.Core.Interfaces;
 using SQLLinter.Infrastructure.Configuration.Overrides;
 using SQLLinter.Infrastructure.Interfaces;
-using SQLLinter.Infrastructure.Rules;
 using SQLLinter.Infrastructure.Rules.RuleExceptions;
 using SQLLinter.Infrastructure.Rules.RuleViolations;
 using System.Data;
@@ -39,7 +38,8 @@ public class SqlRuleVisitor : IRuleVisitor
 
         if (sqlFragment == null) return;
 
-        Dictionary<TSqlFragment, TSqlFragment?>? parentMap = generateDetails ? ParentMapBuilder.Build(sqlFragment) : null;
+        //Dictionary<TSqlFragment, TSqlFragment?>? parentMap = generateDetails ? ParentMapBuilder.Build(sqlFragment) : null;
+        Dictionary<TSqlFragment, TSqlFragment?>? parentMap = generateDetails ? new Dictionary<TSqlFragment, TSqlFragment?>() : null;
 
         var ruleExceptions = ignoredRules as IRuleException[] ?? ignoredRules.ToArray();
         if (errors.Any())

SQLLinter/Infrastructure/Reporters/Formatters/Html/v1/HtmlReportFormatter_v1.cs

@@ -143,6 +143,6 @@ public class HtmlReportFormatter : IReportFormatter
         sb.AppendLine("</body>");
         sb.AppendLine("</html>");
 
-        return HtmlMinifier.MinifyHtml(sb.ToString());
+        return sb.ToString();
     }
 }

SQLLinter/Infrastructure/Reporters/Formatters/Html/v2/HtmlReportFormatter_v2.cs

@@ -225,7 +225,7 @@ public class HtmlReportFormatter : IReportFormatter
             var lineClass = "code-line";
             if (isErrorLine)
             {
-                lineClass += " error-line";
+                lineClass += $" {errorSeverity}-line";
             }
 
             sb.Append($"<div class=\"{lineClass}\">");

SQLLinter/Infrastructure/Rules/AlterProcedureInDboRule.cs

@@ -12,7 +12,7 @@ public class AlterProcedureInDboRule : BaseRuleVisitor
     {
         if (node.ProcedureReference.Name.SchemaIdentifier?.Value.Equals("dbo", StringComparison.OrdinalIgnoreCase) == true)
         {
-            AddViolation(node, SQLHelpers.ObjectGetFullName(node.ProcedureReference.Name));
+            AddViolation(node.ProcedureReference.Name.SchemaIdentifier, SQLHelpers.ObjectGetFullName(node.ProcedureReference.Name));
         }
     }
 }

SQLLinter/Infrastructure/Rules/ConditionalBeginEndRule.cs

@@ -17,14 +17,20 @@ public class ConditionalBeginEndRule : BaseRuleVisitor, IRule
 
     public override void Visit(IfStatement node)
     {
-        if (node.ThenStatement is not BeginEndBlockStatement)
+        if (node.ThenStatement != null && node.ThenStatement is not BeginEndBlockStatement && node.ThenStatement is not TryCatchStatement)
         {
-            AddViolation(node);
+            if (node.ThenStatement.StartLine != node.StartLine || node.ScriptTokenStream.Where(t => t.Offset <= node.ThenStatement.StartOffset + node.ThenStatement.FragmentLength).Max(t => t.Line) != node.StartLine)
+            {
+                AddViolation(node.ThenStatement);
+            }
         }
 
-        if (node.ElseStatement != null && node.ElseStatement is not BeginEndBlockStatement && node.ElseStatement is not IfStatement)
+        if (node.ElseStatement != null && node.ElseStatement is not BeginEndBlockStatement && node.ElseStatement is not TryCatchStatement && node.ElseStatement is not IfStatement)
         {
-            AddViolation(Name, Text, GetLineNumber(node.ElseStatement), GetColumnNumber(node.ElseStatement));
+            if (node.ElseStatement.StartLine != node.StartLine || node.ScriptTokenStream.Where(t => t.Offset <= node.ElseStatement.StartOffset + node.ElseStatement.FragmentLength).Max(t => t.Line) != node.StartLine)
+            {
+                AddViolation(node.ElseStatement);
+            }
         }
     }
 

SQLLinter/Infrastructure/Rules/CreateProcedureInDboRule.cs

@@ -12,14 +12,14 @@ public class CreateProcedureInDboRule : BaseRuleVisitor
     {
         if (node.ProcedureReference.Name.SchemaIdentifier?.Value.Equals("dbo", StringComparison.OrdinalIgnoreCase) == true)
         {
-            AddViolation(node, SQLHelpers.ObjectGetFullName(node.ProcedureReference.Name));
+            AddViolation(node.ProcedureReference.Name.SchemaIdentifier, SQLHelpers.ObjectGetFullName(node.ProcedureReference.Name));
         }
     }
     public override void Visit(CreateOrAlterProcedureStatement node)
     {
         if (node.ProcedureReference.Name.SchemaIdentifier?.Value.Equals("dbo", StringComparison.OrdinalIgnoreCase) == true)
         {
-            AddViolation(node, SQLHelpers.ObjectGetFullName(node.ProcedureReference.Name));
+            AddViolation(node.ProcedureReference.Name.SchemaIdentifier, SQLHelpers.ObjectGetFullName(node.ProcedureReference.Name));
         }
     }
 }

SQLLinter/Infrastructure/Rules/DeleteWhereRule.cs

@@ -20,6 +20,6 @@ public class DeleteWhereRule : BaseRuleVisitor, IRule
             .Select(t => t.Text)
             );
 
-        AddViolation(node, name);
+        AddViolation(node.Target, name);
     }
 }

SQLLinter/Infrastructure/Rules/ExecuteAsOwnerRule.cs

@@ -25,6 +25,6 @@ public class ExecuteAsOwnerRule : BaseRuleVisitor
             }
         }
 
-        AddViolation(node, SQLHelpers.ObjectGetFullName(node.ProcedureReference.Name));
+        AddViolation(node.ProcedureReference.Name, SQLHelpers.ObjectGetFullName(node.ProcedureReference.Name));
     }
 }

SQLLinter/Infrastructure/Rules/HeaderCommentRule.cs

@@ -20,9 +20,9 @@ public class HeaderCommentRule : BaseRuleVisitor
 
     public override void Visit(CreateOrAlterTriggerStatement node) => private_visit(node, SQLHelpers.ObjectGetFullName(node.Name));
 
-    public override void Visit(CreateViewStatement node) => private_visit(node, "");
+    public override void Visit(CreateViewStatement node) => private_visit(node, SQLHelpers.ObjectGetFullName(node.SchemaObjectName));
 
-    public override void Visit(CreateOrAlterViewStatement node) => private_visit(node, "");
+    public override void Visit(CreateOrAlterViewStatement node) => private_visit(node, SQLHelpers.ObjectGetFullName(node.SchemaObjectName));
 
     private void private_visit(TSqlFragment node, string name)
     {
@@ -39,8 +39,24 @@ public class HeaderCommentRule : BaseRuleVisitor
         if (prevToken == null ||
             prevToken.TokenType != TSqlTokenType.SingleLineComment && prevToken.TokenType != TSqlTokenType.MultilineComment
         )
+        {
+            if (node is ProcedureStatementBody proc)
+            {
+                AddViolation(proc.ProcedureReference.Name, name);
+            }
+            else if (node is ViewStatementBody view)
+            {
+                AddViolation(view.SchemaObjectName, name);
+
+            }
+            else if (node is TriggerStatementBody tr)
+            {
+                AddViolation(tr.Name, name);
+            }
+            else
             {
                 AddViolation(node, name);
             }
         }
     }
+}

SQLLinter/Infrastructure/Rules/InsertStarRule.cs

@@ -11,7 +11,7 @@ public class InsertStarRule : BaseRuleVisitor
     {
         if (node.InsertSpecification.Columns.Count == 0) // INSERT без перечисления колонок
         {
-            AddViolation(node);
+            AddViolation(node.InsertSpecification.Target);
         }
     }
 }

SQLLinter/Infrastructure/Rules/ProcedureLoggingRule.cs

@@ -12,7 +12,7 @@ public class ProcedureLoggingRule : BaseRuleVisitor
     public override void Visit(CreateOrAlterProcedureStatement node) => check(node, SQLHelpers.ObjectGetFullName(node.ProcedureReference.Name));
     public override void Visit(AlterProcedureStatement node) => check(node, SQLHelpers.ObjectGetFullName(node.ProcedureReference.Name));
 
-    private void check(TSqlStatement node, string name)
+    private void check(ProcedureStatementBody node, string name)
     {
         var tokens = node.ScriptTokenStream;
 
@@ -35,7 +35,7 @@ public class ProcedureLoggingRule : BaseRuleVisitor
 
         if (!hasDebugLog || !hasLabelFinish)
         {
-            AddViolation(node, name);
+            AddViolation(node.ProcedureReference.Name, name);
         }
     }
 }

SQLLinter/Infrastructure/Rules/TempTableModificationRule.cs

@@ -12,7 +12,7 @@ public class TempTableModificationRule : BaseRuleVisitor
     {
         if (node.UpdateSpecification.Target is NamedTableReference tbl && tbl.SchemaObject.BaseIdentifier.Value.StartsWith("#"))
         {
-            AddViolation(node, SQLHelpers.ObjectGetFullName(tbl.SchemaObject));
+            AddViolation(node.UpdateSpecification.Target, SQLHelpers.ObjectGetFullName(tbl.SchemaObject));
         }
     }
 
@@ -20,7 +20,7 @@ public class TempTableModificationRule : BaseRuleVisitor
     {
         if (node.DeleteSpecification.Target is NamedTableReference tbl && tbl.SchemaObject.BaseIdentifier.Value.StartsWith("#"))
         {
-            AddViolation(node, SQLHelpers.ObjectGetFullName(tbl.SchemaObject));
+            AddViolation(node.DeleteSpecification.Target, SQLHelpers.ObjectGetFullName(tbl.SchemaObject));
         }
     }
 
@@ -28,7 +28,7 @@ public class TempTableModificationRule : BaseRuleVisitor
     {
         if (node.SchemaObjectName.BaseIdentifier.Value.StartsWith("#"))
         {
-            AddViolation(node, SQLHelpers.ObjectGetFullName(node.SchemaObjectName));
+            AddViolation(node.SchemaObjectName, SQLHelpers.ObjectGetFullName(node.SchemaObjectName));
         }
     }
 }

SQLLinter/Infrastructure/Rules/UpdateWhereRule.cs

@@ -23,6 +23,6 @@ public class UpdateWhereRule : BaseRuleVisitor, IRule
             .Select(t => t.Text)
             );
 
-        AddViolation(node, name);
+        AddViolation(node.Target, name);
     }
 }