Merge pull request #2763 from 1c-syntax/feature/ignoreExtenshionDiagnostic

Игнорирование диагностик в методах &ИзменениеИКонтроль

Author: asosnoviy

src/main/java/com/github/_1c_syntax/bsl/languageserver/context/computer/DiagnosticIgnoranceComputer.java

@@ -22,7 +22,11 @@
 package com.github._1c_syntax.bsl.languageserver.context.computer;
 
 import com.github._1c_syntax.bsl.languageserver.context.DocumentContext;
+import com.github._1c_syntax.bsl.languageserver.context.symbol.MethodSymbol;
+import com.github._1c_syntax.bsl.languageserver.context.symbol.annotations.Annotation;
+import com.github._1c_syntax.bsl.languageserver.context.symbol.annotations.AnnotationKind;
 import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticCode;
+import com.github._1c_syntax.bsl.parser.BSLLexer;
 import com.github._1c_syntax.utils.CaseInsensitivePattern;
 import lombok.AllArgsConstructor;
 import org.antlr.v4.runtime.Token;
@@ -38,11 +42,14 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeMap;
 import java.util.function.Predicate;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
+import static org.antlr.v4.runtime.Token.HIDDEN_CHANNEL;
+
 public class DiagnosticIgnoranceComputer implements Computer<DiagnosticIgnoranceComputer.Data> {
 
   private static final DiagnosticCode ALL_DIAGNOSTICS_KEY = new DiagnosticCode("all");
@@ -82,6 +89,54 @@ public Data compute() {
     if (codeTokens.isEmpty()) {
       return new Data(diagnosticIgnorance);
     }
+
+    computeCommentsIgnorance(codeTokens);
+    computeExtensionIgnorance();
+
+    return new Data(diagnosticIgnorance);
+  }
+
+  private void computeExtensionIgnorance() {
+    var lines = new TreeMap<Integer, Boolean>();
+
+    documentContext.getSymbolTree()
+      .getMethods().stream()
+      .filter(
+        method -> method.getAnnotations().stream()
+          .map(Annotation::getKind)
+          .anyMatch(kind -> kind == AnnotationKind.CHANGEANDVALIDATE)
+      ).forEach((MethodSymbol methodSymbol) -> {
+        lines.put(methodSymbol.getRange().getStart().getLine(), true);
+        lines.put(methodSymbol.getRange().getEnd().getLine(), false);
+      });
+
+    // not extended method
+    if (lines.isEmpty()) {
+      return;
+    }
+
+    documentContext.getTokens().stream()
+      .filter(token -> token.getChannel() == HIDDEN_CHANNEL)
+      .filter(token -> token.getType() == BSLLexer.PREPROC_INSERT || token.getType() == BSLLexer.PREPROC_ENDINSERT)
+      .forEach(token -> lines.put(token.getLine(), token.getType() == BSLLexer.PREPROC_ENDINSERT));
+
+    var lastTokenLine = -1;
+    var tokenLine = -1;
+
+    for (Map.Entry<Integer, Boolean> entry : lines.entrySet()) {
+
+      if (Boolean.TRUE.equals(entry.getValue())) {
+        tokenLine = entry.getKey();
+      } else {
+        lastTokenLine = entry.getKey();
+        addIgnoredRange(ALL_DIAGNOSTICS_KEY, tokenLine, lastTokenLine);
+      }
+
+    }
+
+  }
+
+  private void computeCommentsIgnorance(List<Token> codeTokens) {
     Set<Integer> codeLines = codeTokens.stream().map(Token::getLine).collect(Collectors.toSet());
 
     List<Token> comments = documentContext.getComments();
@@ -102,8 +157,6 @@ public Data compute() {
     ignoranceStack.forEach((DiagnosticCode diagnosticKey, Deque<Integer> ignoreRangeStarts) ->
       ignoreRangeStarts.forEach(ignoreRangeStart -> addIgnoredRange(diagnosticKey, ignoreRangeStart, lastTokenLine))
     );
-
-    return new Data(diagnosticIgnorance);
   }
 
   private boolean checkTrailingComment(Set<Integer> codeLines, Token comment) {

src/test/java/com/github/_1c_syntax/bsl/languageserver/context/computer/DiagnosticIgnoranceComputerTest.java

@@ -68,6 +68,32 @@ void testDiagnosticIgnorance() {
     assertThat(notIgnoredDiagnostics).noneMatch(data::diagnosticShouldBeIgnored);
   }
 
+  @Test
+  void testDiagnosticIgnoranceExtension() {
+
+    // given
+    String filePath = "./src/test/resources/context/computer/DiagnosticIgnoranceComputerExtensionTest.bsl";
+    final var documentContext = getDocumentContextFromFile(filePath);
+
+    List<Diagnostic> ignoredDiagnostics = new ArrayList<>();
+    ignoredDiagnostics.add(createDiagnostic("MissingSpace", 6));
+
+    List<Diagnostic> notIgnoredDiagnostics = new ArrayList<>();
+    notIgnoredDiagnostics.add(createDiagnostic("MissingSpace", 16));
+    notIgnoredDiagnostics.add(createDiagnostic("UnusedLocalVariable", 16));
+    notIgnoredDiagnostics.add(createDiagnostic("SemicolonPresence", 10));
+
+    // when
+    Computer<DiagnosticIgnoranceComputer.Data> diagnosticIgnoranceComputer =
+      new DiagnosticIgnoranceComputer(documentContext);
+    DiagnosticIgnoranceComputer.Data data = diagnosticIgnoranceComputer.compute();
+
+    // then
+    assertThat(ignoredDiagnostics).allMatch(data::diagnosticShouldBeIgnored);
+    assertThat(notIgnoredDiagnostics).noneMatch(data::diagnosticShouldBeIgnored);
+
+  }
+
   private static Diagnostic createDiagnostic(String code, int line) {
     Diagnostic diagnostic = new Diagnostic();
     diagnostic.setCode(code);

src/test/resources/context/computer/DiagnosticIgnoranceComputerExtensionTest.bsl

@@ -0,0 +1,18 @@
+
+&ИзменениеИКонтроль("ТекстОшибки")
+Функция Расш1_ТекстОшибки(ТекстОшибки)
+
+#Удаление
+  а=Метод(Параметр,Параметр)
+#КонецУдаления
+#Вставка
+
+  Возврат ТекстОшибки + Символы.ПС + НСтр("ru = 'ТРУ ТРУ ТРУ.'")
+
+#КонецВставки
+  Возврат ТекстОшибки + Символы.ПС + НСтр("ru = 'Обратитесь к администратору.'")
+КонецФункции
+
+Процедура Просто()
+а=Метод(Параметр,Параметр);
+КонецПроцедуры