Merge pull request #2944 from artbear/null-fix

Восстановление правила FieldsFromJoinsWithoutIsNull после изменения парсера запросов

Author: nixel2007

src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FieldsFromJoinsWithoutIsNullDiagnostic.java

@@ -21,7 +21,6 @@
  */
 package com.github._1c_syntax.bsl.languageserver.diagnostics;
 
-import com.github._1c_syntax.bsl.languageserver.diagnostics.infrastructure.Disabled;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticMetadata;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticSeverity;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticTag;
@@ -47,7 +46,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-@Disabled
 @DiagnosticMetadata(
   type = DiagnosticType.ERROR,
   severity = DiagnosticSeverity.CRITICAL,
@@ -61,16 +59,21 @@
 )
 public class FieldsFromJoinsWithoutIsNullDiagnostic extends AbstractSDBLVisitorDiagnostic {
 
-  private static final Integer SELECT_ROOT = SDBLParser.RULE_selectedField;
-  private static final Collection<Integer> SELECT_STATEMENTS = Set.of(SELECT_ROOT, SDBLParser.RULE_builtInFunctions,
-    SDBLParser.RULE_isNullPredicate);
+  // схема расчета - находится поле из соединения,
+  // далее идет поиск вверх по родительским узлам для проверки вхождения в разных вариациях ЕСТЬNULL или ЕСТЬ NULL
+  // для оптимизации ищем вверх не до начального узла всего дерева, а до узла, в котором искать уже нет смысла
 
-  private static final Integer WHERE_ROOT = SDBLParser.RULE_predicate;
-  private static final Collection<Integer> WHERE_STATEMENTS = Set.of(WHERE_ROOT, SDBLParser.RULE_builtInFunctions,
-    SDBLParser.RULE_isNullPredicate);
+  private static final Integer EXCLUDED_TOP_RULE_FOR_SELECT = SDBLParser.RULE_selectedField;
+  private static final Collection<Integer> SELECT_STATEMENTS = Set.of(EXCLUDED_TOP_RULE_FOR_SELECT,
+    SDBLParser.RULE_builtInFunctions, SDBLParser.RULE_isNullPredicate);
 
-  private static final Integer JOIN_ROOT = SDBLParser.RULE_joinPart;
-  private static final Collection<Integer> JOIN_STATEMENTS = Set.of(JOIN_ROOT, SDBLParser.RULE_builtInFunctions);
+  private static final Integer EXCLUDED_TOP_RULE_FOR_WHERE = SDBLParser.RULE_query;
+  private static final Collection<Integer> WHERE_STATEMENTS = Set.of(EXCLUDED_TOP_RULE_FOR_WHERE,
+    SDBLParser.RULE_builtInFunctions, SDBLParser.RULE_isNullPredicate);
+
+  private static final Integer EXCLUDED_TOP_RULE_FOR_JOIN = SDBLParser.RULE_joinPart;
+  private static final Collection<Integer> JOIN_STATEMENTS = Set.of(EXCLUDED_TOP_RULE_FOR_JOIN,
+    SDBLParser.RULE_builtInFunctions);
 
   public static final Collection<Integer> RULES_OF_PARENT_FOR_SEARCH_CONDITION = Set.of(SDBLParser.RULE_predicate,
     SDBLParser.RULE_query);
@@ -165,7 +168,7 @@ private static boolean haveExprNotWithParens(SDBLParser.PredicateContext ctx) {
   }
 
   private void checkSelect(String tableName, SDBLParser.SelectedFieldsContext columns) {
-    checkStatements(tableName, columns, SELECT_STATEMENTS, SELECT_ROOT, true);
+    checkStatements(tableName, columns, SELECT_STATEMENTS, EXCLUDED_TOP_RULE_FOR_SELECT, true);
   }
 
   private void checkStatements(String tableName, BSLParserRuleContext expression, Collection<Integer> statements,
@@ -223,7 +226,7 @@ private void checkWhere(String tableName, @Nullable SDBLParser.LogicalExpression
     Optional.ofNullable(where)
       .stream().flatMap(searchConditionsContext -> searchConditionsContext.condidions.stream())
       .forEach(searchConditionContext -> checkStatements(tableName, searchConditionContext,
-        WHERE_STATEMENTS, WHERE_ROOT, true));
+        WHERE_STATEMENTS, EXCLUDED_TOP_RULE_FOR_WHERE, true));
   }
 
   private void checkAllJoins(String tableName, SDBLParser.JoinPartContext currentJoinPart) {
@@ -233,7 +236,7 @@ private void checkAllJoins(String tableName, SDBLParser.JoinPartContext currentJ
       .filter(joinPartContext -> joinPartContext != currentJoinPart)
       .map(SDBLParser.JoinPartContext::logicalExpression)
       .forEach(searchConditionsContext -> checkStatements(tableName, searchConditionsContext,
-        JOIN_STATEMENTS, JOIN_ROOT, false));
+        JOIN_STATEMENTS, EXCLUDED_TOP_RULE_FOR_JOIN, false));
   }
 
   private List<DiagnosticRelatedInformation> getRelatedInformation(SDBLParser.JoinPartContext self) {

src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FieldsFromJoinsWithoutIsNullDiagnosticTest.java

@@ -26,7 +26,6 @@
 import org.eclipse.lsp4j.Diagnostic;
 import org.eclipse.lsp4j.DiagnosticRelatedInformation;
 import org.eclipse.lsp4j.Range;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
 import java.util.Arrays;
@@ -41,7 +40,6 @@ class FieldsFromJoinsWithoutIsNullDiagnosticTest extends AbstractDiagnosticTest<
   }
 
   @Test
-  @Disabled
   void test() {
 
     List<Diagnostic> diagnostics = getDiagnostics();