Skip to content

Commit b0218ab

Browse files
huxuxuyanixel2007
authored andcommitted
Добавлено позиционирование диагностики
1 parent b34bb0e commit b0218ab

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@
5151
public class IncorrectLineBreakDiagnostic extends AbstractDiagnostic {
5252

5353
private static final Pattern INCORRECT_START_LINE_PATTERN = CaseInsensitivePattern.compile(
54-
"(:?^\\s*)(:?\\)|;|,|\\);)"
54+
"^\\s*(:?\\)|;|,|\\);)"
5555
);
5656

5757
private static final Pattern INCORRECT_END_LINE_PATTERN = CaseInsensitivePattern.compile(
58-
"(\\s+(?:ИЛИ|И|OR|AND)|\\+|-|\\/|%|\\*)\\s*(?:\\/\\/.*)?$"
58+
"\\s+(:?ИЛИ|И|OR|AND|\\+|-|\\/|%|\\*)\\s*(?:\\/\\/.*)?$"
5959
);
6060

6161
@Override
@@ -80,7 +80,7 @@ private void checkContent(Pattern pattern) {
8080
Matcher matcher = pattern.matcher(checkText);
8181

8282
if (matcher.find()) {
83-
diagnosticStorage.addDiagnostic(i+1,1,i+1,0);
83+
diagnosticStorage.addDiagnostic(i+1,matcher.start(1),i+1,matcher.end(1));
8484
}
8585
}
8686
}

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,18 @@ void test() {
4040

4141
assertThat(diagnostics).hasSize(12);
4242
assertThat(diagnostics, true)
43-
.hasRange(7, 1, 0)
44-
.hasRange(8, 1, 0)
45-
.hasRange(16, 1, 0)
46-
.hasRange(17, 1, 0)
47-
.hasRange(21, 1, 0)
48-
.hasRange(29, 1, 0)
49-
.hasRange(70, 1, 0)
50-
.hasRange(83, 1, 0)
51-
.hasRange(45, 1, 0)
52-
.hasRange(47, 1, 0)
53-
.hasRange(59, 1, 0)
54-
.hasRange(61, 1, 0)
43+
.hasRange(7, 32, 33)
44+
.hasRange(8, 35, 36)
45+
.hasRange(16, 32, 33)
46+
.hasRange(17, 22, 23)
47+
.hasRange(21, 49, 50)
48+
.hasRange(29, 28, 29)
49+
.hasRange(70, 80, 83)
50+
.hasRange(83, 89, 92)
51+
.hasRange(45, 25, 26)
52+
.hasRange(47, 25, 26)
53+
.hasRange(59, 4, 5)
54+
.hasRange(61, 4, 5)
5555
;
5656

5757
}

0 commit comments

Comments
 (0)