From eae9793a045c0503f1dd511fadef8d860cbd0ff2 Mon Sep 17 00:00:00 2001 From: theshadowco Date: Fri, 8 Oct 2021 13:55:34 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D1=8E=20=D0=BF=D0=B0=D1=80=D1=81?= =?UTF-8?q?=D0=B5=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle.kts | 2 +- .../diagnostics/FullOuterJoinQueryDiagnostic.java | 4 ++-- .../bsl/languageserver/diagnostics/UnionAllDiagnostic.java | 2 +- .../bsl/languageserver/providers/FormatProvider.java | 5 ++--- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 8e560513b14..76edde1e7cb 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -64,7 +64,7 @@ dependencies { api("org.eclipse.lsp4j", "org.eclipse.lsp4j", "0.12.0") // 1c-syntax - api("com.github.1c-syntax", "bsl-parser", "54dacb8e5a1f6f07afaeb1d9c8840642d202768c") { + api("com.github.1c-syntax", "bsl-parser", "dcefcd09d5") { exclude("com.tunnelvisionlabs", "antlr4-annotations") exclude("com.ibm.icu", "*") exclude("org.antlr", "ST4") diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FullOuterJoinQueryDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FullOuterJoinQueryDiagnostic.java index f071d075171..dcf5fef8957 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FullOuterJoinQueryDiagnostic.java +++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/FullOuterJoinQueryDiagnostic.java @@ -45,8 +45,8 @@ public class FullOuterJoinQueryDiagnostic extends AbstractSDBLVisitorDiagnostic @Override public ParseTree visitJoinPart(SDBLParser.JoinPartContext ctx) { - if (ctx.FULL_JOIN() != null) { - diagnosticStorage.addDiagnostic(ctx.FULL_JOIN()); + if (ctx.FULL() != null && ctx.JOIN() != null) { + diagnosticStorage.addDiagnostic(ctx.FULL(), ctx.JOIN()); } return super.visitJoinPart(ctx); diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnionAllDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnionAllDiagnostic.java index fb65d375f52..78f74464076 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnionAllDiagnostic.java +++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/UnionAllDiagnostic.java @@ -44,7 +44,7 @@ public class UnionAllDiagnostic extends AbstractSDBLVisitorDiagnostic { @Override public ParseTree visitUnion(SDBLParser.UnionContext ctx) { - if (ctx.UNION_ALL() != null) { + if (ctx.UNION() != null && ctx.ALL() != null) { return super.visitUnion(ctx); } diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/FormatProvider.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/FormatProvider.java index 8a9feb76af9..ed3fdd906df 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/FormatProvider.java +++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/providers/FormatProvider.java @@ -246,7 +246,7 @@ public static String getNewText( } String addedText = token.getText(); - if (tokenType == BSLLexer.LINE_COMMENT || tokenType == BSLLexer.PREPROC_LINE_COMMENT) { + if (tokenType == BSLLexer.LINE_COMMENT) { addedText = addedText.trim(); } newTextBuilder.append(addedText); @@ -293,8 +293,7 @@ public static String getNewText( private static List filteredTokens(List tokens) { return tokens.stream() .filter(token -> token.getChannel() == Token.DEFAULT_CHANNEL - || token.getType() == BSLLexer.LINE_COMMENT - || token.getType() == BSLLexer.PREPROC_LINE_COMMENT) + || token.getType() == BSLLexer.LINE_COMMENT) .collect(Collectors.toList()); }