From cd9ef8bb3d7813355091f0585b0ff9ca977243bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=93=D0=BE=D0=BB=D0=BE=D0=B2=D0=B0=D0=BD=D0=BE=D0=B2=20?= =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9?= Date: Fri, 10 Sep 2021 07:35:43 +0300 Subject: [PATCH 01/15] =?UTF-8?q?=D0=BE=D1=82=D1=80=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=82=D0=B0=D0=BB=20Gradle,=20=20=D0=B7=D0=B0=D0=B3=D0=BE?= =?UTF-8?q?=D1=82=D0=BE=D0=B2=D0=BA=D0=B8=20=D0=BF=D0=BE=D0=B4=20=D0=B4?= =?UTF-8?q?=D0=B8=D0=B0=D0=B3=D0=BD=D0=BE=D1=81=D1=82=D0=B8=D0=BA=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/diagnostics/metadataBorders.md | 36 +++++++++++++++++++ docs/en/diagnostics/metadataBorders.md | 36 +++++++++++++++++++ .../metadataBordersDiagnostic.java | 20 +++++++++++ .../metadataBordersDiagnostic_en.properties | 2 ++ .../metadataBordersDiagnostic_ru.properties | 2 ++ .../metadataBordersDiagnosticTest.java | 25 +++++++++++++ .../diagnostics/metadataBordersDiagnostic.bsl | 1 + 7 files changed, 122 insertions(+) create mode 100644 docs/diagnostics/metadataBorders.md create mode 100644 docs/en/diagnostics/metadataBorders.md create mode 100644 src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadataBordersDiagnostic.java create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadataBordersDiagnostic_en.properties create mode 100644 src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadataBordersDiagnostic_ru.properties create mode 100644 src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadataBordersDiagnosticTest.java create mode 100644 src/test/resources/diagnostics/metadataBordersDiagnostic.bsl diff --git a/docs/diagnostics/metadataBorders.md b/docs/diagnostics/metadataBorders.md new file mode 100644 index 00000000000..c0021eebd2b --- /dev/null +++ b/docs/diagnostics/metadataBorders.md @@ -0,0 +1,36 @@ +# (metadataBorders) + + + +## + + +## Описание диагностики + + +## Примеры + + +## Источники + + + +## Сниппеты + + +### Экранирование кода + +```bsl +// BSLLS:metadataBorders-off +// BSLLS:metadataBorders-on +``` + +### Параметр конфигурационного файла + +```json +"metadataBorders": +``` \ No newline at end of file diff --git a/docs/en/diagnostics/metadataBorders.md b/docs/en/diagnostics/metadataBorders.md new file mode 100644 index 00000000000..760540ed7b0 --- /dev/null +++ b/docs/en/diagnostics/metadataBorders.md @@ -0,0 +1,36 @@ +# (metadataBorders) + + + +## + + +## Description + + +## Examples + + +## Sources + + + +## Snippets + + +### Diagnostic ignorance in code + +```bsl +// BSLLS:metadataBorders-off +// BSLLS:metadataBorders-on +``` + +### Parameter for config + +```json +"metadataBorders": +``` diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadataBordersDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadataBordersDiagnostic.java new file mode 100644 index 00000000000..e0aa418da86 --- /dev/null +++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadataBordersDiagnostic.java @@ -0,0 +1,20 @@ +package com.github._1c_syntax.bsl.languageserver.diagnostics; + +import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticInfo; +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; +import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticType; + +@DiagnosticMetadata( + type = DiagnosticType.CODE_SMELL, + severity = DiagnosticSeverity.INFO, + minutesToFix = 1, + tags = { + DiagnosticTag.ERROR + } + +) +public class metadataBordersDiagnostic extends AbstractVisitorDiagnostic { + +} diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadataBordersDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadataBordersDiagnostic_en.properties new file mode 100644 index 00000000000..66831715dfd --- /dev/null +++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadataBordersDiagnostic_en.properties @@ -0,0 +1,2 @@ +diagnosticMessage= +diagnosticName= diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadataBordersDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadataBordersDiagnostic_ru.properties new file mode 100644 index 00000000000..40188ca542c --- /dev/null +++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadataBordersDiagnostic_ru.properties @@ -0,0 +1,2 @@ +diagnosticMessage=<Сообщение> +diagnosticName=<Имя диагностики> diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadataBordersDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadataBordersDiagnosticTest.java new file mode 100644 index 00000000000..aaac5faac4e --- /dev/null +++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadataBordersDiagnosticTest.java @@ -0,0 +1,25 @@ +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 metadataBordersDiagnosticTest extends AbstractDiagnosticTest { + metadataBordersDiagnosticTest() { + super(metadataBordersDiagnostic.class); + } + + @Test + void test() { + + List diagnostics = getDiagnostics(); + + assertThat(diagnostics).hasSize(1); + assertThat(diagnostics, true) + .hasRange(6, 0, 6, 20); + + } +} diff --git a/src/test/resources/diagnostics/metadataBordersDiagnostic.bsl b/src/test/resources/diagnostics/metadataBordersDiagnostic.bsl new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/src/test/resources/diagnostics/metadataBordersDiagnostic.bsl @@ -0,0 +1 @@ + From 768ab7dff0e96e751889af60b598baef5e67e073 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=93=D0=BE=D0=BB=D0=BE=D0=B2=D0=B0=D0=BD=D0=BE=D0=B2=20?= =?UTF-8?q?=D0=A1=D0=B5=D1=80=D0=B3=D0=B5=D0=B9?= Date: Fri, 10 Sep 2021 07:43:34 +0300 Subject: [PATCH 02/15] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B8=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE=D0=B2=D0=B0=D0=BB=20=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=D1=8C=D0=BD=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/diagnostics/{metadataBorders.md => MetadataBorders.md} | 0 .../diagnostics/{metadataBorders.md => MetadataBorders.md} | 0 ...ordersDiagnostic.java => MetadataBordersDiagnostic.java} | 2 +- ...n.properties => MetadataBordersDiagnostic_en.properties} | 0 ...u.properties => MetadataBordersDiagnostic_ru.properties} | 0 ...agnosticTest.java => MetadataBordersDiagnosticTest.java} | 6 +++--- ...aBordersDiagnostic.bsl => MetadataBordersDiagnostic.bsl} | 0 7 files changed, 4 insertions(+), 4 deletions(-) rename docs/diagnostics/{metadataBorders.md => MetadataBorders.md} (100%) rename docs/en/diagnostics/{metadataBorders.md => MetadataBorders.md} (100%) rename src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/{metadataBordersDiagnostic.java => MetadataBordersDiagnostic.java} (91%) rename src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/{metadataBordersDiagnostic_en.properties => MetadataBordersDiagnostic_en.properties} (100%) rename src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/{metadataBordersDiagnostic_ru.properties => MetadataBordersDiagnostic_ru.properties} (100%) rename src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/{metadataBordersDiagnosticTest.java => MetadataBordersDiagnosticTest.java} (71%) rename src/test/resources/diagnostics/{metadataBordersDiagnostic.bsl => MetadataBordersDiagnostic.bsl} (100%) diff --git a/docs/diagnostics/metadataBorders.md b/docs/diagnostics/MetadataBorders.md similarity index 100% rename from docs/diagnostics/metadataBorders.md rename to docs/diagnostics/MetadataBorders.md diff --git a/docs/en/diagnostics/metadataBorders.md b/docs/en/diagnostics/MetadataBorders.md similarity index 100% rename from docs/en/diagnostics/metadataBorders.md rename to docs/en/diagnostics/MetadataBorders.md diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadataBordersDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java similarity index 91% rename from src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadataBordersDiagnostic.java rename to src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java index e0aa418da86..d17c7404eef 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadataBordersDiagnostic.java +++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java @@ -15,6 +15,6 @@ } ) -public class metadataBordersDiagnostic extends AbstractVisitorDiagnostic { +public class MetadataBordersDiagnostic extends AbstractVisitorDiagnostic { } diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadataBordersDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic_en.properties similarity index 100% rename from src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadataBordersDiagnostic_en.properties rename to src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic_en.properties diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadataBordersDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic_ru.properties similarity index 100% rename from src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadataBordersDiagnostic_ru.properties rename to src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic_ru.properties diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadataBordersDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnosticTest.java similarity index 71% rename from src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadataBordersDiagnosticTest.java rename to src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnosticTest.java index aaac5faac4e..c3ee0e8f8c8 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/metadataBordersDiagnosticTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnosticTest.java @@ -7,9 +7,9 @@ import static com.github._1c_syntax.bsl.languageserver.util.Assertions.assertThat; -class metadataBordersDiagnosticTest extends AbstractDiagnosticTest { - metadataBordersDiagnosticTest() { - super(metadataBordersDiagnostic.class); +class MetadataBordersDiagnosticTest extends AbstractDiagnosticTest { + MetadataBordersDiagnosticTest() { + super(MetadataBordersDiagnostic.class); } @Test diff --git a/src/test/resources/diagnostics/metadataBordersDiagnostic.bsl b/src/test/resources/diagnostics/MetadataBordersDiagnostic.bsl similarity index 100% rename from src/test/resources/diagnostics/metadataBordersDiagnostic.bsl rename to src/test/resources/diagnostics/MetadataBordersDiagnostic.bsl From ea1e7dd62934181a69f3f6df9c82cc4768b5d908 Mon Sep 17 00:00:00 2001 From: Golovanoff Sergio Date: Sun, 12 Sep 2021 17:19:48 +0700 Subject: [PATCH 03/15] =?UTF-8?q?=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE?= =?UTF-8?q?=D0=B9=D0=BA=D1=83=20=D0=B4=D1=83=D0=BC=D0=B0=D1=8E=20=D1=81?= =?UTF-8?q?=D0=B4=D0=B5=D0=BB=D0=B0=D1=82=D1=8C=20=D0=BC=D0=B0=D0=BF=D0=BE?= =?UTF-8?q?=D0=B9.=20=D1=87=D0=B8=D1=82=D0=B0=D1=82=D1=8C=20=D0=B5=D0=B5?= =?UTF-8?q?=20=D0=B8=D0=B7=20json=3F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MetadataBordersDiagnostic.java | 34 ++++++++++++++++--- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java index d17c7404eef..062d32ac3f5 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java +++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java @@ -1,10 +1,13 @@ package com.github._1c_syntax.bsl.languageserver.diagnostics; -import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticInfo; -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; -import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticType; +import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.*; +import com.github._1c_syntax.bsl.parser.*; +import com.github._1c_syntax.utils.*; +import com.google.protobuf.*; +import org.antlr.v4.runtime.tree.*; + +import java.util.*; +import java.util.regex.*; @DiagnosticMetadata( type = DiagnosticType.CODE_SMELL, @@ -17,4 +20,25 @@ ) public class MetadataBordersDiagnostic extends AbstractVisitorDiagnostic { + private static final Map METADATA_BORDERS_DEFAULT = new HashMap<>(); + + @DiagnosticParameter( + type = String.class, + defaultValue = "" + ) + private Map metadataBordersParameters = METADATA_BORDERS_DEFAULT; + + @Override + public ParseTree visitStatement(BSLParser.StatementContext ctx){ + + for (Map.Entry entry: metadataBordersParameters.entrySet()) { + + Pattern pattern = CaseInsensitivePattern.compile(entry.getKey()); + Matcher matcher = pattern.matcher(ctx.getText()); + while (matcher.find()) { + diagnosticStorage.addDiagnostic(ctx); + } + } + return super.visitStatement(ctx); + } } From b17d97fd88bde71cf175e1fba95e5c9a028ed681 Mon Sep 17 00:00:00 2001 From: Golovanoff Sergio Date: Tue, 21 Sep 2021 12:17:31 +0700 Subject: [PATCH 04/15] =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=8B=D1=82=D0=B0?= =?UTF-8?q?=D0=BB=D1=81=D1=8F=20=D0=BD=D0=B0=D0=BA=D0=B8=D0=B4=D0=B0=D1=82?= =?UTF-8?q?=D1=8C=20=D1=87=D1=82=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=B0?= =?UTF-8?q?=D1=81=D1=82=D1=80=D0=BE=D0=B9=D0=BA=D0=B8=20=D0=B8=D0=B7=20jso?= =?UTF-8?q?n.=20=D0=BD=D0=BE=20=D0=BD=D0=B5=20=D0=B2=D0=B7=D0=BB=D0=B5?= =?UTF-8?q?=D1=82=D0=B0=D0=B5=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MetadataBordersDiagnostic.java | 25 ++++++++++++++++--- .../MetadataBordersDiagnosticTest.java | 20 +++++++++++++-- .../diagnostics/MetadataBordersDiagnostic.bsl | 8 ++++++ 3 files changed, 48 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java index 062d32ac3f5..c31b9131c24 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java +++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java @@ -1,9 +1,10 @@ package com.github._1c_syntax.bsl.languageserver.diagnostics; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.*; import com.github._1c_syntax.bsl.parser.*; import com.github._1c_syntax.utils.*; -import com.google.protobuf.*; import org.antlr.v4.runtime.tree.*; import java.util.*; @@ -20,19 +21,37 @@ ) public class MetadataBordersDiagnostic extends AbstractVisitorDiagnostic { - private static final Map METADATA_BORDERS_DEFAULT = new HashMap<>(); + private static final String METADATA_BORDERS_DEFAULT = "{\"\":\"\"}"; @DiagnosticParameter( type = String.class, defaultValue = "" ) - private Map metadataBordersParameters = METADATA_BORDERS_DEFAULT; + private Map metadataBordersParameters = MapFromJSON(METADATA_BORDERS_DEFAULT); + + private static HashMap MapFromJSON(String userSettings) { + try { + return new ObjectMapper().readValue(userSettings, HashMap.class); + } catch (JsonProcessingException e) { + return new HashMap<>(); + } + } + + @Override + public void configure(Map configuration) { + this.metadataBordersParameters = MapFromJSON( + (String) configuration.getOrDefault("metadataBordersParameters", METADATA_BORDERS_DEFAULT)); + } @Override public ParseTree visitStatement(BSLParser.StatementContext ctx){ for (Map.Entry entry: metadataBordersParameters.entrySet()) { + if (entry.getKey().trim().length() == 0) { + continue; + } + Pattern pattern = CaseInsensitivePattern.compile(entry.getKey()); Matcher matcher = pattern.matcher(ctx.getText()); while (matcher.find()) { diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnosticTest.java index c3ee0e8f8c8..0ef46ec0164 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnosticTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnosticTest.java @@ -4,6 +4,7 @@ import org.junit.jupiter.api.Test; import java.util.List; +import java.util.Map; import static com.github._1c_syntax.bsl.languageserver.util.Assertions.assertThat; @@ -14,12 +15,27 @@ class MetadataBordersDiagnosticTest extends AbstractDiagnosticTest diagnostics = getDiagnostics(); + assertThat(diagnostics).hasSize(0); + } + + @Test + void testConfigure() { + + Map configuration = diagnosticInstance.info.getDefaultConfiguration(); + configuration.put("metadataBordersParameters", "{\"лотус|шмотус\":\"MetadataBordersDiagnostic\"}"); + diagnosticInstance.configure(configuration); List diagnostics = getDiagnostics(); - assertThat(diagnostics).hasSize(1); + assertThat(diagnostics).hasSize(6); assertThat(diagnostics, true) - .hasRange(6, 0, 6, 20); + .hasRange(0, 42, 0, 47) + .hasRange(0, 48, 0, 54) + .hasRange(4, 4, 4, 9) + .hasRange(6, 24, 6, 29) + .hasRange(6, 34, 6, 39) + .hasRange(8, 4, 8, 10); } } diff --git a/src/test/resources/diagnostics/MetadataBordersDiagnostic.bsl b/src/test/resources/diagnostics/MetadataBordersDiagnostic.bsl index 8b137891791..667763f8976 100644 --- a/src/test/resources/diagnostics/MetadataBordersDiagnostic.bsl +++ b/src/test/resources/diagnostics/MetadataBordersDiagnostic.bsl @@ -1 +1,9 @@ +// при насьтройке "лотус/шмотус:MetadataBordersDiagnostic" // тут не должно сработать +Запрос = Новый Запрос; +Запрос.Текст = "ВЫБРАТЬ ПЕРВЫЕ 1 +| Лотус.Ссылка КАК Узел //тут должно сработать +|ИЗ +| ПланОбмена.ДиспетчерЛотус КАК Лотус"; //тут должно сработать дважды + +УзелШмотуса = Запрос.Выполнить().Выгрузить()[0].Ссылка; //тут должно сработать From 2bc45e17004dc9ac3ba1aae876a6db4f3594746b Mon Sep 17 00:00:00 2001 From: Golovanoff Sergio Date: Wed, 22 Sep 2021 11:17:11 +0700 Subject: [PATCH 05/15] =?UTF-8?q?=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20?= =?UTF-8?q?=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80=20=D1=81=D1=80?= =?UTF-8?q?=D0=B0=D0=B7=D1=83=20=D0=BC=D0=B0=D0=BF=D0=BE=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../diagnostics/MetadataBordersDiagnostic.java | 5 ++--- .../MetadataBordersDiagnostic_en.properties | 6 ++++-- .../MetadataBordersDiagnostic_ru.properties | 5 +++-- .../MetadataBordersDiagnosticTest.java | 16 ++++++++++++++-- 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java index c31b9131c24..39b990e2634 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java +++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java @@ -21,7 +21,7 @@ ) public class MetadataBordersDiagnostic extends AbstractVisitorDiagnostic { - private static final String METADATA_BORDERS_DEFAULT = "{\"\":\"\"}"; + private static final String METADATA_BORDERS_DEFAULT = ""; @DiagnosticParameter( type = String.class, @@ -39,8 +39,7 @@ private static HashMap MapFromJSON(String userSettings) { @Override public void configure(Map configuration) { - this.metadataBordersParameters = MapFromJSON( - (String) configuration.getOrDefault("metadataBordersParameters", METADATA_BORDERS_DEFAULT)); + this.metadataBordersParameters = MapFromJSON( (String) configuration.getOrDefault("metadataBordersParameters", METADATA_BORDERS_DEFAULT)); } @Override diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic_en.properties index 66831715dfd..0664b19d58f 100644 --- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic_en.properties +++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic_en.properties @@ -1,2 +1,4 @@ -diagnosticMessage= -diagnosticName= +diagnosticMessage=Обращение к метаданным за пределами разрешенных границ +diagnosticName=Границы метаданных +metadataBordersParameters=JSON-структура для пар "регулярное выражение для операторов":"регулярное выражение для имени модуля". Например, "Регистры?Сведений.КонтактнаяИнформация:ОбщийМодуль.РаботаСКонтактами". + diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic_ru.properties index 40188ca542c..842dfed4b03 100644 --- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic_ru.properties +++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic_ru.properties @@ -1,2 +1,3 @@ -diagnosticMessage=<Сообщение> -diagnosticName=<Имя диагностики> +diagnosticMessage=Обращение к метаданным за пределами разрешенных границ +diagnosticName=Границы метаданных +metadataBordersParameters=JSON-структура для пар "регулярное выражение для операторов":"регулярное выражение для имени модуля". Например, "Регистры?Сведений.КонтактнаяИнформация:ОбщийМодуль.РаботаСКонтактами". diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnosticTest.java index 0ef46ec0164..444f2221424 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnosticTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnosticTest.java @@ -14,13 +14,25 @@ class MetadataBordersDiagnosticTest extends AbstractDiagnosticTest diagnostics = getDiagnostics(); assertThat(diagnostics).hasSize(0); } @Test - void testConfigure() { + void testMatchesInValidModule() { + + Map configuration = diagnosticInstance.info.getDefaultConfiguration(); + configuration.put("metadataBordersParameters", "{\"лотус|шмотус\":\"MetadataBordersDiagnostic\"}"); + diagnosticInstance.configure(configuration); + + List diagnostics = getDiagnostics(); + + assertThat(diagnostics).hasSize(0); + } + + @Test + void testMatchesInWrongModule() { Map configuration = diagnosticInstance.info.getDefaultConfiguration(); configuration.put("metadataBordersParameters", "{\"лотус|шмотус\":\"MetadataBordersDiagnostic\"}"); From f06515a9ec1a6a0739736967d704a6cde05ad57e Mon Sep 17 00:00:00 2001 From: Golovanoff Sergio Date: Wed, 22 Sep 2021 14:41:09 +0700 Subject: [PATCH 06/15] =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0?= =?UTF-8?q?=D1=8E=D1=89=D0=B8=D0=B9=20=D0=B2=D0=B0=D1=80=D0=B8=D0=B0=D0=BD?= =?UTF-8?q?=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../diagnostics/MetadataBordersDiagnostic.java | 13 +++++++++---- .../MetadataBordersDiagnosticTest.java | 15 ++++++--------- .../diagnostics/MetadataBordersDiagnostic.bsl | 2 +- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java index 39b990e2634..df8c4246c37 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java +++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java @@ -47,13 +47,18 @@ public ParseTree visitStatement(BSLParser.StatementContext ctx){ for (Map.Entry entry: metadataBordersParameters.entrySet()) { - if (entry.getKey().trim().length() == 0) { + if (entry.getKey().isBlank() || entry.getValue().isBlank()) { continue; } - Pattern pattern = CaseInsensitivePattern.compile(entry.getKey()); - Matcher matcher = pattern.matcher(ctx.getText()); - while (matcher.find()) { + Pattern patternWhat = CaseInsensitivePattern.compile(entry.getKey()); + Matcher matcherWhat = patternWhat.matcher(ctx.getText()); + + Pattern patternWhere = CaseInsensitivePattern.compile(entry.getValue()); + Matcher matcherWhere = patternWhere.matcher(this.documentContext.getUri().getPath()); + boolean insideBorders = matcherWhere.find(); + + while (matcherWhat.find() && ! insideBorders) { diagnosticStorage.addDiagnostic(ctx); } } diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnosticTest.java index 444f2221424..92bf3b4da38 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnosticTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnosticTest.java @@ -23,7 +23,7 @@ void testWithoutSettings() { void testMatchesInValidModule() { Map configuration = diagnosticInstance.info.getDefaultConfiguration(); - configuration.put("metadataBordersParameters", "{\"лотус|шмотус\":\"MetadataBordersDiagnostic\"}"); + configuration.put("metadataBordersParameters", "{\"лотус|шмотус\":\"fake-uri\"}"); diagnosticInstance.configure(configuration); List diagnostics = getDiagnostics(); @@ -40,14 +40,11 @@ void testMatchesInWrongModule() { List diagnostics = getDiagnostics(); - assertThat(diagnostics).hasSize(6); + assertThat(diagnostics).hasSize(4); assertThat(diagnostics, true) - .hasRange(0, 42, 0, 47) - .hasRange(0, 48, 0, 54) - .hasRange(4, 4, 4, 9) - .hasRange(6, 24, 6, 29) - .hasRange(6, 34, 6, 39) - .hasRange(8, 4, 8, 10); - + .hasRange(3, 0, 6, 41) + .hasRange(3, 0, 6, 41) + .hasRange(3, 0, 6, 41) + .hasRange(8, 0, 8, 55); } } diff --git a/src/test/resources/diagnostics/MetadataBordersDiagnostic.bsl b/src/test/resources/diagnostics/MetadataBordersDiagnostic.bsl index 667763f8976..68d4b384d32 100644 --- a/src/test/resources/diagnostics/MetadataBordersDiagnostic.bsl +++ b/src/test/resources/diagnostics/MetadataBordersDiagnostic.bsl @@ -1,4 +1,4 @@ -// при насьтройке "лотус/шмотус:MetadataBordersDiagnostic" // тут не должно сработать +// при настройке "лотус|шмотус:MetadataBordersDiagnostic" // тут не должно сработать Запрос = Новый Запрос; Запрос.Текст = "ВЫБРАТЬ ПЕРВЫЕ 1 From 65557a862026627762def2d8d251ad010317739e Mon Sep 17 00:00:00 2001 From: Golovanoff Sergio Date: Wed, 22 Sep 2021 15:15:59 +0700 Subject: [PATCH 07/15] =?UTF-8?q?=D0=B4=D0=BE=D0=BA=D1=83=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D1=82=D0=B0=D1=86=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Conflicts: # docs/diagnostics/index.md # docs/en/diagnostics/index.md --- docs/diagnostics/index.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/diagnostics/index.md b/docs/diagnostics/index.md index c6a1f781b63..5ebdd8d7bcc 100644 --- a/docs/diagnostics/index.md +++ b/docs/diagnostics/index.md @@ -8,12 +8,12 @@ ## Список реализованных диагностик -Общее количество: **143** +Общее количество: **144** * Потенциальная уязвимость: **4** * Уязвимость: **4** * Ошибка: **44** -* Дефект кода: **91** +* Дефект кода: **92** | Ключ | Название | Включена по умолчанию | Важность | Тип | Тэги | @@ -89,6 +89,7 @@ [LogicalOrInTheWhereSectionOfQuery](LogicalOrInTheWhereSectionOfQuery.md) | Использование логического "ИЛИ" в секции "ГДЕ" запроса | Да | Важный | Дефект кода | `sql`
`performance`
`standard` [MagicDate](MagicDate.md) | Магические даты | Да | Незначительный | Дефект кода | `badpractice`
`brainoverload` [MagicNumber](MagicNumber.md) | Магические числа | Да | Незначительный | Дефект кода | `badpractice` + [MetadataBorders](MetadataBorders.md) | Границы метаданных | Да | Информационный | Дефект кода | `error` [MetadataObjectNameLength](MetadataObjectNameLength.md) | Имена объектов метаданных не должны превышать допустимой длины наименования | Да | Важный | Ошибка | `standard` [MethodSize](MethodSize.md) | Ограничение на размер метода | Да | Важный | Дефект кода | `badpractice` [MissingCodeTryCatchEx](MissingCodeTryCatchEx.md) | Конструкция "Попытка...Исключение...КонецПопытки" не содержит кода в исключении | Да | Важный | Ошибка | `standard`
`badpractice` From fdad879dbec803704e496c2689968444656890e7 Mon Sep 17 00:00:00 2001 From: Golovanoff Sergio Date: Thu, 23 Sep 2021 16:21:30 +0700 Subject: [PATCH 08/15] =?UTF-8?q?=D0=B4=D0=BE=D0=BA=D1=83=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D1=82=D0=B0=D1=86=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Conflicts: # docs/diagnostics/index.md # docs/en/diagnostics/index.md --- docs/diagnostics/MetadataBorders.md | 71 ++++++++++++++----- docs/en/diagnostics/MetadataBorders.md | 22 ++++-- docs/en/diagnostics/index.md | 5 +- .../MetadataBordersDiagnostic.java | 21 ++++++ .../configuration/parameters-schema.json | 36 ++++++++++ .../languageserver/configuration/schema.json | 6 ++ .../MetadataBordersDiagnostic_en.properties | 6 +- .../MetadataBordersDiagnosticTest.java | 21 ++++++ 8 files changed, 160 insertions(+), 28 deletions(-) diff --git a/docs/diagnostics/MetadataBorders.md b/docs/diagnostics/MetadataBorders.md index c0021eebd2b..878dccd5943 100644 --- a/docs/diagnostics/MetadataBorders.md +++ b/docs/diagnostics/MetadataBorders.md @@ -1,36 +1,75 @@ -# (metadataBorders) +# Границы метаданных (MetadataBorders) - +| Тип | Поддерживаются
языки | Важность | Включена
по умолчанию | Время на
исправление (мин) | Теги | +|:-------------:|:-----------------------------:|:----------------:|:------------------------------:|:-----------------------------------:|:-------:| +| `Дефект кода` | `BSL`
`OS` | `Информационный` | `Да` | `1` | `error` | -## +## Параметры + +| Имя | Тип | Описание | Значение
по умолчанию | +|:---------------------------:|:--------:|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|:------------------------------:| +| `metadataBordersParameters` | `Строка` | `JSON-структура для пар "регулярное выражение для операторов":"регулярное выражение для имени модуля". Например, "Регистры?Сведений.КонтактнаяИнформация:ОбщийМодуль.РаботаСКонтактами".` | `` | ## Описание диагностики - +Диагностика обращения к метаданным за пределами разрешенных границ. +Нужна, если, например, в компании установлены правила обращения +к каким-то метаданным только из определенного общего модуля. ## Примеры - +Например, получение контактной информации по внутренним правилам должно происходить +только через функции общего модуля РаботаСКонтактами. +Тогда заданные настройки вида -## Источники - - +Можно запретить использование нескольких метаданных: + +```"Регистры?Сведений.КонтактнаяИнформация|Справочники?.Контакты":"CommonModules/РаботаСКонтактами"``` + +Настройки задаются в виде json-строки: +``` +{ + "Регистры?Сведений.КонтактнаяИнформация":"CommonModules/РаботаСКонтактами", + "Справочники?.СтрокиСоединения":"DataProcessors/ВнешниеСоединения|CommonModules/ПодключениеК*" +} +``` + + +## Источники ## Сниппеты - + ### Экранирование кода ```bsl -// BSLLS:metadataBorders-off -// BSLLS:metadataBorders-on +// BSLLS:MetadataBorders-off +// BSLLS:MetadataBorders-on ``` ### Параметр конфигурационного файла ```json -"metadataBorders": -``` \ No newline at end of file +"MetadataBorders": { + "metadataBordersParameters": "" +} +``` diff --git a/docs/en/diagnostics/MetadataBorders.md b/docs/en/diagnostics/MetadataBorders.md index 760540ed7b0..5d440c679eb 100644 --- a/docs/en/diagnostics/MetadataBorders.md +++ b/docs/en/diagnostics/MetadataBorders.md @@ -1,9 +1,15 @@ -# (metadataBorders) +# Границы метаданных (MetadataBorders) - +| Type | Scope | Severity | Activated
by default | Minutes
to fix | Tags | +|:------------:|:-------------------:|:--------:|:-----------------------------:|:-----------------------:|:-------:| +| `Code smell` | `BSL`
`OS` | `Info` | `Yes` | `1` | `error` | -## +## Parameters + +| Name | Type | Description | Default value | +|:---------------------------:|:--------:|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|:-------------:| +| `metadataBordersParameters` | `String` | `JSON-структура для пар "регулярное выражение для операторов":"регулярное выражение для имени модуля". Например, "Регистры?Сведений.КонтактнаяИнформация:ОбщийМодуль.РаботаСКонтактами".` | `` | ## Description @@ -20,17 +26,19 @@ * Источник: [Cognitive complexity, ver. 1.4](https://www.sonarsource.com/docs/CognitiveComplexity.pdf) --> ## Snippets - + ### Diagnostic ignorance in code ```bsl -// BSLLS:metadataBorders-off -// BSLLS:metadataBorders-on +// BSLLS:MetadataBorders-off +// BSLLS:MetadataBorders-on ``` ### Parameter for config ```json -"metadataBorders": +"MetadataBorders": { + "metadataBordersParameters": "" +} ``` diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md index 66dc007c0af..c693d187fb7 100644 --- a/docs/en/diagnostics/index.md +++ b/docs/en/diagnostics/index.md @@ -8,12 +8,12 @@ To escape individual sections of code or files from triggering diagnostics, you ## Implemented diagnostics -Total: **143** +Total: **144** * Security Hotspot: **4** * Vulnerability: **4** * Error: **44** -* Code smell: **91** +* Code smell: **92** | Key | Name| Enabled by default | Severity | Type | Tags | @@ -89,6 +89,7 @@ Total: **143** [LogicalOrInTheWhereSectionOfQuery](LogicalOrInTheWhereSectionOfQuery.md) | Using a logical "OR" in the "WHERE" section of a query | Yes | Major | Code smell | `sql`
`performance`
`standard` [MagicDate](MagicDate.md) | Magic dates | Yes | Minor | Code smell | `badpractice`
`brainoverload` [MagicNumber](MagicNumber.md) | Magic numbers | Yes | Minor | Code smell | `badpractice` + [MetadataBorders](MetadataBorders.md) | Границы метаданных | Yes | Info | Code smell | `error` [MetadataObjectNameLength](MetadataObjectNameLength.md) | Metadata object names must not exceed the allowed length | Yes | Major | Error | `standard` [MethodSize](MethodSize.md) | Method size | Yes | Major | Code smell | `badpractice` [MissingCodeTryCatchEx](MissingCodeTryCatchEx.md) | Missing code in Raise block in "Try ... Raise ... EndTry" | Yes | Major | Error | `standard`
`badpractice` diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java index df8c4246c37..d982d536801 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java +++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java @@ -1,3 +1,24 @@ +/* + * This file is a part of BSL Language Server. + * + * Copyright (c) 2018-2021 + * Alexey Sosnoviy , Nikita Gryzlov and contributors + * + * SPDX-License-Identifier: LGPL-3.0-or-later + * + * BSL Language Server is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3.0 of the License, or (at your option) any later version. + * + * BSL Language Server is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with BSL Language Server. + */ package com.github._1c_syntax.bsl.languageserver.diagnostics; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/parameters-schema.json b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/parameters-schema.json index 6c0a28ff0db..aa76b4b82e1 100644 --- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/parameters-schema.json +++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/parameters-schema.json @@ -14,6 +14,24 @@ "title": "Assigning aliases to selected fields in a query", "$id": "#/definitions/AssignAliasFieldsInQuery" }, + "BadWords": { + "description": "Prohibited words", + "default": true, + "type": [ + "boolean", + "object" + ], + "title": "Prohibited words", + "properties": { + "badWords": { + "description": "Regular expression for prohibited words. Ex.: \"badWord1|badWord2\".", + "default": "", + "type": "string", + "title": "Regular expression for prohibited words. Ex.: \"badWord1|badWord2\"." + } + }, + "$id": "#/definitions/BadWords" + }, "BeginTransactionBeforeTryCatch": { "description": "Violating transaction rules for the 'BeginTransaction' method", "default": true, @@ -890,6 +908,24 @@ }, "$id": "#/definitions/MagicNumber" }, + "MetadataBorders": { + "description": "\u0413\u0440\u0430\u043d\u0438\u0446\u044b \u043c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0445", + "default": true, + "type": [ + "boolean", + "object" + ], + "title": "\u0413\u0440\u0430\u043d\u0438\u0446\u044b \u043c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0445", + "properties": { + "metadataBordersParameters": { + "description": "JSON-\u0441\u0442\u0440\u0443\u043a\u0442\u0443\u0440\u0430 \u0434\u043b\u044f \u043f\u0430\u0440 \"\u0440\u0435\u0433\u0443\u043b\u044f\u0440\u043d\u043e\u0435 \u0432\u044b\u0440\u0430\u0436\u0435\u043d\u0438\u0435 \u0434\u043b\u044f \u043e\u043f\u0435\u0440\u0430\u0442\u043e\u0440\u043e\u0432\":\"\u0440\u0435\u0433\u0443\u043b\u044f\u0440\u043d\u043e\u0435 \u0432\u044b\u0440\u0430\u0436\u0435\u043d\u0438\u0435 \u0434\u043b\u044f \u0438\u043c\u0435\u043d\u0438 \u043c\u043e\u0434\u0443\u043b\u044f\". \u041d\u0430\u043f\u0440\u0438\u043c\u0435\u0440, \"\u0420\u0435\u0433\u0438\u0441\u0442\u0440\u044b?\u0421\u0432\u0435\u0434\u0435\u043d\u0438\u0439.\u041a\u043e\u043d\u0442\u0430\u043a\u0442\u043d\u0430\u044f\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f:\u041e\u0431\u0449\u0438\u0439\u041c\u043e\u0434\u0443\u043b\u044c.\u0420\u0430\u0431\u043e\u0442\u0430\u0421\u041a\u043e\u043d\u0442\u0430\u043a\u0442\u0430\u043c\u0438\".", + "default": "", + "type": "string", + "title": "JSON-\u0441\u0442\u0440\u0443\u043a\u0442\u0443\u0440\u0430 \u0434\u043b\u044f \u043f\u0430\u0440 \"\u0440\u0435\u0433\u0443\u043b\u044f\u0440\u043d\u043e\u0435 \u0432\u044b\u0440\u0430\u0436\u0435\u043d\u0438\u0435 \u0434\u043b\u044f \u043e\u043f\u0435\u0440\u0430\u0442\u043e\u0440\u043e\u0432\":\"\u0440\u0435\u0433\u0443\u043b\u044f\u0440\u043d\u043e\u0435 \u0432\u044b\u0440\u0430\u0436\u0435\u043d\u0438\u0435 \u0434\u043b\u044f \u0438\u043c\u0435\u043d\u0438 \u043c\u043e\u0434\u0443\u043b\u044f\". \u041d\u0430\u043f\u0440\u0438\u043c\u0435\u0440, \"\u0420\u0435\u0433\u0438\u0441\u0442\u0440\u044b?\u0421\u0432\u0435\u0434\u0435\u043d\u0438\u0439.\u041a\u043e\u043d\u0442\u0430\u043a\u0442\u043d\u0430\u044f\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f:\u041e\u0431\u0449\u0438\u0439\u041c\u043e\u0434\u0443\u043b\u044c.\u0420\u0430\u0431\u043e\u0442\u0430\u0421\u041a\u043e\u043d\u0442\u0430\u043a\u0442\u0430\u043c\u0438\"." + } + }, + "$id": "#/definitions/MetadataBorders" + }, "MetadataObjectNameLength": { "description": "Metadata object names must not exceed the allowed length", "default": true, diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/schema.json b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/schema.json index e543592856e..af340362b73 100644 --- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/schema.json +++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/schema.json @@ -26,6 +26,9 @@ "AssignAliasFieldsInQuery": { "$ref": "parameters-schema.json#/definitions/AssignAliasFieldsInQuery" }, + "BadWords": { + "$ref": "parameters-schema.json#/definitions/BadWords" + }, "BeginTransactionBeforeTryCatch": { "$ref": "parameters-schema.json#/definitions/BeginTransactionBeforeTryCatch" }, @@ -236,6 +239,9 @@ "MagicNumber": { "$ref": "parameters-schema.json#/definitions/MagicNumber" }, + "MetadataBorders": { + "$ref": "parameters-schema.json#/definitions/MetadataBorders" + }, "MetadataObjectNameLength": { "$ref": "parameters-schema.json#/definitions/MetadataObjectNameLength" }, diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic_en.properties index 0664b19d58f..c0bb8b64931 100644 --- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic_en.properties +++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic_en.properties @@ -1,4 +1,4 @@ -diagnosticMessage=Обращение к метаданным за пределами разрешенных границ -diagnosticName=Границы метаданных -metadataBordersParameters=JSON-структура для пар "регулярное выражение для операторов":"регулярное выражение для имени модуля". Например, "Регистры?Сведений.КонтактнаяИнформация:ОбщийМодуль.РаботаСКонтактами". +diagnosticMessage=Use metadata outside the borders +diagnosticName=Metadata borders +metadataBordersParameters=JSON-structure for pairs "regex for statements":"regex for module names". Etc "InformationRegisters?.RegisterName:CommonModules/SpecialModule". diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnosticTest.java index 92bf3b4da38..6869d71d0d7 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnosticTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnosticTest.java @@ -1,3 +1,24 @@ +/* + * This file is a part of BSL Language Server. + * + * Copyright (c) 2018-2021 + * Alexey Sosnoviy , Nikita Gryzlov and contributors + * + * SPDX-License-Identifier: LGPL-3.0-or-later + * + * BSL Language Server is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3.0 of the License, or (at your option) any later version. + * + * BSL Language Server is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with BSL Language Server. + */ package com.github._1c_syntax.bsl.languageserver.diagnostics; import org.eclipse.lsp4j.Diagnostic; From 8912ca2f913597c1305892bf3fdfed5512cc07bf Mon Sep 17 00:00:00 2001 From: Golovanoff Sergio Date: Thu, 23 Sep 2021 11:14:55 +0700 Subject: [PATCH 09/15] =?UTF-8?q?=D1=83=D0=B1=D1=80=D0=B0=D0=BB=20=D0=B2?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B8=D0=BD=D0=B3=20=D0=BD=D0=B0=20=D0=BA?= =?UTF-8?q?=D0=B0=D1=81=D1=82=20=D0=BC=D0=B0=D0=BF=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/diagnostics/MetadataBorders.md | 4 +-- docs/en/diagnostics/MetadataBorders.md | 8 ++--- docs/en/diagnostics/index.md | 2 +- gradle/wrapper/gradle-wrapper.jar | Bin 59203 -> 59536 bytes gradlew | 2 +- .../MetadataBordersDiagnostic.java | 22 ++++++++----- .../configuration/parameters-schema.json | 8 ++--- .../MetadataBordersDiagnosticTest.java | 31 +++++++++++++----- .../diagnostics/MetadataBordersDiagnostic.bsl | 12 ++++--- 9 files changed, 55 insertions(+), 34 deletions(-) diff --git a/docs/diagnostics/MetadataBorders.md b/docs/diagnostics/MetadataBorders.md index 878dccd5943..9ca5b4da796 100644 --- a/docs/diagnostics/MetadataBorders.md +++ b/docs/diagnostics/MetadataBorders.md @@ -21,7 +21,7 @@ только через функции общего модуля РаботаСКонтактами. Тогда заданные настройки вида -```"Регистры?Сведений.КонтактнаяИнформация":"CommonModules/РаботаСКонтактами"``` +```{"Регистры?Сведений.КонтактнаяИнформация":"CommonModules/РаботаСКонтактами"}``` вызовут срабатывание диагностики на запросе с текстом @@ -43,7 +43,7 @@ Можно запретить использование нескольких метаданных: -```"Регистры?Сведений.КонтактнаяИнформация|Справочники?.Контакты":"CommonModules/РаботаСКонтактами"``` +```{"Регистры?Сведений.КонтактнаяИнформация|Справочники?.Контакты":"CommonModules/РаботаСКонтактами"}``` Настройки задаются в виде json-строки: ``` diff --git a/docs/en/diagnostics/MetadataBorders.md b/docs/en/diagnostics/MetadataBorders.md index 5d440c679eb..1ea475831bf 100644 --- a/docs/en/diagnostics/MetadataBorders.md +++ b/docs/en/diagnostics/MetadataBorders.md @@ -1,4 +1,4 @@ -# Границы метаданных (MetadataBorders) +# Metadata borders (MetadataBorders) | Type | Scope | Severity | Activated
by default | Minutes
to fix | Tags | |:------------:|:-------------------:|:--------:|:-----------------------------:|:-----------------------:|:-------:| @@ -7,9 +7,9 @@ ## Parameters -| Name | Type | Description | Default value | -|:---------------------------:|:--------:|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|:-------------:| -| `metadataBordersParameters` | `String` | `JSON-структура для пар "регулярное выражение для операторов":"регулярное выражение для имени модуля". Например, "Регистры?Сведений.КонтактнаяИнформация:ОбщийМодуль.РаботаСКонтактами".` | `` | +| Name | Type | Description | Default value | +|:---------------------------:|:--------:|:-------------------------------------------------------------------------------------------------------------------------------------------------:|:-------------:| +| `metadataBordersParameters` | `String` | `JSON-structure for pairs "regex for statements":"regex for module names". Etc "InformationRegisters?.RegisterName:CommonModules/SpecialModule".` | `` | ## Description diff --git a/docs/en/diagnostics/index.md b/docs/en/diagnostics/index.md index c693d187fb7..c2967929bb7 100644 --- a/docs/en/diagnostics/index.md +++ b/docs/en/diagnostics/index.md @@ -89,7 +89,7 @@ Total: **144** [LogicalOrInTheWhereSectionOfQuery](LogicalOrInTheWhereSectionOfQuery.md) | Using a logical "OR" in the "WHERE" section of a query | Yes | Major | Code smell | `sql`
`performance`
`standard` [MagicDate](MagicDate.md) | Magic dates | Yes | Minor | Code smell | `badpractice`
`brainoverload` [MagicNumber](MagicNumber.md) | Magic numbers | Yes | Minor | Code smell | `badpractice` - [MetadataBorders](MetadataBorders.md) | Границы метаданных | Yes | Info | Code smell | `error` + [MetadataBorders](MetadataBorders.md) | Metadata borders | Yes | Info | Code smell | `error` [MetadataObjectNameLength](MetadataObjectNameLength.md) | Metadata object names must not exceed the allowed length | Yes | Major | Error | `standard` [MethodSize](MethodSize.md) | Method size | Yes | Major | Code smell | `badpractice` [MissingCodeTryCatchEx](MissingCodeTryCatchEx.md) | Missing code in Raise block in "Try ... Raise ... EndTry" | Yes | Major | Error | `standard`
`badpractice` diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c023ec8b20f512888fe07c5bd3ff77bb8f..7454180f2ae8848c63b8b4dea2cb829da983f2fa 100644 GIT binary patch delta 18435 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 B8dv}T delta 17845 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 X49Luk)baa85H9$5YCsTPT`SVRWMtMW diff --git a/gradlew b/gradlew index 4f906e0c811..744e882ed57 100755 --- a/gradlew +++ b/gradlew @@ -72,7 +72,7 @@ case "`uname`" in Darwin* ) darwin=true ;; - MINGW* ) + MSYS* | MINGW* ) msys=true ;; NONSTOP* ) diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java index d982d536801..6f626e623fe 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java +++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java @@ -23,6 +23,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.type.MapType; import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.*; import com.github._1c_syntax.bsl.parser.*; import com.github._1c_syntax.utils.*; @@ -48,11 +49,13 @@ public class MetadataBordersDiagnostic extends AbstractVisitorDiagnostic { type = String.class, defaultValue = "" ) - private Map metadataBordersParameters = MapFromJSON(METADATA_BORDERS_DEFAULT); + private HashMap metadataBordersParameters = MapFromJSON(METADATA_BORDERS_DEFAULT); private static HashMap MapFromJSON(String userSettings) { + ObjectMapper mapper = new ObjectMapper(); + MapType mapType = mapper.getTypeFactory().constructMapType(HashMap.class, String.class, String.class); try { - return new ObjectMapper().readValue(userSettings, HashMap.class); + return mapper.readValue(userSettings, mapType); } catch (JsonProcessingException e) { return new HashMap<>(); } @@ -60,7 +63,8 @@ private static HashMap MapFromJSON(String userSettings) { @Override public void configure(Map configuration) { - this.metadataBordersParameters = MapFromJSON( (String) configuration.getOrDefault("metadataBordersParameters", METADATA_BORDERS_DEFAULT)); + this.metadataBordersParameters = MapFromJSON( + (String) configuration.getOrDefault("metadataBordersParameters", METADATA_BORDERS_DEFAULT)); } @Override @@ -72,14 +76,14 @@ public ParseTree visitStatement(BSLParser.StatementContext ctx){ continue; } - Pattern patternWhat = CaseInsensitivePattern.compile(entry.getKey()); - Matcher matcherWhat = patternWhat.matcher(ctx.getText()); + Matcher matcher = CaseInsensitivePattern.compile(entry.getKey()) + .matcher(ctx.getText()); - Pattern patternWhere = CaseInsensitivePattern.compile(entry.getValue()); - Matcher matcherWhere = patternWhere.matcher(this.documentContext.getUri().getPath()); - boolean insideBorders = matcherWhere.find(); + boolean insideBorders = CaseInsensitivePattern.compile(entry.getValue()) + .matcher(this.documentContext.getUri().getPath()) + .find(); - while (matcherWhat.find() && ! insideBorders) { + while (matcher.find() && ! insideBorders) { diagnosticStorage.addDiagnostic(ctx); } } diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/parameters-schema.json b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/parameters-schema.json index aa76b4b82e1..d33f495a7bb 100644 --- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/parameters-schema.json +++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/parameters-schema.json @@ -909,19 +909,19 @@ "$id": "#/definitions/MagicNumber" }, "MetadataBorders": { - "description": "\u0413\u0440\u0430\u043d\u0438\u0446\u044b \u043c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0445", + "description": "Metadata borders", "default": true, "type": [ "boolean", "object" ], - "title": "\u0413\u0440\u0430\u043d\u0438\u0446\u044b \u043c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0445", + "title": "Metadata borders", "properties": { "metadataBordersParameters": { - "description": "JSON-\u0441\u0442\u0440\u0443\u043a\u0442\u0443\u0440\u0430 \u0434\u043b\u044f \u043f\u0430\u0440 \"\u0440\u0435\u0433\u0443\u043b\u044f\u0440\u043d\u043e\u0435 \u0432\u044b\u0440\u0430\u0436\u0435\u043d\u0438\u0435 \u0434\u043b\u044f \u043e\u043f\u0435\u0440\u0430\u0442\u043e\u0440\u043e\u0432\":\"\u0440\u0435\u0433\u0443\u043b\u044f\u0440\u043d\u043e\u0435 \u0432\u044b\u0440\u0430\u0436\u0435\u043d\u0438\u0435 \u0434\u043b\u044f \u0438\u043c\u0435\u043d\u0438 \u043c\u043e\u0434\u0443\u043b\u044f\". \u041d\u0430\u043f\u0440\u0438\u043c\u0435\u0440, \"\u0420\u0435\u0433\u0438\u0441\u0442\u0440\u044b?\u0421\u0432\u0435\u0434\u0435\u043d\u0438\u0439.\u041a\u043e\u043d\u0442\u0430\u043a\u0442\u043d\u0430\u044f\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f:\u041e\u0431\u0449\u0438\u0439\u041c\u043e\u0434\u0443\u043b\u044c.\u0420\u0430\u0431\u043e\u0442\u0430\u0421\u041a\u043e\u043d\u0442\u0430\u043a\u0442\u0430\u043c\u0438\".", + "description": "JSON-structure for pairs \"regex for statements\":\"regex for module names\". Etc \"InformationRegisters?.RegisterName:CommonModules/SpecialModule\".", "default": "", "type": "string", - "title": "JSON-\u0441\u0442\u0440\u0443\u043a\u0442\u0443\u0440\u0430 \u0434\u043b\u044f \u043f\u0430\u0440 \"\u0440\u0435\u0433\u0443\u043b\u044f\u0440\u043d\u043e\u0435 \u0432\u044b\u0440\u0430\u0436\u0435\u043d\u0438\u0435 \u0434\u043b\u044f \u043e\u043f\u0435\u0440\u0430\u0442\u043e\u0440\u043e\u0432\":\"\u0440\u0435\u0433\u0443\u043b\u044f\u0440\u043d\u043e\u0435 \u0432\u044b\u0440\u0430\u0436\u0435\u043d\u0438\u0435 \u0434\u043b\u044f \u0438\u043c\u0435\u043d\u0438 \u043c\u043e\u0434\u0443\u043b\u044f\". \u041d\u0430\u043f\u0440\u0438\u043c\u0435\u0440, \"\u0420\u0435\u0433\u0438\u0441\u0442\u0440\u044b?\u0421\u0432\u0435\u0434\u0435\u043d\u0438\u0439.\u041a\u043e\u043d\u0442\u0430\u043a\u0442\u043d\u0430\u044f\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f:\u041e\u0431\u0449\u0438\u0439\u041c\u043e\u0434\u0443\u043b\u044c.\u0420\u0430\u0431\u043e\u0442\u0430\u0421\u041a\u043e\u043d\u0442\u0430\u043a\u0442\u0430\u043c\u0438\"." + "title": "JSON-structure for pairs \"regex for statements\":\"regex for module names\". Etc \"InformationRegisters?.RegisterName:CommonModules/SpecialModule\"." } }, "$id": "#/definitions/MetadataBorders" diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnosticTest.java index 6869d71d0d7..cc72608f514 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnosticTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnosticTest.java @@ -41,10 +41,10 @@ void testWithoutSettings() { } @Test - void testMatchesInValidModule() { + void testMatchesInProperModule() { Map configuration = diagnosticInstance.info.getDefaultConfiguration(); - configuration.put("metadataBordersParameters", "{\"лотус|шмотус\":\"fake-uri\"}"); + configuration.put("metadataBordersParameters", "{\"Регистры?Сведений.КонтактнаяИнформация|Справочники?.Контакты\":\"fake-uri\"}"); diagnosticInstance.configure(configuration); List diagnostics = getDiagnostics(); @@ -56,16 +56,31 @@ void testMatchesInValidModule() { void testMatchesInWrongModule() { Map configuration = diagnosticInstance.info.getDefaultConfiguration(); - configuration.put("metadataBordersParameters", "{\"лотус|шмотус\":\"MetadataBordersDiagnostic\"}"); + configuration.put("metadataBordersParameters", "{\"Регистры?Сведений.КонтактнаяИнформация|Справочники?.Контакты\":\"MetadataBordersDiagnostic\"}"); diagnosticInstance.configure(configuration); List diagnostics = getDiagnostics(); - assertThat(diagnostics).hasSize(4); + assertThat(diagnostics).hasSize(3); assertThat(diagnostics, true) - .hasRange(3, 0, 6, 41) - .hasRange(3, 0, 6, 41) - .hasRange(3, 0, 6, 41) - .hasRange(8, 0, 8, 55); + .hasRange(3, 0, 6, 49) + .hasRange(8, 0, 8, 69) + .hasRange(10, 0, 10, 103); + } + + @Test + void testSeveralSettings() { + + Map configuration = diagnosticInstance.info.getDefaultConfiguration(); + configuration.put("metadataBordersParameters", + "{\"Регистры?Сведений.КонтактнаяИнформация\":\"fake-uri\"," + + "\"Справочники?.Контакты\":\"MetadataBordersDiagnostic\"}"); + diagnosticInstance.configure(configuration); + + List diagnostics = getDiagnostics(); + + assertThat(diagnostics).hasSize(1); + assertThat(diagnostics, true) + .hasRange(10, 0, 10, 103); } } diff --git a/src/test/resources/diagnostics/MetadataBordersDiagnostic.bsl b/src/test/resources/diagnostics/MetadataBordersDiagnostic.bsl index 68d4b384d32..92d7c7d342d 100644 --- a/src/test/resources/diagnostics/MetadataBordersDiagnostic.bsl +++ b/src/test/resources/diagnostics/MetadataBordersDiagnostic.bsl @@ -1,9 +1,11 @@ -// при настройке "лотус|шмотус:MetadataBordersDiagnostic" // тут не должно сработать +// в комментарии срабатываний быть не должно РегистрыСведений.КонтактнаяИнформация Запрос = Новый Запрос; -Запрос.Текст = "ВЫБРАТЬ ПЕРВЫЕ 1 -| Лотус.Ссылка КАК Узел //тут должно сработать +Запрос.Текст = "ВЫБРАТЬ +| КИ.ЗначениеКонтакта КАК Адрес |ИЗ -| ПланОбмена.ДиспетчерЛотус КАК Лотус"; //тут должно сработать дважды +| РегистрСведений.КонтактнаяИнформация КАК КИ"; //срабатывание -УзелШмотуса = Запрос.Выполнить().Выгрузить()[0].Ссылка; //тут должно сработать +Адреса = РегистрыСведений.КонтактнаяИнформация.СоздатьНаборЗаписей(); //срабатывание + +АдресИзСправочника = ЗначениеРеквизитаОбъекта(Справочники.Контакты.НайтиПоКоду(1), "ЗначениеКонтакта"); // срабатывание \ No newline at end of file From 1248793d9e931acdef7d95373a883bafab68b982 Mon Sep 17 00:00:00 2001 From: Golovanoff Sergio Date: Thu, 23 Sep 2021 18:28:34 +0700 Subject: [PATCH 10/15] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20?= =?UTF-8?q?=D0=B4=D0=B8=D0=B0=D0=B3=D0=BD=D0=BE=D1=81=D1=82=D0=B8=D0=BA?= =?UTF-8?q?=D1=83=20=D0=BE=D1=82=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=BD?= =?UTF-8?q?=D0=BE=D0=B9=20=D0=BF=D0=BE=20=D1=83=D0=BC=D0=BE=D0=BB=D1=87?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/diagnostics/MetadataBorders.md | 4 ++-- docs/en/diagnostics/MetadataBorders.md | 4 ++-- .../languageserver/diagnostics/MetadataBordersDiagnostic.java | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/diagnostics/MetadataBorders.md b/docs/diagnostics/MetadataBorders.md index 9ca5b4da796..24fd7860d4a 100644 --- a/docs/diagnostics/MetadataBorders.md +++ b/docs/diagnostics/MetadataBorders.md @@ -2,9 +2,9 @@ | Тип | Поддерживаются
языки | Важность | Включена
по умолчанию | Время на
исправление (мин) | Теги | |:-------------:|:-----------------------------:|:----------------:|:------------------------------:|:-----------------------------------:|:-------:| -| `Дефект кода` | `BSL`
`OS` | `Информационный` | `Да` | `1` | `error` | +| `Дефект кода` | `BSL`
`OS` | `Информационный` | `Нет` | `1` | `error` | -## Параметры +## Параметры | Имя | Тип | Описание | Значение
по умолчанию | diff --git a/docs/en/diagnostics/MetadataBorders.md b/docs/en/diagnostics/MetadataBorders.md index 1ea475831bf..773e5570f0c 100644 --- a/docs/en/diagnostics/MetadataBorders.md +++ b/docs/en/diagnostics/MetadataBorders.md @@ -2,9 +2,9 @@ | Type | Scope | Severity | Activated
by default | Minutes
to fix | Tags | |:------------:|:-------------------:|:--------:|:-----------------------------:|:-----------------------:|:-------:| -| `Code smell` | `BSL`
`OS` | `Info` | `Yes` | `1` | `error` | +| `Code smell` | `BSL`
`OS` | `Info` | `No` | `1` | `error` | -## Parameters +## Parameters | Name | Type | Description | Default value | diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java index 6f626e623fe..d72ed3e5a14 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java +++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java @@ -36,6 +36,7 @@ type = DiagnosticType.CODE_SMELL, severity = DiagnosticSeverity.INFO, minutesToFix = 1, + activatedByDefault = false, tags = { DiagnosticTag.ERROR } From 13798917e5600acccd5d57ba941e3368fe061121 Mon Sep 17 00:00:00 2001 From: Golovanoff Sergio Date: Sun, 26 Sep 2021 13:19:15 +0700 Subject: [PATCH 11/15] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D1=82=D0=B0?= =?UTF-8?q?=D1=89=D0=B8=D0=BB=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=B8=D0=BB=D1=8F?= =?UTF-8?q?=D1=86=D0=B8=D1=8E=20=D0=BF=D0=B0=D1=82=D1=82=D0=B5=D1=80=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=20=D0=B8=20=D0=B8=D1=85=20=D1=84=D0=B8=D0=BB=D1=8C?= =?UTF-8?q?=D1=82=D1=80=D0=B0=D1=86=D0=B8=D1=8E=20=D0=B2=20configure?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MetadataBordersDiagnostic.java | 35 ++++++++++--------- .../MetadataBordersDiagnosticTest.java | 8 ++--- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java index d72ed3e5a14..7460514dd00 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java +++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java @@ -31,6 +31,7 @@ import java.util.*; import java.util.regex.*; +import java.util.stream.Collectors; @DiagnosticMetadata( type = DiagnosticType.CODE_SMELL, @@ -38,7 +39,7 @@ minutesToFix = 1, activatedByDefault = false, tags = { - DiagnosticTag.ERROR + DiagnosticTag.DESIGN } ) @@ -50,15 +51,20 @@ public class MetadataBordersDiagnostic extends AbstractVisitorDiagnostic { type = String.class, defaultValue = "" ) - private HashMap metadataBordersParameters = MapFromJSON(METADATA_BORDERS_DEFAULT); + private Map metadataBordersParameters = MapFromJSON(METADATA_BORDERS_DEFAULT); - private static HashMap MapFromJSON(String userSettings) { + private static Map MapFromJSON(String userSettings) { ObjectMapper mapper = new ObjectMapper(); MapType mapType = mapper.getTypeFactory().constructMapType(HashMap.class, String.class, String.class); try { - return mapper.readValue(userSettings, mapType); + Map stringMap = mapper.readValue(userSettings, mapType); + return stringMap.entrySet().stream() + .filter(entry -> ! entry.getKey().isBlank() && ! entry.getValue().isBlank()) + .collect(Collectors.toMap( + entry -> CaseInsensitivePattern.compile(entry.getKey()), + entry -> CaseInsensitivePattern.compile(entry.getValue()))); } catch (JsonProcessingException e) { - return new HashMap<>(); + return Collections.emptyMap(); } } @@ -71,21 +77,16 @@ public void configure(Map configuration) { @Override public ParseTree visitStatement(BSLParser.StatementContext ctx){ - for (Map.Entry entry: metadataBordersParameters.entrySet()) { + for (Map.Entry entry: metadataBordersParameters.entrySet()) { - if (entry.getKey().isBlank() || entry.getValue().isBlank()) { - continue; - } - - Matcher matcher = CaseInsensitivePattern.compile(entry.getKey()) - .matcher(ctx.getText()); + boolean insideBorders = entry.getValue().matcher(this.documentContext.getUri().getPath()).find(); - boolean insideBorders = CaseInsensitivePattern.compile(entry.getValue()) - .matcher(this.documentContext.getUri().getPath()) - .find(); + if (! insideBorders) { - while (matcher.find() && ! insideBorders) { - diagnosticStorage.addDiagnostic(ctx); + Matcher matcher = entry.getKey().matcher(ctx.getText()); + while (matcher.find()) { + diagnosticStorage.addDiagnostic(ctx); + } } } return super.visitStatement(ctx); diff --git a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnosticTest.java b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnosticTest.java index cc72608f514..1f1f49d58c6 100644 --- a/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnosticTest.java +++ b/src/test/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnosticTest.java @@ -44,9 +44,9 @@ void testWithoutSettings() { void testMatchesInProperModule() { Map configuration = diagnosticInstance.info.getDefaultConfiguration(); - configuration.put("metadataBordersParameters", "{\"Регистры?Сведений.КонтактнаяИнформация|Справочники?.Контакты\":\"fake-uri\"}"); + configuration.put("metadataBordersParameters", + "{\"Регистры?Сведений.КонтактнаяИнформация|Справочники?.Контакты\":\"fake-uri\"}"); diagnosticInstance.configure(configuration); - List diagnostics = getDiagnostics(); assertThat(diagnostics).hasSize(0); @@ -56,9 +56,9 @@ void testMatchesInProperModule() { void testMatchesInWrongModule() { Map configuration = diagnosticInstance.info.getDefaultConfiguration(); - configuration.put("metadataBordersParameters", "{\"Регистры?Сведений.КонтактнаяИнформация|Справочники?.Контакты\":\"MetadataBordersDiagnostic\"}"); + configuration.put("metadataBordersParameters", + "{\"Регистры?Сведений.КонтактнаяИнформация|Справочники?.Контакты\":\"MetadataBordersDiagnostic\"}"); diagnosticInstance.configure(configuration); - List diagnostics = getDiagnostics(); assertThat(diagnostics).hasSize(3); From 84e4d9dbb20ab80ebf59f5bd3257be73193a8399 Mon Sep 17 00:00:00 2001 From: Golovanoff Sergio Date: Sun, 26 Sep 2021 13:25:28 +0700 Subject: [PATCH 12/15] =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=B8=D0=BC=D0=BF=D0=BE=D1=80=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MetadataBordersDiagnostic.java | 19 +++++++++++++------ .../diagnostics/MetadataBordersDiagnostic.bsl | 2 +- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java index 7460514dd00..c6396600d78 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java +++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java @@ -24,13 +24,20 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.type.MapType; -import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.*; -import com.github._1c_syntax.bsl.parser.*; -import com.github._1c_syntax.utils.*; -import org.antlr.v4.runtime.tree.*; +import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticMetadata; +import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticParameter; +import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticSeverity; +import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticTag; +import com.github._1c_syntax.bsl.languageserver.diagnostics.metadata.DiagnosticType; +import com.github._1c_syntax.bsl.parser.BSLParser; +import com.github._1c_syntax.utils.CaseInsensitivePattern; +import org.antlr.v4.runtime.tree.ParseTree; -import java.util.*; -import java.util.regex.*; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import java.util.stream.Collectors; @DiagnosticMetadata( diff --git a/src/test/resources/diagnostics/MetadataBordersDiagnostic.bsl b/src/test/resources/diagnostics/MetadataBordersDiagnostic.bsl index 92d7c7d342d..2f437dab0a3 100644 --- a/src/test/resources/diagnostics/MetadataBordersDiagnostic.bsl +++ b/src/test/resources/diagnostics/MetadataBordersDiagnostic.bsl @@ -8,4 +8,4 @@ Адреса = РегистрыСведений.КонтактнаяИнформация.СоздатьНаборЗаписей(); //срабатывание -АдресИзСправочника = ЗначениеРеквизитаОбъекта(Справочники.Контакты.НайтиПоКоду(1), "ЗначениеКонтакта"); // срабатывание \ No newline at end of file +АдресИзСправочника = ЗначениеРеквизитаОбъекта(Справочники.Контакты.НайтиПоКоду(1), "ЗначениеКонтакта"); // срабатывание From 7171d3ff1e593b8d432ff7e5f637d0a5e66ff335 Mon Sep 17 00:00:00 2001 From: Golovanoff Sergio Date: Tue, 28 Sep 2021 16:41:11 +0700 Subject: [PATCH 13/15] =?UTF-8?q?=D0=BE=D0=BF=D1=82=D0=B8=D0=BC=D0=B8?= =?UTF-8?q?=D0=B7=D0=B0=D1=86=D0=B8=D1=8F=20-=20=D0=BF=D0=B5=D1=80=D0=B5?= =?UTF-8?q?=D0=BF=D0=B8=D1=81=D0=B0=D0=BB=20=D1=87=D0=B5=D1=80=D0=B5=D0=B7?= =?UTF-8?q?=20visitFile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/diagnostics/MetadataBorders.md | 12 ++++---- docs/en/diagnostics/MetadataBorders.md | 12 ++++---- .../MetadataBordersDiagnostic.java | 30 ++++++++++++------- .../MetadataBordersDiagnostic_en.properties | 2 +- .../MetadataBordersDiagnostic_ru.properties | 2 +- 5 files changed, 33 insertions(+), 25 deletions(-) diff --git a/docs/diagnostics/MetadataBorders.md b/docs/diagnostics/MetadataBorders.md index 24fd7860d4a..304529500b4 100644 --- a/docs/diagnostics/MetadataBorders.md +++ b/docs/diagnostics/MetadataBorders.md @@ -1,15 +1,15 @@ # Границы метаданных (MetadataBorders) -| Тип | Поддерживаются
языки | Важность | Включена
по умолчанию | Время на
исправление (мин) | Теги | -|:-------------:|:-----------------------------:|:----------------:|:------------------------------:|:-----------------------------------:|:-------:| -| `Дефект кода` | `BSL`
`OS` | `Информационный` | `Нет` | `1` | `error` | +| Тип | Поддерживаются
языки | Важность | Включена
по умолчанию | Время на
исправление (мин) | Теги | +|:-------------:|:-----------------------------:|:----------------:|:------------------------------:|:-----------------------------------:|:--------:| +| `Дефект кода` | `BSL`
`OS` | `Информационный` | `Нет` | `1` | `design` | ## Параметры -| Имя | Тип | Описание | Значение
по умолчанию | -|:---------------------------:|:--------:|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------:|:------------------------------:| -| `metadataBordersParameters` | `Строка` | `JSON-структура для пар "регулярное выражение для операторов":"регулярное выражение для имени модуля". Например, "Регистры?Сведений.КонтактнаяИнформация:ОбщийМодуль.РаботаСКонтактами".` | `` | +| Имя | Тип | Описание | Значение
по умолчанию | +|:---------------------------:|:--------:|:------------------------------------------------------------------------------------------------------------:|:------------------------------:| +| `metadataBordersParameters` | `Строка` | `JSON-структура для пар "регулярное выражение для операторов":"регулярное выражение для имени файла модуля"` | `` | ## Описание диагностики Диагностика обращения к метаданным за пределами разрешенных границ. diff --git a/docs/en/diagnostics/MetadataBorders.md b/docs/en/diagnostics/MetadataBorders.md index 773e5570f0c..e67863a66b9 100644 --- a/docs/en/diagnostics/MetadataBorders.md +++ b/docs/en/diagnostics/MetadataBorders.md @@ -1,15 +1,15 @@ # Metadata borders (MetadataBorders) -| Type | Scope | Severity | Activated
by default | Minutes
to fix | Tags | -|:------------:|:-------------------:|:--------:|:-----------------------------:|:-----------------------:|:-------:| -| `Code smell` | `BSL`
`OS` | `Info` | `No` | `1` | `error` | +| Type | Scope | Severity | Activated
by default | Minutes
to fix | Tags | +|:------------:|:-------------------:|:--------:|:-----------------------------:|:-----------------------:|:--------:| +| `Code smell` | `BSL`
`OS` | `Info` | `No` | `1` | `design` | ## Parameters -| Name | Type | Description | Default value | -|:---------------------------:|:--------:|:-------------------------------------------------------------------------------------------------------------------------------------------------:|:-------------:| -| `metadataBordersParameters` | `String` | `JSON-structure for pairs "regex for statements":"regex for module names". Etc "InformationRegisters?.RegisterName:CommonModules/SpecialModule".` | `` | +| Name | Type | Description | Default value | +|:---------------------------:|:--------:|:---------------------------------------------------------------------------:|:-------------:| +| `metadataBordersParameters` | `String` | `JSON-structure for pairs "regex for statements":"regex for module names".` | `` | ## Description diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java index c6396600d78..ab1dfe89026 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java +++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java @@ -35,6 +35,7 @@ import java.util.Collections; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -60,6 +61,8 @@ public class MetadataBordersDiagnostic extends AbstractVisitorDiagnostic { ) private Map metadataBordersParameters = MapFromJSON(METADATA_BORDERS_DEFAULT); + private List statementPatterns = Collections.emptyList(); + private static Map MapFromJSON(String userSettings) { ObjectMapper mapper = new ObjectMapper(); MapType mapType = mapper.getTypeFactory().constructMapType(HashMap.class, String.class, String.class); @@ -77,25 +80,30 @@ private static Map MapFromJSON(String userSettings) { @Override public void configure(Map configuration) { - this.metadataBordersParameters = MapFromJSON( + metadataBordersParameters = MapFromJSON( (String) configuration.getOrDefault("metadataBordersParameters", METADATA_BORDERS_DEFAULT)); } @Override - public ParseTree visitStatement(BSLParser.StatementContext ctx){ + public ParseTree visitFile(BSLParser.FileContext ctx) { + statementPatterns = metadataBordersParameters.entrySet().stream() + .filter(entry -> ! entry.getValue().matcher(this.documentContext.getUri().getPath()).find()) + .map(Map.Entry::getKey) + .collect(Collectors.toList()); - for (Map.Entry entry: metadataBordersParameters.entrySet()) { - - boolean insideBorders = entry.getValue().matcher(this.documentContext.getUri().getPath()).find(); + return super.visitFile(ctx); + } - if (! insideBorders) { + @Override + public ParseTree visitStatement(BSLParser.StatementContext ctx){ - Matcher matcher = entry.getKey().matcher(ctx.getText()); - while (matcher.find()) { - diagnosticStorage.addDiagnostic(ctx); - } + statementPatterns.forEach(pattern -> { + Matcher matcher = pattern.matcher(ctx.getText()); + while (matcher.find()) { + diagnosticStorage.addDiagnostic(ctx); } - } + }); + return super.visitStatement(ctx); } } diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic_en.properties index c0bb8b64931..4cc079d8e37 100644 --- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic_en.properties +++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic_en.properties @@ -1,4 +1,4 @@ diagnosticMessage=Use metadata outside the borders diagnosticName=Metadata borders -metadataBordersParameters=JSON-structure for pairs "regex for statements":"regex for module names". Etc "InformationRegisters?.RegisterName:CommonModules/SpecialModule". +metadataBordersParameters=JSON-structure for pairs "regex for statements":"regex for module names". diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic_ru.properties index 842dfed4b03..5a33a88487f 100644 --- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic_ru.properties +++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic_ru.properties @@ -1,3 +1,3 @@ diagnosticMessage=Обращение к метаданным за пределами разрешенных границ diagnosticName=Границы метаданных -metadataBordersParameters=JSON-структура для пар "регулярное выражение для операторов":"регулярное выражение для имени модуля". Например, "Регистры?Сведений.КонтактнаяИнформация:ОбщийМодуль.РаботаСКонтактами". +metadataBordersParameters=JSON-структура для пар "регулярное выражение для операторов":"регулярное выражение для имени файла модуля" From 239f1c0e1fe44ffa88967677f1657f7e38236d0a Mon Sep 17 00:00:00 2001 From: Golovanoff Sergio Date: Thu, 30 Sep 2021 17:23:29 +0700 Subject: [PATCH 14/15] =?UTF-8?q?=D0=A3=D0=B1=D1=80=D0=B0=D0=BB=20=D0=BF?= =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=BD=D0=BE=D1=81=D1=8B=20=D1=81=D1=82=D1=80?= =?UTF-8?q?=D0=BE=D0=BA=20=D0=B8=D0=B7=20=D0=BE=D0=BF=D0=B8=D1=81=D0=B0?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=B4=D0=B8=D0=B0=D0=B3=D0=BD=D0=BE=D1=81?= =?UTF-8?q?=D1=82=D0=B8=D0=BA=D0=B8,=20=D0=B2=D1=8B=D1=87=D0=B8=D1=81?= =?UTF-8?q?=D1=82=D0=B8=D0=BB=20=D0=BB=D0=B5=D0=B2=D1=8B=D0=B5=20=D1=81?= =?UTF-8?q?=D1=82=D1=80=D0=BE=D0=BA=D0=B8=20=D0=B8=D0=B7=20json.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/diagnostics/MetadataBorders.md | 18 +++++------------- .../configuration/parameters-schema.json | 18 ------------------ .../languageserver/configuration/schema.json | 3 --- 3 files changed, 5 insertions(+), 34 deletions(-) diff --git a/docs/diagnostics/MetadataBorders.md b/docs/diagnostics/MetadataBorders.md index 304529500b4..e275e7f96e0 100644 --- a/docs/diagnostics/MetadataBorders.md +++ b/docs/diagnostics/MetadataBorders.md @@ -12,14 +12,10 @@ | `metadataBordersParameters` | `Строка` | `JSON-структура для пар "регулярное выражение для операторов":"регулярное выражение для имени файла модуля"` | `` | ## Описание диагностики -Диагностика обращения к метаданным за пределами разрешенных границ. -Нужна, если, например, в компании установлены правила обращения -к каким-то метаданным только из определенного общего модуля. +Диагностика обращения к метаданным за пределами разрешенных границ. Нужна, если, например, в компании установлены правила обращения к каким-то метаданным только из определенного общего модуля. ## Примеры -Например, получение контактной информации по внутренним правилам должно происходить -только через функции общего модуля РаботаСКонтактами. -Тогда заданные настройки вида +Например, получение контактной информации по внутренним правилам должно происходить только через функции общего модуля РаботаСКонтактами. Тогда заданные настройки вида ```{"Регистры?Сведений.КонтактнаяИнформация":"CommonModules/РаботаСКонтактами"}``` @@ -32,14 +28,11 @@ РегистрСведений.КонтактнаяИнформация КАК КИ" ``` -если этот запрос будет не в общем модуле РаботаСКонтактами. - -Так же эта диагностика с такой настройкой сработает и на оператор +если этот запрос будет не в общем модуле РаботаСКонтактами. Так же эта диагностика с такой настройкой сработает и на оператор ```НаборЗаписей = РегистрыСведений.ИспользованиеКонтактов.СоздатьНаборЗаписей();``` -В настройках обе части - это регулярные выражения java. -Вторая часть настройки сравнивается с путем к файлу выгрузки конфигурации. +В настройках обе части - это регулярные выражения java. Вторая часть настройки сравнивается с путем к файлу выгрузки конфигурации. Можно запретить использование нескольких метаданных: @@ -49,11 +42,10 @@ ``` { "Регистры?Сведений.КонтактнаяИнформация":"CommonModules/РаботаСКонтактами", - "Справочники?.СтрокиСоединения":"DataProcessors/ВнешниеСоединения|CommonModules/ПодключениеК*" + "Справочники?.СтрокиСоединения":"DataProcessors/ВнешниеСоединения|CommonModules/ПодключениеК.*" } ``` - ## Источники ## Сниппеты diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/parameters-schema.json b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/parameters-schema.json index 9d18d1091eb..6d4bf0f49af 100644 --- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/parameters-schema.json +++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/parameters-schema.json @@ -38,24 +38,6 @@ "title": "Assigning aliases to selected fields in a query", "$id": "#/definitions/AssignAliasFieldsInQuery" }, - "BadWords": { - "description": "Prohibited words", - "default": true, - "type": [ - "boolean", - "object" - ], - "title": "Prohibited words", - "properties": { - "badWords": { - "description": "Regular expression for prohibited words. Ex.: \"badWord1|badWord2\".", - "default": "", - "type": "string", - "title": "Regular expression for prohibited words. Ex.: \"badWord1|badWord2\"." - } - }, - "$id": "#/definitions/BadWords" - }, "BeginTransactionBeforeTryCatch": { "description": "Violating transaction rules for the 'BeginTransaction' method", "default": true, diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/schema.json b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/schema.json index d1218781607..a1e6f770ee2 100644 --- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/schema.json +++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/schema.json @@ -29,9 +29,6 @@ "AssignAliasFieldsInQuery": { "$ref": "parameters-schema.json#/definitions/AssignAliasFieldsInQuery" }, - "BadWords": { - "$ref": "parameters-schema.json#/definitions/BadWords" - }, "BeginTransactionBeforeTryCatch": { "$ref": "parameters-schema.json#/definitions/BeginTransactionBeforeTryCatch" }, From 5ce70140f0bf46ac84ed97270e72890b9df35157 Mon Sep 17 00:00:00 2001 From: Golovanoff Sergio Date: Thu, 7 Oct 2021 14:22:57 +0700 Subject: [PATCH 15/15] =?UTF-8?q?=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=B4=D0=BE=D0=BA=D1=83=D0=BC=D0=B5=D0=BD=D1=82?= =?UTF-8?q?=D0=B0=D1=86=D0=B8=D1=8E=20=D0=B8=20=D0=B8=D0=BC=D1=8F=20=D1=84?= =?UTF-8?q?=D1=83=D0=BD=D0=BA=D1=86=D0=B8=D0=B8,=20=D1=83=D0=B1=D1=80?= =?UTF-8?q?=D0=B0=D0=BB=20this.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/diagnostics/MetadataBorders.md | 30 ++++++++++++------- docs/en/diagnostics/MetadataBorders.md | 6 ++-- .../MetadataBordersDiagnostic.java | 14 ++++----- .../configuration/parameters-schema.json | 6 ++-- .../MetadataBordersDiagnostic_en.properties | 2 +- .../MetadataBordersDiagnostic_ru.properties | 2 +- 6 files changed, 34 insertions(+), 26 deletions(-) diff --git a/docs/diagnostics/MetadataBorders.md b/docs/diagnostics/MetadataBorders.md index e275e7f96e0..2fb5c5da376 100644 --- a/docs/diagnostics/MetadataBorders.md +++ b/docs/diagnostics/MetadataBorders.md @@ -7,17 +7,21 @@ ## Параметры -| Имя | Тип | Описание | Значение
по умолчанию | -|:---------------------------:|:--------:|:------------------------------------------------------------------------------------------------------------:|:------------------------------:| -| `metadataBordersParameters` | `Строка` | `JSON-структура для пар "регулярное выражение для операторов":"регулярное выражение для имени файла модуля"` | `` | +| Имя | Тип | Описание | Значение
по умолчанию | +|:---------------------------:|:--------:|:---------------------------------------------------------------------------------------:|:------------------------------:| +| `metadataBordersParameters` | `Строка` | `{"регулярное выражение для операторов":"регулярное выражение для имени файла модуля"}` | `` | ## Описание диагностики -Диагностика обращения к метаданным за пределами разрешенных границ. Нужна, если, например, в компании установлены правила обращения к каким-то метаданным только из определенного общего модуля. +Диагностика обращения к метаданным за пределами разрешенных границ. Нужна, если в компании установлены, +например, правила обращения к каким-то метаданным только из определенного общего модуля. ## Примеры -Например, получение контактной информации по внутренним правилам должно происходить только через функции общего модуля РаботаСКонтактами. Тогда заданные настройки вида +Получение контактной информации по внутренним правилам должно происходить только через функции +общего модуля РаботаСКонтактами. Тогда заданные настройки вида -```{"Регистры?Сведений.КонтактнаяИнформация":"CommonModules/РаботаСКонтактами"}``` +```json +{"Регистры?Сведений.КонтактнаяИнформация":"CommonModules/РаботаСКонтактами"} +``` вызовут срабатывание диагностики на запросе с текстом @@ -28,18 +32,22 @@ РегистрСведений.КонтактнаяИнформация КАК КИ" ``` -если этот запрос будет не в общем модуле РаботаСКонтактами. Так же эта диагностика с такой настройкой сработает и на оператор +если этот запрос будет НЕ в общем модуле РаботаСКонтактами. +Так же эта диагностика с такой настройкой сработает и на оператор -```НаборЗаписей = РегистрыСведений.ИспользованиеКонтактов.СоздатьНаборЗаписей();``` +```НаборЗаписей = РегистрыСведений.КонтактнаяИнформация.СоздатьНаборЗаписей();``` -В настройках обе части - это регулярные выражения java. Вторая часть настройки сравнивается с путем к файлу выгрузки конфигурации. +В настройках обе части - это регулярные выражения java. +Вторая часть настройки сравнивается с путем к файлу выгрузки конфигурации. Можно запретить использование нескольких метаданных: -```{"Регистры?Сведений.КонтактнаяИнформация|Справочники?.Контакты":"CommonModules/РаботаСКонтактами"}``` +```json +{"Регистры?Сведений.КонтактнаяИнформация|Справочники?.Контакты":"CommonModules/РаботаСКонтактами"} +``` Настройки задаются в виде json-строки: -``` +```json { "Регистры?Сведений.КонтактнаяИнформация":"CommonModules/РаботаСКонтактами", "Справочники?.СтрокиСоединения":"DataProcessors/ВнешниеСоединения|CommonModules/ПодключениеК.*" diff --git a/docs/en/diagnostics/MetadataBorders.md b/docs/en/diagnostics/MetadataBorders.md index e67863a66b9..1d619845361 100644 --- a/docs/en/diagnostics/MetadataBorders.md +++ b/docs/en/diagnostics/MetadataBorders.md @@ -7,9 +7,9 @@ ## Parameters -| Name | Type | Description | Default value | -|:---------------------------:|:--------:|:---------------------------------------------------------------------------:|:-------------:| -| `metadataBordersParameters` | `String` | `JSON-structure for pairs "regex for statements":"regex for module names".` | `` | +| Name | Type | Description | Default value | +|:---------------------------:|:--------:|:---------------------------------------------------:|:-------------:| +| `metadataBordersParameters` | `String` | `{"regex for statements":"regex for module names"}` | `` | ## Description diff --git a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java index ab1dfe89026..39e56ed0d7a 100644 --- a/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java +++ b/src/main/java/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic.java @@ -59,20 +59,20 @@ public class MetadataBordersDiagnostic extends AbstractVisitorDiagnostic { type = String.class, defaultValue = "" ) - private Map metadataBordersParameters = MapFromJSON(METADATA_BORDERS_DEFAULT); + private Map metadataBordersParameters = mapFromJSON(METADATA_BORDERS_DEFAULT); private List statementPatterns = Collections.emptyList(); - private static Map MapFromJSON(String userSettings) { + private static Map mapFromJSON(String userSettings) { ObjectMapper mapper = new ObjectMapper(); MapType mapType = mapper.getTypeFactory().constructMapType(HashMap.class, String.class, String.class); try { Map stringMap = mapper.readValue(userSettings, mapType); return stringMap.entrySet().stream() - .filter(entry -> ! entry.getKey().isBlank() && ! entry.getValue().isBlank()) + .filter(entry -> !entry.getKey().isBlank() && !entry.getValue().isBlank()) .collect(Collectors.toMap( - entry -> CaseInsensitivePattern.compile(entry.getKey()), - entry -> CaseInsensitivePattern.compile(entry.getValue()))); + entry -> CaseInsensitivePattern.compile(entry.getKey()), + entry -> CaseInsensitivePattern.compile(entry.getValue()))); } catch (JsonProcessingException e) { return Collections.emptyMap(); } @@ -80,14 +80,14 @@ private static Map MapFromJSON(String userSettings) { @Override public void configure(Map configuration) { - metadataBordersParameters = MapFromJSON( + metadataBordersParameters = mapFromJSON( (String) configuration.getOrDefault("metadataBordersParameters", METADATA_BORDERS_DEFAULT)); } @Override public ParseTree visitFile(BSLParser.FileContext ctx) { statementPatterns = metadataBordersParameters.entrySet().stream() - .filter(entry -> ! entry.getValue().matcher(this.documentContext.getUri().getPath()).find()) + .filter(entry -> ! entry.getValue().matcher(documentContext.getUri().getPath()).find()) .map(Map.Entry::getKey) .collect(Collectors.toList()); diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/parameters-schema.json b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/parameters-schema.json index 6d4bf0f49af..0fef9898faf 100644 --- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/parameters-schema.json +++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/configuration/parameters-schema.json @@ -926,7 +926,7 @@ }, "MetadataBorders": { "description": "Metadata borders", - "default": true, + "default": false, "type": [ "boolean", "object" @@ -934,10 +934,10 @@ "title": "Metadata borders", "properties": { "metadataBordersParameters": { - "description": "JSON-structure for pairs \"regex for statements\":\"regex for module names\". Etc \"InformationRegisters?.RegisterName:CommonModules/SpecialModule\".", + "description": "{\"regex for statements\":\"regex for module names\"}", "default": "", "type": "string", - "title": "JSON-structure for pairs \"regex for statements\":\"regex for module names\". Etc \"InformationRegisters?.RegisterName:CommonModules/SpecialModule\"." + "title": "{\"regex for statements\":\"regex for module names\"}" } }, "$id": "#/definitions/MetadataBorders" diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic_en.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic_en.properties index 4cc079d8e37..6ea09f1828a 100644 --- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic_en.properties +++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic_en.properties @@ -1,4 +1,4 @@ diagnosticMessage=Use metadata outside the borders diagnosticName=Metadata borders -metadataBordersParameters=JSON-structure for pairs "regex for statements":"regex for module names". +metadataBordersParameters={"regex for statements":"regex for module names"} diff --git a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic_ru.properties b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic_ru.properties index 5a33a88487f..6c61ef0fa57 100644 --- a/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic_ru.properties +++ b/src/main/resources/com/github/_1c_syntax/bsl/languageserver/diagnostics/MetadataBordersDiagnostic_ru.properties @@ -1,3 +1,3 @@ diagnosticMessage=Обращение к метаданным за пределами разрешенных границ diagnosticName=Границы метаданных -metadataBordersParameters=JSON-структура для пар "регулярное выражение для операторов":"регулярное выражение для имени файла модуля" +metadataBordersParameters={"регулярное выражение для операторов":"регулярное выражение для имени файла модуля"}