Другая регулярка

Author: asosnoviy

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

@@ -19,17 +19,23 @@
 )
 public class TabAlignmentDiagnostic extends AbstractDiagnostic {
 
+  private static final Pattern pattern = Pattern.compile("\\S[\\S ]*(\\t+)");
+
   @Override
   public void check() {
 
-    Pattern pattern = Pattern.compile("(\\t*\\S ?)\\t+");
     String[] lines = documentContext.getContentList();
     for (int i = 0; i < lines.length; i++) {
-      Matcher matcher = pattern.matcher(lines[i]);
-      if (!matcher.find()) {
+      String currentLine = lines[i].strip();
+      if (currentLine.startsWith("|")
+        || currentLine.startsWith("//")) {
         continue;
       }
-      diagnosticStorage.addDiagnostic(i, matcher.start(), i, matcher.end());
+
+      Matcher matcher = pattern.matcher(lines[i]);
+      if (matcher.find()) {
+        diagnosticStorage.addDiagnostic(i, matcher.start(1), i, matcher.end(1));
+      }
     }
   }
 }

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

@@ -0,0 +1,28 @@
+package com.github._1c_syntax.bsl.languageserver.diagnostics;
+
+import org.eclipse.lsp4j.Diagnostic;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
+
+import static com.github._1c_syntax.bsl.languageserver.util.Assertions.assertThat;
+
+class TabAlignmentDiagnosticTest extends AbstractDiagnosticTest<TabAlignmentDiagnostic> {
+  TabAlignmentDiagnosticTest() {
+    super(TabAlignmentDiagnostic.class);
+  }
+
+  @Test
+  void test() {
+
+    List<Diagnostic> diagnostics = getDiagnostics();
+
+    assertThat(diagnostics).hasSize(3);
+    assertThat(diagnostics, true)
+      .hasRange(3, 5, 6)
+      .hasRange(4, 6, 7)
+      .hasRange(5, 5, 6)
+    ;
+
+  }
+}

src/test/resources/diagnostics/TabAlignmentDiagnostic.bsl

@@ -1,6 +1,10 @@
 
-Foo = f;
-    foo = foo;
-    foo 	 = foo;
-    foo =	foo;
-foo =	foo;
+foo = f;
+	foo = foo;
+	foo 	 = foo;
+	foo =	foo;
+foo =	foo;
+F = ";
+	|	foo		";
+
+	//  foo = 	foo;